Merge pull request #885 from PorktoberRevolution/develop

Push into master

.gitignore

@@ -7,3 +7,8 @@ build-deploy/
 bin/
 obj/
 *.swp
+
+Distribution/Restock/GameData/ReStock/Spaces/**/*.png
+Distribution/Restock/GameData/ReStock/Props/**/*.png
+Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
+Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png

Assets/CineboxAndrew

@@ -1 +1 @@
-Subproject commit 45d8f3f43b478f7bbbd41f02252ed867e3dea703
+Subproject commit d96f5a5e9414906d09be01b24d71690feacd8d53

Distribution/Restock/GameData/ReStock/Compatibility/NearFutureProps.cfg

@@ -0,0 +1,73 @@
+// adds Near Future Props to Restock IVAs to fill them out more
+
+// Inflatable Airlock IVA
+@INTERNAL[restock-airlock-1-IVA]:NEEDS[NearFutureProps]:AFTER[ReStock]
+{
+
+  PROP
+  {
+    name = NF_PAPR_Clipboard_Log
+    position = -0.3309464,-0.001345975,-1.962911
+    rotation = -0.4704114,-0.4704107,-0.5279329,0.5279335
+    scale = 1,1,1
+  }
+
+  PROP
+  {
+    name = NF_RAIL_Small_Silver
+    position = 0,-0.281,-1.89
+    rotation = 4.619359E-07,0,0,1
+    scale = 1,1,1
+  }
+  PROP
+  {
+    name = NF_RAIL_Small_Silver
+    position = 0,0.281,-1.89
+    rotation = -1,0,0,4.619359E-07
+    scale = 1,1,1
+  }
+
+  PROP
+  {
+    name = NF_TANK_Wall_O2
+    position = 0.337,0,-0.112
+    rotation = 0,1,0,0
+    scale = 0.8,0.8,0.8
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_O2
+    position = -0.337,0,-0.112
+    rotation = 0,1,0,0
+    scale = 0.8,0.8,0.8
+  }
+
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = 0.2382951,-0.2382949,-0.112
+    rotation = 0.3826832,0.9238797,0,0
+    scale = 0.8000004,0.8000001,0.8000005
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = -0.2382951,0.2382949,-0.112
+    rotation = 0.3826832,0.9238797,0,0
+    scale = 0.8000004,0.8000001,0.8000005
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = 0.238295,0.238295,-0.112
+    rotation = -0.3826834,0.9238796,0,0
+    scale = 0.8000003,0.8000001,0.8000005
+  }
+  PROP
+  {
+    name = NF_TANK_Wall_N2
+    position = -0.238295,-0.238295,-0.112
+    rotation = -0.3826834,0.9238796,0,0
+    scale = 0.8000003,0.8000001,0.8000005
+  }
+}

Distribution/Restock/GameData/ReStock/Localization/en-us.cfg

@@ -44,6 +44,18 @@ Localization
     #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
     #LOC_Restock_variant-engine_tankbutt_size2_white = Tankbutt (2.5m, White)
     #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Tankbutt (2.5m, Orange/Grey)
+    #LOC_Restock_variant-engine_singlebell_compact = Single Compact
+    #LOC_Restock_variant-engine_singlebell_compact_white = Single Compact (White Shroud)
+    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = Single Compact (Orange/Grey Shroud)
+    #LOC_Restock_variant-engine_singlebell = Single    
+    #LOC_Restock_variant-engine_singlebell_white = Single (White Shroud)
+    #LOC_Restock_variant-engine_singlebell_grey-orange = Single (Orange/Grey Shroud)
+    #LOC_Restock_variant-engine_quadbell = Quad 
+    #LOC_Restock_variant-engine_quadbell_white = Quad (White Shroud)
+    #LOC_Restock_variant-engine_quadbell_grey-orange = Quad (Orange/Grey Shroud)
+    #LOC_Restock_variant-engine_quadbell_compact = Quad Compact
+    #LOC_Restock_variant-engine_quadbell_compact_white = Quad Compact (White Shroud)
+    #LOC_Restock_variant-engine_quadbell_compact_grey-orange = Quad Compact (Orange/Grey Shroud)
 
     #LOC_Restock_variant-engine_boattail_size2_white = Boattail (2.5m, White)
     #LOC_Restock_variant-engine_boattail_size2_grey-orange = Boattail (2.5m, Orange/Grey)
@@ -62,6 +74,8 @@ Localization
     #LOC_Restock_variant-mounting_classic_grey-orange = Classic (Orange/Grey Shroud)
     #LOC_Restock_variant-mounting_truss = Truss
     #LOC_Restock_variant-mounting_compact = Compact
+    #LOC_Restock_variant-mounting_mounted = Mounted
+
 
     #LOC_Restock_variant-gold-truss = Gold (Mounted)
     #LOC_Restock_variant-silver-truss = Silver (Mounted)
@@ -81,12 +95,18 @@ Localization
     #LOC_Restock_variant-telescope_shielded = Shielded
     #LOC_Restock_variant-telescope_bare = Bare
 
+    #LOC_Restock_variant-pod_bare = Bare
+    #LOC_Restock_variant-pod_fabric_green = Green Padding
+    #LOC_Restock_variant-pod_fabric_beige = Beige Padding
+    #LOC_Restock_variant-pod_fabric_white = White Padding
+
     #LOC_Restock_variant-wheel_broken = Broken
     #LOC_Restock_variant-wheel_bare = Bare
 
     #LOC_Restock_variant-surface_metal = Metal
     #LOC_Restock_variant-surface_basic = Basic
     #LOC_Restock_variant-surface_truss = Truss
+    #LOC_Restock_variant-surface_warningStripes = Warning Stripes
     #LOC_Restock_variant-surface_thermalblankets = Insulated
 
     #LOC_Restock_variant-decoupler_metal = Metal

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg

@@ -19,6 +19,7 @@
     model = ReStock/Assets/Coupling/restock-decoupler-0625-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -35,6 +36,7 @@
       {
         Decoupler0625White = false
         Decoupler0625Metal = true
+        Decoupler0625Yellow = false
       }
     }
     VARIANT
@@ -48,6 +50,20 @@
       {
         Decoupler0625White = true
         Decoupler0625Metal = false
+        Decoupler0625Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler0625White = false
+        Decoupler0625Metal = false
+        Decoupler0625Yellow = true
       }
     }
   }
@@ -64,6 +80,7 @@
     model = ReStock/Assets/Coupling/restock-decoupler-125-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -81,6 +98,7 @@
         Decoupler125White = false
         Decoupler125Dark = true
         Decoupler125Orange = false
+        Decoupler125Yellow = false
       }
     }
     VARIANT
@@ -95,6 +113,7 @@
         Decoupler125White = true
         Decoupler125Dark = false
         Decoupler125Orange = false
+        Decoupler125Yellow = false
       }
     }
     VARIANT
@@ -109,6 +128,21 @@
         Decoupler125White = false
         Decoupler125Dark = false
         Decoupler125Orange = true
+        Decoupler125Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler125White = false
+        Decoupler125Dark = false
+        Decoupler125Orange = false
+        Decoupler125Yellow = true
       }
     }
   }
@@ -125,6 +159,7 @@
     model = ReStock/Assets/Coupling/restock-decoupler-25-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -142,6 +177,7 @@
         Decoupler25White = false
         Decoupler25Metal = true
         Decoupler25Orange = false
+        Decoupler25Yellow = false
       }
     }
     VARIANT
@@ -156,6 +192,7 @@
         Decoupler25White = true
         Decoupler25Metal = false
         Decoupler25Orange = false
+        Decoupler25Yellow = false
       }
     }
     VARIANT
@@ -170,6 +207,21 @@
         Decoupler25White = false
         Decoupler25Metal = false
         Decoupler25Orange = true
+        Decoupler25Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler25White = false
+        Decoupler25Metal = false
+        Decoupler25Orange = false
+        Decoupler25Yellow = true
       }
     }
   }
@@ -186,6 +238,7 @@
     model = ReStock/Assets/Coupling/restock-decoupler-375-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -202,6 +255,7 @@
       {
         Decoupler375White = true
         Decoupler375Orange = false
+        Decoupler375Yellow = false
       }
     }
     VARIANT
@@ -215,6 +269,20 @@
       {
         Decoupler375White = false
         Decoupler375Orange = true
+        Decoupler375Yellow = false
+      }
+    } 
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler375White = false
+        Decoupler375Orange = false
+        Decoupler375Yellow = true
       }
     }
   }

Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg

@@ -16,6 +16,7 @@
     model = ReStock/Assets/Coupling/restock-separator-0625-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -32,6 +33,7 @@
       {
         Separator0625White = false
         Separator0625Metal = true
+        Separator0625Yellow = false
       }
     }
     VARIANT
@@ -45,6 +47,20 @@
       {
         Separator0625White = true
         Separator0625Metal = false
+        Separator0625Yellow = false
+      }
+    } 
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator0625White = false
+        Separator0625Metal = false
+        Separator0625Yellow = true
       }
     }
   }
@@ -61,6 +77,7 @@
     model = ReStock/Assets/Coupling/restock-separator-125-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -78,6 +95,7 @@
         Separator125White = false
         Separator125Dark = true
         Separator125Orange = false
+        Separator125Yellow = false
       }
     }
     VARIANT
@@ -92,6 +110,7 @@
         Separator125White = true
         Separator125Dark = false
         Separator125Orange = false
+        Separator125Yellow = false
       }
     }
     VARIANT
@@ -106,6 +125,21 @@
         Separator125White = false
         Separator125Dark = false
         Separator125Orange = true
+        Separator125Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator125White = false
+        Separator125Dark = false
+        Separator125Orange = false
+        Separator125Yellow = true
       }
     }
   }
@@ -122,6 +156,7 @@
     model = ReStock/Assets/Coupling/restock-separator-25-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -139,6 +174,7 @@
         Separator25White = false
         Separator25Metal = true
         Separator25Orange = false
+        Separator25Yellow = false
       }
     }
     VARIANT
@@ -153,6 +189,7 @@
         Separator25White = true
         Separator25Metal = false
         Separator25Orange = false
+        Separator25Yellow = false
       }
     }
     VARIANT
@@ -167,6 +204,21 @@
         Separator25White = false
         Separator25Metal = false
         Separator25Orange = true
+        Separator25Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator25White = false
+        Separator25Metal = false
+        Separator25Orange = false
+        Separator25Yellow = true
       }
     }
   }
@@ -183,6 +235,7 @@
     model = ReStock/Assets/Coupling/restock-separator-375-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -199,6 +252,7 @@
       {
         Separator375White = true
         Separator375Orange = false
+        Separator375Yellow = false
       }
     }
     VARIANT
@@ -212,6 +266,20 @@
       {
         Separator375White = false
         Separator375Orange = true
+        Separator375Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator375White = false
+        Separator375Orange = false
+        Separator375Yellow = true
       }
     }
   }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg

@@ -19,15 +19,11 @@
   !sound_vent_soft = DELETE
   !sound_explosion_low = DELETE
   !DRAG_CUBE {}
-  DRAG_CUBE
+  
-  {
-    cube = Fairing, 3.898,0.7731,1.901, 3.898,0.773,1.901, 3.297,0.7352,1.744, 3.311,0.6924,1.917, 3.895,0.7689,2.073, 3.895,0.7683,2.129, -0.001018,-0.6431,-0.002216, 3.418,1.717,3.42
-    cube = Clean, 3.871,0.7762,1.9, 3.871,0.7763,1.9, 2.683,0.5947,1.751, 2.686,0.6422,1.526, 3.874,0.7711,2.07, 3.874,0.7711,2.127, -0.0007027,-0.6431,0.0001873, 3.415,1.717,3.415
-  }
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-poodle-1
+    model = ReStock/Assets/Engine/restock-engine-poodle-2
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
@@ -125,7 +121,7 @@
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-poodle-running
-  }
+  }s
   !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {
@@ -212,6 +208,27 @@
       targetName = P_CylCpt_Upper004
       rotatorsName = P_CylCpt_Lower004
     }
+     // Single
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Lower001
+      rotatorsName = P_CylSingle_Upper001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Lower002
+      rotatorsName = P_CylSingle_Upper002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Upper001
+      rotatorsName = P_CylSingle_Lower001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Upper002
+      rotatorsName = P_CylSingle_Lower002
+    }
   }
   !MODULE[FXModuleAnimateThrottle] {}
   MODULE
@@ -292,100 +309,253 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Shroud, Poodle_Shroud_Compact
+    @jettisonName = Shroud1,Shroud2
-    useMultipleDragCubes = true
+    //useMultipleDragCubes = true
   }
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size2
+    baseVariant = TwoBell
-    useMultipleDragCubes = false
+    //useMultipleDragCubes = false
     VARIANT
     {
-      name = Size2
+      name = TwoBell
-      displayName = #LOC_Restock_variant-engine_size2_white
+      displayName = #LOC_Restock_variant-engine_quadbell_white
       primaryColor = #999999
       secondaryColor = #ffffff
       GAMEOBJECTS
       {
-        Poodle_25 = true
+        B_Poodle_25 = true
-        Poodle_Compact = false
+        B_Poodle_Compact = false
-        P_Cyl_Lower001 = true
+        B_Poodle_Common = true
-        P_Cyl_Lower002 = true
+        Poodle_LowerCyls = true
-        P_Cyl_Lower003 = true
+        Poodle_LowerCylsCompact = false
-        P_Cyl_Lower004 = true
-        P_CylCpt_Lower001 = false
-        P_CylCpt_Lower002 = false
-        P_CylCpt_Lower003 = false
-        P_CylCpt_Lower004 = false
         ShroudOrange = false
         ShroudWhite = true
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
     VARIANT
     {
       name = Compact
-      displayName = #LOC_Restock_variant-engine_compact_white
+      displayName = #LOC_Restock_variant-engine_quadbell_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
       GAMEOBJECTS
       {
-        Poodle_25 = false
+        B_Poodle_25 = false
-        Poodle_Compact = true
+        B_Poodle_Compact = true
-        P_Cyl_Lower001 = false
+        B_Poodle_Common = true
-        P_Cyl_Lower002 = false
+        Poodle_LowerCyls = false
-        P_Cyl_Lower003 = false
+        Poodle_LowerCylsCompact = true
-        P_Cyl_Lower004 = false
-        P_CylCpt_Lower001 = true
-        P_CylCpt_Lower002 = true
-        P_CylCpt_Lower003 = true
-        P_CylCpt_Lower004 = true
         ShroudOrange = false
         ShroudWhite = true
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
     VARIANT
     {
-      name = Size2_Alternate
+      name = TwoBell_Alternate
-      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      displayName = #LOC_Restock_variant-engine_quadbell_grey-orange
       primaryColor = #999999
       secondaryColor = #f69449
       GAMEOBJECTS
       {
-        Poodle_25 = true
+        B_Poodle_25 = true
-        Poodle_Compact = false
+        B_Poodle_Compact = false
-        P_Cyl_Lower001 = true
+        B_Poodle_Common = true
-        P_Cyl_Lower002 = true
+        Poodle_LowerCyls = true
-        P_Cyl_Lower003 = true
+        Poodle_LowerCylsCompact = false
-        P_Cyl_Lower004 = true
-        P_CylCpt_Lower001 = false
-        P_CylCpt_Lower002 = false
-        P_CylCpt_Lower003 = false
-        P_CylCpt_Lower004 = false
         ShroudOrange = true
         ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
     VARIANT
     {
       name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      displayName = #LOC_Restock_variant-engine_quadbell_compact_grey-orange
       primaryColor = #666666
       secondaryColor = #f69449
       GAMEOBJECTS
       {
-        Poodle_25 = false
+        B_Poodle_25 = false
-        Poodle_Compact = true
+        B_Poodle_Compact = true
-        P_Cyl_Lower001 = false
+        B_Poodle_Common = true
-        P_Cyl_Lower002 = false
+        Poodle_LowerCyls = false
-        P_Cyl_Lower003 = false
+        Poodle_LowerCylsCompact = true
-        P_Cyl_Lower004 = false
-        P_CylCpt_Lower001 = true
-        P_CylCpt_Lower002 = true
-        P_CylCpt_Lower003 = true
-        P_CylCpt_Lower004 = true
         ShroudOrange = true
         ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell
+      displayName =  #LOC_Restock_variant-engine_singlebell_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = true
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_Single = true
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell-Alt
+      displayName =  #LOC_Restock_variant-engine_singlebell_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = true
+        ShroudWhiteLong = false
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_Single = true
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell-Compact
+      displayName =  #LOC_Restock_variant-engine_singlebell_compact_white
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = true
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  true
+      }
+      NODES
+      {
+        node_attach = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell-Compact-Alt
+      displayName =  #LOC_Restock_variant-engine_singlebell_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = true
+        ShroudWhiteLong = false
+        B_Poodle_Single = false
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  true
+      }
+      NODES
+      {
+        node_attach = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
   }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg

@@ -15,7 +15,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-srb-kickback-1
+    model = ReStock/Assets/Engine/restock-engine-srb-kickback-2
   }
   %rescaleFactor = 1
   !EFFECTS {}
@@ -89,6 +89,10 @@
       }
     }
   }
+
+  !MODULE[FXModuleAnimateThrottle] {}
+  !MODULE[ModulePartVariants] {}
+
   @MODULE[ModuleEnginesFX]
   {
     %runningEffectName = fx-kickback-running
@@ -137,10 +141,80 @@
       rotatorsName = CylUpper008
     }
   }
-  @MODULE[FXModuleAnimateThrottle]
+  
+
+  MODULE
   {
-    @animationName = restock-srb-kickback-heat-1
+    name = FXModuleThrottleEffects
-    @responseSpeed = 0.1
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.1
+    shaderProperty = _EmissiveColor
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    useMultipleDragCubes = false
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      description = #autoLOC_8003040
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        KickbackBase = true
+        KickbackTop = true
+        KickbackBaseWhite = false
+      }
+      
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        KickbackBase = false
+        KickbackTop = false
+        KickbackBaseWhite = true
+      }
+    }
   }
 }
 

Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg

@@ -46,7 +46,9 @@
       {
         25TankTinyGrey = false
         25TankTinyOrange = false
-        25TankTinyWhite = true
+        25TankTinyBlackWhite = true
+        25TankTinyWhite = false
+        25TankTinyESA = false
       }
     }
     VARIANT
@@ -60,7 +62,9 @@
       {
         25TankTinyGrey = false
         25TankTinyOrange = true
+        25TankTinyBlackWhite = false
         25TankTinyWhite = false
+        25TankTinyESA = false
       }
     }
     VARIANT
@@ -74,7 +78,41 @@
       {
         25TankTinyGrey = true
         25TankTinyOrange = false
+        25TankTinyBlackWhite = false
         25TankTinyWhite = false
+        25TankTinyESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankTinyGrey = false
+        25TankTinyOrange = false
+        25TankTinyBlackWhite = false
+        25TankTinyWhite = true
+        25TankTinyESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankTinyGrey = false
+        25TankTinyOrange = false
+        25TankTinyBlackWhite = false
+        25TankTinyWhite = false
+        25TankTinyESA = true
       }
     }
   }
@@ -121,7 +159,9 @@
       {
         25TankSmallGrey = false
         25TankSmallOrange = false
-        25TankSmallWhite = true
+        25TankSmallBlackWhite = true
+        25TankSmallWhite = false
+        25TankSmallESA = false
       }
     }
     VARIANT
@@ -135,7 +175,9 @@
       {
         25TankSmallGrey = false
         25TankSmallOrange = true
+        25TankSmallBlackWhite = false
         25TankSmallWhite = false
+        25TankSmallESA = false
       }
     }
     VARIANT
@@ -149,7 +191,41 @@
       {
         25TankSmallGrey = true
         25TankSmallOrange = false
+        25TankSmallBlackWhite = false
         25TankSmallWhite = false
+        25TankSmallESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankSmallGrey = false
+        25TankSmallOrange = false
+        25TankSmallBlackWhite = false
+        25TankSmallWhite = true
+        25TankSmallESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankSmallGrey = false
+        25TankSmallOrange = false
+        25TankSmallBlackWhite = false
+        25TankSmallWhite = false
+        25TankSmallESA = true
       }
     }
   }
@@ -196,7 +272,9 @@
       {
         25TankMedGrey = false
         25TankMedOrange = false
-        25TankMedWhite = true
+        25TankMedBlackWhite = true
+        25TankMedWhite = false
+        25TankMedESA = false
       }
     }
     VARIANT
@@ -210,7 +288,9 @@
       {
         25TankMedGrey = false
         25TankMedOrange = true
+        25TankMedBlackWhite = false
         25TankMedWhite = false
+        25TankMedESA = false
       }
     }
     VARIANT
@@ -224,7 +304,41 @@
       {
         25TankMedGrey = true
         25TankMedOrange = false
+        25TankMedBlackWhite = false
         25TankMedWhite = false
+        25TankMedESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankMedGrey = false
+        25TankMedOrange = false
+        25TankMedBlackWhite = false
+        25TankMedWhite = true
+        25TankMedESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankMedGrey = false
+        25TankMedOrange = false
+        25TankMedBlackWhite = false
+        25TankMedWhite = false
+        25TankMedESA = true
       }
     }
   }
@@ -271,7 +385,9 @@
       {
         25TankLargeGrey = false
         25TankLargeOrange = false
-        25TankLargeWhite = true
+        25TankLargeBlackWhite = true
+        25TankLargeWhite = false
+        25TankLargeESA = false
       }
     }
     VARIANT
@@ -285,7 +401,9 @@
       {
         25TankLargeGrey = false
         25TankLargeOrange = true
+        25TankLargeBlackWhite = false
         25TankLargeWhite = false
+        25TankLargeESA = false
       }
     }
     VARIANT
@@ -299,7 +417,41 @@
       {
         25TankLargeGrey = true
         25TankLargeOrange = false
+        25TankLargeBlackWhite = false
         25TankLargeWhite = false
+        25TankLargeESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankLargeGrey = false
+        25TankLargeOrange = false
+        25TankLargeBlackWhite = false
+        25TankLargeWhite = true
+        25TankLargeESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankLargeGrey = false
+        25TankLargeOrange = false
+        25TankLargeBlackWhite = false
+        25TankLargeWhite = false
+        25TankLargeESA = true
       }
     }
   }

Distribution/Restock/GameData/ReStock/Patches/Payload/restock-fairing-bases.cfg

@@ -16,7 +16,7 @@
   }
   @MODULE[ModuleProceduralFairing]
   {
-    @nSides = 36
+    @nSides = 30
     @pivot = 0,0.15, 0
     @TextureURL = ReStock/Assets/Payload/restock-fairing-125-1
     @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
@@ -38,6 +38,9 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
@@ -45,10 +48,15 @@
         FairingBase125BlackWhite = false
         FairingBase125Orange = false
         FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
       }
     }
-    @VARIANT[Grey]
+    @VARIANT[BlackAndWhite]
     {
+
       !TEXTURE {}
       !EXTRA_INFO {}
       TEXTURE
@@ -61,6 +69,9 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-blackwhite
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
@@ -68,9 +79,13 @@
         FairingBase125BlackWhite = true
         FairingBase125Orange = false
         FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
       }
     }
-    @VARIANT[Dark?Grey]
+    @VARIANT[Orange]
     {
       !TEXTURE {}
       !EXTRA_INFO {}
@@ -84,6 +99,9 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
@@ -91,6 +109,10 @@
         FairingBase125BlackWhite = false
         FairingBase125Orange = true
         FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
       }
     }
     VARIANT
@@ -110,6 +132,10 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-dark
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 1,1,1,1
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.3
+        _Color= 1,1,1,1
       }
       GAMEOBJECTS
       {
@@ -117,6 +143,116 @@
         FairingBase125BlackWhite = false
         FairingBase125Orange = false
         FairingBase125Dark = true
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = false
+      }
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-metal
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 0,0,0,0
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.07
+      }
+      GAMEOBJECTS
+      {
+        FairingBase125White = false
+        FairingBase125BlackWhite = false
+        FairingBase125Orange = false
+        FairingBase125Dark = false
+        FairingBase125Metal = true
+        FairingBase125Gold = false
+        FairingBase125Silver = false
+        FairingBase125Inner = true
+      }
+    }
+     @VARIANT[Gold]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-gold
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-125-1-gold
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+        
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase125White = false
+        FairingBase125BlackWhite = false
+        FairingBase125Orange = false
+        FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = true
+        FairingBase125Silver = false
+        FairingBase125Inner = true
+      }
+    }
+  
+    @VARIANT[Silver]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-silver
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-125-1-silver
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase125White = false
+        FairingBase125BlackWhite = false
+        FairingBase125Orange = false
+        FairingBase125Dark = false
+        FairingBase125Metal = false
+        FairingBase125Gold = false
+        FairingBase125Silver = true
+        FairingBase125Inner = true
       }
     }
   }
@@ -133,11 +269,6 @@
       name = _SpecColor
       color = 0.753, 0.753, 0.753, 1.0
     }
-    FLOAT_PROPERTY
-    {
-      name = _Shininess
-      value = 0.3
-    }
   }
 }
 
@@ -153,7 +284,7 @@
   }
   @MODULE[ModuleProceduralFairing]
   {
-    @nSides = 24
+    @nSides = 30
     @pivot = 0,0.15, 0
     @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
     @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
@@ -175,15 +306,20 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
         FairingBase25White = true
         FairingBase25BlackWhite = false
         FairingBase25Orange = false
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = false
       }
     }
-    @VARIANT[Grey]
+    @VARIANT[BlackAndWhite]
     {
       !TEXTURE {}
       !EXTRA_INFO {}
@@ -197,15 +333,20 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
         FairingBase25White = false
         FairingBase25BlackWhite = true
         FairingBase25Orange = false
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = false
       }
     }
-    @VARIANT[Dark?Grey]
+    @VARIANT[Orange]
     {
       !TEXTURE {}
       !EXTRA_INFO {}
@@ -219,12 +360,121 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
         FairingBase25White = false
         FairingBase25BlackWhite = false
         FairingBase25Orange = true
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = false
+      }
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 0,0,0,0
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.07
+      }
+      GAMEOBJECTS
+      {
+        FairingBase25White = false
+        FairingBase25BlackWhite = false
+        FairingBase25Orange = false
+        FairingBase25Metal = true
+        FairingBase25Gold = false
+        FairingBase25Silver = false
+        FairingBase25Inner = true
+      }
+    }
+     @VARIANT[Gold]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-gold
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular25
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+        
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase25White = false
+        FairingBase25BlackWhite = false
+        FairingBase25Orange = false
+        
+        FairingBase25Metal = false
+        FairingBase25Gold = true
+        FairingBase25Silver = false
+        FairingBase25Inner = true
+      }
+    }
+  
+    @VARIANT[Silver]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-silver
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-silver
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_silverSpecular25
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase25White = false
+        FairingBase25BlackWhite = false
+        FairingBase25Orange = false
+        FairingBase25Metal = false
+        FairingBase25Gold = false
+        FairingBase25Silver = true
+        FairingBase25Inner = true
       }
     }
   }
@@ -241,11 +491,6 @@
       name = _SpecColor
       color = 0.753, 0.753, 0.753, 1.0
     }
-    FLOAT_PROPERTY
-    {
-      name = _Shininess
-      value = 0.3
-    }
   }
 }
 
@@ -261,7 +506,7 @@
   }
   @MODULE[ModuleProceduralFairing]
   {
-    @nSides = 48
+    @nSides = 30
     @pivot = 0,0.15, 0
     @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
     @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
@@ -283,15 +528,20 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
         FairingBase375White = true
         FairingBase375BlackWhite = false
         FairingBase375Orange = false
+        FairingBase375Inner = false
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = false
       }
     }
-    @VARIANT[Grey]
+    @VARIANT[BlackAndWhite]
     {
       !TEXTURE {}
       !EXTRA_INFO {}
@@ -305,15 +555,20 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
         FairingBase375White = false
         FairingBase375BlackWhite = true
         FairingBase375Orange = false
+        FairingBase375Inner = false
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = false
       }
     }
-    @VARIANT[Dark?Grey]
+    @VARIANT[Orange]
     {
       !TEXTURE {}
       !EXTRA_INFO {}
@@ -327,12 +582,122 @@
         FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
         FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
         CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
+        _Shininess= 0.3
       }
       GAMEOBJECTS
       {
         FairingBase375White = false
         FairingBase375BlackWhite = false
         FairingBase375Orange = true
+        FairingBase375Inner = false
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = false
+      }
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-metal
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
+        _Color= 0,0,0,0
+        _SpecColor= 0.75,0.75,0.75,1
+        _Shininess= 0.07
+      }
+      GAMEOBJECTS
+      {
+        FairingBase375White = false
+        FairingBase375BlackWhite = false
+        FairingBase375Orange = false
+        
+        FairingBase375Metal = true
+        FairingBase375Gold = false
+        FairingBase375Silver = false
+        FairingBase375Inner = true
+      }
+    }
+     @VARIANT[Gold]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-gold
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-gold
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+        
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular25
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase375White = false
+        FairingBase375BlackWhite = false
+        FairingBase375Orange = false
+        FairingBase375Metal = false
+        FairingBase375Gold = true
+        FairingBase375Silver = false
+        FairingBase375Inner = true
+      }
+    }
+  
+    @VARIANT[Silver]
+    {
+      !TEXTURE {}
+      !EXTRA_INFO {}
+      TEXTURE
+      {
+        materialName=FairingsMat
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-silver
+      }
+      EXTRA_INFO
+      {
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-25-1-silver
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-25-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_silverSpecular
+        BaseMaterialName=FairingBase
+        shaderName=KSP/Bumped Specular (Mapped)
+
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_silverSpecular25
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
+      }
+      GAMEOBJECTS
+      {
+        FairingBase375White = false
+        FairingBase375BlackWhite = false
+        FairingBase375Orange = false
+        
+        FairingBase375Metal = false
+        FairingBase375Gold = false
+        FairingBase375Silver = true
+        FairingBase375Inner = true
       }
     }
   }
@@ -349,10 +714,5 @@
       name = _SpecColor
       color = 0.753, 0.753, 0.753, 1.0
     }
-    FLOAT_PROPERTY
-    {
-      name = _Shininess
-      value = 0.3
-    }
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg

@@ -0,0 +1,47 @@
+// Patches applying art changes to fuel vents
+// Contents:
+// - FTE-1 Drain Valve (ReleaseValve)
+
+// FTE-1 Drain Valve
+@PART[ReleaseValve]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Resource/restock-fuel-vent-1
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Metal
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal // Metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+        Vent_metal = true
+        Vent_striped = false
+      }
+    }
+    VARIANT
+    {
+      name = Striped
+      displayName = #LOC_Restock_variant-surface_warningStripes // Warning Stripes
+      themeName = Gray with Stripes
+      primaryColor = #4c4f47
+      secondaryColor = #A4823F
+      GAMEOBJECTS
+      {
+        Vent_metal = false
+        Vent_striped = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg

@@ -0,0 +1,236 @@
+// Patches applying art changes to crewed command parts
+// Contents:
+// - KV-1 'Onion' Reentry Module (kv1Pod)
+// - KV-2 'Pea' Reentry Module (kv2Pod)
+// - KV-3 'Pomegranate' Reentry Module (kv3Pod)
+// - Mk2 Command Pod (Mk2Pod)
+
+//  KV-1
+@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Well
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-pod-sphere-1
+    position = 0.0, 0.2, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+
+  node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Green
+
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-pod_bare // Bare
+      themeName = White
+      primaryColor = #999999
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = false
+      }
+    }
+    VARIANT
+    {
+      name = Green
+      displayName = #LOC_Restock_variant-pod_fabric_green // Green Padding
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = true
+      }
+    }
+  }
+
+  @MODULE[ModuleAnchoredDecoupler] 
+  {
+    @anchorName = Vostok_Decoupler
+  }
+}
+
+//  KV-2
+@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Well
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-pod-sphere-2
+    position = 0.0, 0.2, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+
+  node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Beige
+
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-pod_bare // Bare
+      themeName = White
+      primaryColor = #999999
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = false
+      }
+    }
+    VARIANT
+    {
+      name = Beige
+      displayName = #LOC_Restock_variant-pod_fabric_beige // Beige Padding
+      themeName = GrayAndOrange
+      primaryColor = #8c7656
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = true
+      }
+    }
+  }
+
+  @MODULE[ModuleAnchoredDecoupler] 
+  {
+    @anchorName = Vostok_Decoupler
+  }
+}
+
+//  KV-3
+@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Well
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-pod-sphere-3
+    position = 0.0, 0.2, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+
+  node_stack_airlock = 0.0, 0.489547, -0.803417, 0.0, 0.339048, -0.940769, 0
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = White
+
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-pod_bare // Bare
+      themeName = White
+      primaryColor = #999999
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #LOC_Restock_variant-pod_fabric_white // White Padding
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #aaaaaa
+      GAMEOBJECTS
+      {
+        Fabric = true
+      }
+    }
+  }
+
+  @MODULE[ModuleAnchoredDecoupler] 
+  {
+    @anchorName = Vostok_Decoupler
+  }
+}
+
+// MK-2
+@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-mk2-pod
+    position = 0.0, 0.25, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-crewed-endcap-2
+    position = 0.0, 1.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-hatch-common-round-grey-1
+    position = 0.0, -0.635, 0.0
+    scale = 1,1,1
+    rotation = 180, 0, 0
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor =#4c4f47
+      GAMEOBJECTS
+      {
+        Mk2PodWhite = false
+        Mk2PodDark = true
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Mk2PodWhite = true
+        Mk2PodDark = false
+      }
+    }
+  }
+
+  @MODULE[FlagDecal]
+  {
+    @textureQuadName = Flag
+  }
+}
+

Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg

@@ -0,0 +1,118 @@
+// Patches applying art changes to the asteroid claw
+// Contents:
+// - Inflatable Airlock (InflatableAirlock)
+
+// Inflatable Airlock
+@PART[InflatableAirlock]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-airlock-inflatable-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-crewed-endcap-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,-1,1
+    rotation = 0, 0, 0
+  }
+
+  !INTERNAL,* {}
+
+  INTERNAL
+  {
+    name = restock-airlock-1-IVA
+  }
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    @animationName = Deploy
+  }
+
+  fx_gasBurst_white = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, decouple
+  sound_decoupler_fire = decouple
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Compact
+
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-mounting_compact // Compact
+      themeName = White
+      primaryColor = #8c7656
+      secondaryColor = #555555
+      GAMEOBJECTS
+      {
+        Voskhod-Shroud = false
+      }
+    }
+    VARIANT
+    {
+      name = Mounted
+      displayName = #LOC_Restock_variant-mounting_mounted // Mounted
+      themeName = White
+      primaryColor = #8c7656
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Voskhod-Shroud = true
+      }
+    }
+  }
+
+  MODULE
+  {
+    name = ModuleDecouple
+    ejectionForce = 25
+    isOmniDecoupler = true
+    explosiveNodeID = bottom
+    staged = true
+    stagingEnabled = false
+  }
+
+  MODULE
+  {
+    name = ModuleColorChanger
+    shaderProperty = _EmissiveColor
+    animRate = 0.8
+    animState = false
+    useRate = true
+    toggleInEditor = 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
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg

@@ -15,6 +15,7 @@
     model = ReStock/Assets/Coupling/restock-decoupler-1875-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -32,6 +33,7 @@
         Decoupler1875White = false
         Decoupler1875Metal = true
         Decoupler1875Orange = false
+        Decoupler1875Yellow = false
       }
     }
     VARIANT
@@ -46,6 +48,7 @@
         Decoupler1875White = true
         Decoupler1875Metal = false
         Decoupler1875Orange = false
+        Decoupler1875Yellow = false
       }
     }
     VARIANT
@@ -60,6 +63,21 @@
         Decoupler1875White = false
         Decoupler1875Metal = false
         Decoupler1875Orange = true
+        Decoupler1875Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler1875White = false
+        Decoupler1875Metal = false
+        Decoupler1875Orange = false
+        Decoupler1875Yellow = true
       }
     }
   }

Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg

@@ -14,6 +14,7 @@
     model = ReStock/Assets/Coupling/restock-separator-1875-1
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
@@ -31,6 +32,7 @@
         Separator1875White = false
         Separator1875Metal = true
         Separator1875Orange = false
+        Separator1875Yellow = false
       }
     }
     VARIANT
@@ -45,6 +47,7 @@
         Separator1875White = true
         Separator1875Metal = false
         Separator1875Orange = false
+        Separator1875Yellow = false
       }
     }
     VARIANT
@@ -59,6 +62,21 @@
         Separator1875White = false
         Separator1875Metal = false
         Separator1875Orange = true
+        Separator1875Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator1875White = false
+        Separator1875Metal = false
+        Separator1875Orange = false
+        Separator1875Yellow = true
       }
     }
   }