diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/blank.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/blank.tga new file mode 100644 index 00000000..b51b5746 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/blank.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu new file mode 100644 index 00000000..63d71235 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu new file mode 100644 index 00000000..3a7816f9 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-e.tga new file mode 100644 index 00000000..119367a0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-n.tga new file mode 100644 index 00000000..1f11aede Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga new file mode 100644 index 00000000..9f3f34f5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-e.tga new file mode 100644 index 00000000..626f81cd Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.tga new file mode 100644 index 00000000..e87ec577 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.tga new file mode 100644 index 00000000..27801c1e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-e.tga new file mode 100644 index 00000000..568bedd0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-n.tga new file mode 100644 index 00000000..46564490 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu new file mode 100644 index 00000000..f9e5c38f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.tga new file mode 100644 index 00000000..8f9bf952 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu new file mode 100644 index 00000000..cb4d8d61 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu new file mode 100644 index 00000000..fea8b9c5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-e.tga new file mode 100644 index 00000000..4fbbf640 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-n.tga new file mode 100644 index 00000000..def626ed Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5.tga new file mode 100644 index 00000000..165c177a Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-e.tga new file mode 100644 index 00000000..00325a45 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-n.tga new file mode 100644 index 00000000..a119e0c4 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1.tga new file mode 100644 index 00000000..6ca4213e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-125-1.mu new file mode 100644 index 00000000..e82bc987 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-cubic-strut.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-cubic-strut.mu new file mode 100644 index 00000000..50fdec43 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-cubic-strut.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-micronode.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-micronode.mu new file mode 100644 index 00000000..5cbe5c4c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-micronode.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-octagonal-strut.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-octagonal-strut.mu new file mode 100644 index 00000000..c18d17cf Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-octagonal-strut.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-micro-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-micro-1.tga new file mode 100644 index 00000000..edb948b3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-micro-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg index 119922f3..d5aaf733 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg @@ -1,3 +1,25 @@ // Patches applying art changes to crewed command parts // Contents: // - PPD-12 Cupola Module (cupola) +// Cupola +@PART[cupola]:FOR[zzzzStationParts] +{ + @author = Chris Adderley + !mesh = DELETE + !MODEL,* {} + !MODULE[ModuleAnimateGeneric] {} + MODEL + { + model = ReStock/Assets/Command/restock-cupola-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-1 + position = 0.0, -0.4, 0.0 + scale = 1,-1,1 + rotation = 0, 0, 0 + } +} \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg index 7ebd4e66..3e643d26 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg @@ -2,3 +2,59 @@ // Contents: // - PPD-10 Hitchhiker Storage Container (crewCabin) // - Science Mobile Processing Lab MPL-LG-2 (Large_Crewed_Lab) + +@PART[Large_Crewed_Lab] +{ + @author = Chris Adderley + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Command/restock-lab-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-1 + position = 0.0, -1.831, 0.0 + scale = 1,-1,1 + rotation = 0, 0, 0 + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-1 + position = 0.0,1.825, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} +// Hitchhiker +@PART[crewCabin]:FOR[zzzzStationParts] +{ + @author = Chris Adderley + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Command/restock-hitchhiker-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-1 + position = 0.0, -0.986899, 0.0 + scale = 1,-1,1 + rotation = 0, 0, 0 + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-1 + position = 0.0,0.986899, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg index 694d7383..1a7de173 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg @@ -11,8 +11,57 @@ !MODEL {} MODEL { model = ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1 + } %rescaleFactor = 1 %manufacturer = #autoLOC_501624 } +// Inline Clamp-O-Tron +@PART[dockingPort2] { + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Coupling/restock-docking-125-1 + } + + %rescaleFactor = 1 + MODULE + { + name = ModuleColorChanger + shaderProperty = _EmissiveColor + animRate = 0.8 + animState = false + useRate = true + toggleInEditor = true + toggleInFlight = true + toggleInFlight = true + unfocusedRange = 5 + toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights + eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On + eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off + toggleAction = True + defaultActionGroup = Light + redCurve + { + key = 0 0 0 3 + key = 1 1 0 0 + } + greenCurve + { + key = 0 0 0 1 + key = 1 1 1 0 + } + blueCurve + { + key = 0 0 0 0 + key = 1 0.7 1.5 0 + } + alphaCurve + { + key = 0 1 + } + } + } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg index 2d0b42d1..d985a4bc 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg @@ -3,3 +3,18 @@ // - Z-200 Rechargeable Battery Bank (batteryBankMini) // - Z-1K Rechargeable Battery Bank (batteryBank) // - Z-4K Rechargeable Battery Bank (batteryBankLarge) + +// 1.25m battery bank +@PART[batteryBank] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-battery-125-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg index 7dafff38..7eac51a9 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg @@ -535,7 +535,7 @@ LV_909_Boattail = false LV_909_Basic = true LV_909_Compact = false - Shroud909 = true + } } @@ -550,7 +550,7 @@ LV_909_Boattail = true LV_909_Basic = false LV_909_Compact = false - Shroud909 = false + } } @@ -565,7 +565,6 @@ LV_909_Boattail = false LV_909_Basic = false LV_909_Compact = true - Shroud909 = false } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg index dc3a4a82..4c7858da 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg @@ -3,3 +3,48 @@ // - The Not-Rockomax Micronode (structuralMiniNode) // - Cubic Octagonal Strut (strutCube) // - Octagonal Strut (strutOcto) + +// Cubic strut +@PART[strutCube] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Structural/restock-cubic-strut + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} + +// Micronode +@PART[structuralMiniNode] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Structural/restock-micronode + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} + +// Octo-Strut +@PART[strutOcto] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Structural/restock-octagonal-strut + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 692e622a..4bd7dcad 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -25,10 +25,10 @@ - Kerbodyne ADTP-2-3 (Nertea) - Fuel Tanks - Oscar-B Fuel Tank (Beale) - - FL-T200 Fuel Tank (fuelTankSmall) - - FL-T400 Fuel Tank (fuelTank) - - FL-T800 Fuel Tank (fuelTank_long) - - FL-T100 Fuel Tank (fuelTankSmallFlat) + - FL-T200 Fuel Tank Porkjet + - FL-T400 Fuel Tank Porkjet + - FL-T800 Fuel Tank Porkjet + - FL-T100 Fuel Tank Porkjet - Rockomax Jumbo-64 Fuel Tank (Nertea) - Rockomax X200-16 Fuel Tank (Nertea) - Rockomax X200-32 Fuel Tank (Nertea)