diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.dds deleted file mode 100644 index d68a03de..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.tga new file mode 100644 index 00000000..66402ecd Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.dds deleted file mode 100644 index 952593e0..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.tga new file mode 100644 index 00000000..20c158d7 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu index 8dcdf7eb..2de13012 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-2.mu index e1252525..a939a7eb 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.dds deleted file mode 100644 index f486f51c..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.tga new file mode 100644 index 00000000..9e9260ff Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.dds deleted file mode 100644 index 3ad91884..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu index 8d4da3ec..3f7ddb10 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.tga new file mode 100644 index 00000000..6ab22f51 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.dds deleted file mode 100644 index ad5c0694..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.tga new file mode 100644 index 00000000..f505c639 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.dds deleted file mode 100644 index e929b93a..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.mu index b6473c87..04d0e8cd 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.tga new file mode 100644 index 00000000..e8d5074c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-2.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1-n.tga new file mode 100644 index 00000000..514f89ac Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1.tga new file mode 100644 index 00000000..151816ff Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-endcaps-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-n.tga new file mode 100644 index 00000000..47a2040c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-orange.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-orange.tga new file mode 100644 index 00000000..e517fd39 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-orange.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-white.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-white.tga new file mode 100644 index 00000000..c087b6e0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1-white.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1.tga new file mode 100644 index 00000000..40e72cc9 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-soyuz-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-0625-1.mu index e23087c8..171f5829 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-0625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-1.mu index 4f051ff3..9009b885 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-2.mu index 2c734760..e0e63602 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-1875-125-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-25-1875-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-25-1875-1.mu index 78b272b8..dadfbd14 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-25-1875-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-25-1875-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1-n.dds deleted file mode 100644 index 33d9b23a..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1-n.tga new file mode 100644 index 00000000..a70349e1 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1.dds deleted file mode 100644 index 6fcee7e4..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1.tga new file mode 100644 index 00000000..8cb8aafa Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapters-1875-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3-n.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3-n.dds deleted file mode 100644 index 47f626f5..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3-n.tga new file mode 100644 index 00000000..132f0577 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.dds deleted file mode 100644 index 83e5919c..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.tga new file mode 100644 index 00000000..88c8b5f5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.tga differ diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg index 3d08bc39..aa595c1d 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg @@ -84,8 +84,9 @@ } } } - @MODULE[ModuleEnginesFX] + @MODULE[ModuleEngines] { + @name = ModuleEnginesFX %runningEffectName = fx-pollux-running } MODULE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg index a4702463..e4957f10 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg @@ -290,12 +290,7 @@ } flameout { - PREFAB_PARTICLE - { - prefabName = fx_exhaustSparks_flameout_2 - transformName = thrustTransform - oneShot = true - } + AUDIO { channel = Ship diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index d29fefd1..7e06ddd6 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -1,4 +1,7 @@ Squad/Parts/Aero/aerodynamicNoseCone/ +Squad/Parts/Aero/cones/Assets/ConesDiffuse*.dds +Squad/Parts/Aero/cones/Assets/ConesHeat*.dds +Squad/Parts/Aero/cones/Assets/Rockomax_Adapters*.dds Squad/Parts/Aero/fairings/fairingSize2.mu Squad/Parts/Aero/HeatShield/HeatShield0.mu Squad/Parts/Aero/HeatShield/HeatShield1.mu @@ -57,6 +60,9 @@ Squad/Parts/Engine/Size3AdvancedEngine/ Squad/Parts/Engine/Size3EngineCluster/ Squad/Parts/Engine/solidBoosterBACC/ Squad/Parts/Engine/solidBoosterSep/ +Squad/Parts/Engine/solidBoostersF/Assets/ +Squad/Parts/Engine/solidBoosterS2-17/ +Squad/Parts/Engine/solidBoosterS2-33/ Squad/Parts/FuelTank/FoilTanks/ Squad/Parts/FuelTank/fuelTankOscarB/ Squad/Parts/FuelTank/RCSFuelTankR1/ @@ -79,6 +85,15 @@ Squad/Parts/Structural/structuralMicronode/ Squad/Parts/Structural/strutCubicOcto/ Squad/Parts/Structural/strutOcto/ Squad/Parts/Structural/stackAdapters/ +Squad/Parts/Structural/structuralIBeam200/ +Squad/Parts/Structural/structuralIBeam200Pocket/ +Squad/Parts/Structural/structuralIBeam650/ +Squad/Parts/Structural/structuralPanel1x1/ +Squad/Parts/Structural/structuralPanel2x2/ +Squad/Parts/Structural/trussGirderAdapter/ +Squad/Parts/Structural/trussGirderL/ +Squad/Parts/Structural/trussGirderXL/ +Squad/Parts/Thermal/ Squad/Parts/Utility/stackCouplers/ Squad/Parts/Utility/DirectAntennas/ Squad/Parts/Utility/commDish88-88/ @@ -92,6 +107,9 @@ Squad/Parts/Utility/dockingPortSr/ Squad/Parts/Utility/decouplerRadialHDM/ Squad/Parts/Utility/decouplerRadialTT-38K/ Squad/Parts/Utility/decouplerRadialTT-70/ +Squad/Parts/Utility/ladderRadial/ +Squad/Parts/Utility/ladderTelescopicBay/ +Squad/Parts/Utility/ladderTelescopic/ Squad/Parts/Utility/parachuteMk1/ Squad/Parts/Utility/parachuteMk12-R/ Squad/Parts/Utility/parachuteMk16-XL/ @@ -99,9 +117,11 @@ Squad/Parts/Utility/parachuteMk2-R/ Squad/Parts/Utility/parachuteMk25/ Squad/Parts/Utility/radialAttachmentPoint/ Squad/Parts/Utility/rcsBlockRV-105/ +Squad/Parts/Utility/rcsBlockRV-105_v2/ Squad/Parts/Utility/RelayAntennas/ Squad/Parts/Utility/rockomaxAdapters/ Squad/Parts/Utility/ServiceBay/ +Squad/Parts/Utility/ServiceBay_v2/ Squad/Parts/Utility/spotLightMk1/ Squad/Parts/Utility/spotLightMk2/ Squad/Parts/Utility/launchEscapeSystem/ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg index b74152f5..bc208051 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg @@ -19,7 +19,7 @@ PART rescaleFactor = 1 node_stack_direct = 0.0, -0.00, 0.0, 0.0, -1.0, 0.0, 1 - node_stack_bottom = 0.0, -0.27525, 0.0, 0.0, -1.0, 0.0, 2 + node_stack_bottom = 0.0, -0.295, 0.0, 0.0, -1.0, 0.0, 2 node_stack_top = 0.0, 0.1175, 0.0, 0.0, 1.0, 0.0, 2 CoPOffset = 0.0, 0.825, 0.0 CoLOffset = 0.0, -0.27, 0.0 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fueltank-1875-soyuz-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fueltank-1875-soyuz-1.cfg index 8e55b4a3..179e815f 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fueltank-1875-soyuz-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/1875/restock-fueltank-1875-soyuz-1.cfg @@ -57,12 +57,7 @@ PART } flameout { - PREFAB_PARTICLE - { - prefabName = fx_exhaustSparks_flameout_2 - transformName = thrustTransform - oneShot = true - } + AUDIO { channel = Ship