Merge branch 'master' into comms

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

@@ -38,5 +38,8 @@ Localization
     #LOC_Restock_variant-heat-shield-brown = Classic
     #LOC_Restock_variant-heat-shield-red = Unpainted
 
+    #LOC_Restock_variant-linear-rcs-pod = Podded
+    #LOC_Restock_variant-linear-rcs-bare = Bare
+
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg

@@ -0,0 +1,15 @@
+// Patches applying art changes to 0.625m aerodynamic parts
+// Contents:
+// - Small Nose Cone (standardNoseCone)
+
+@PART[standardNoseCone]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Aero/restock-nosecone-0625-1
+  }
+
+}

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg

@@ -1,6 +1,8 @@
 // Patches applying art changes to 1.25m aerodynamic parts
 // Contents:
 // - Aerodynamic Nose Cone (noseCone)
+// - Advanced Nose Cone - Type A (pointyNoseConeA)
+// - Advanced Nose Cone - Type B (pointyNoseConeB)
 
 @PART[noseCone]
 {
@@ -11,4 +13,228 @@
   MODEL {
     model = ReStock/Assets/Structural/restock-nosecone-125-1
   }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        125mConeBlackWhite = true
+        125mConeWhite = false
+        125mConeDark = false
+        125mConeOrange = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        125mConeBlackWhite = false
+        125mConeWhite = false
+        125mConeDark = true
+        125mConeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        125mConeBlackWhite = false
+        125mConeWhite = true
+        125mConeDark = false
+        125mConeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = Orange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        125mConeBlackWhite = false
+        125mConeWhite = false
+        125mConeDark = false
+        125mConeOrange = true
+      }
+    }
+  }
+}
+
+@PART[pointyNoseConeA]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Structural/restock-nosecone-125-2
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        125SharpConeDark = false
+        125SharpConeWhite = true
+        125SharpConeBlackWhite = false
+        125SharpConeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        125SharpConeDark = false
+        125SharpConeWhite = false
+        125SharpConeBlackWhite = true
+        125SharpConeOrange = false
+
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = Orange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        125SharpConeDark = false
+        125SharpConeWhite = false
+        125SharpConeBlackWhite = false
+        125SharpConeOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        125SharpConeDark = true
+        125SharpConeWhite = false
+        125SharpConeBlackWhite = false
+        125SharpConeOrange = false
+      }
+    }
+  }
+  !MODULE[ModuleAnimateHeat] {}
+}
+
+@PART[pointyNoseConeB]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Structural/restock-nosecone-125-3
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        125mBentConeDark = false
+        125mBentConeWhite = true
+        125mBentConeBlackandWhite = false
+        125mBentConeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        125mBentConeDark = false
+        125mBentConeWhite = false
+        125mBentConeBlackandWhite = true
+        125mBentConeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = Orange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        125mBentConeDark = false
+        125mBentConeWhite = false
+        125mBentConeBlackandWhite = false
+        125mBentConeOrange = true
+      }
+    }
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        125mBentConeDark = true
+        125mBentConeWhite = false
+        125mBentConeBlackandWhite = false
+        125mBentConeOrange = false
+      }
+    }
+  }
+  !MODULE[ModuleAnimateHeat] {}
 }

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg

@@ -1,8 +1,8 @@
 // Patches applying art changes to 2.5m aerodynamic parts
 // Contents:
-// - Protective Rocket Nose Cone Mk7 (rocketNoseCone)
+// - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2)
 
-@PART[rocketNoseCone]
+@PART[rocketNoseCone_v2]
 {
   @author = Chris Adderley (Nertea)
 
@@ -11,4 +11,54 @@
   MODEL {
     model = ReStock/Assets/Structural/restock-nosecone-25-1
   }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = true
+        25mNoseconeOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = true
+        25mNoseconeWhite = false
+        25mNoseconeOrange = false
+      }
+
+    }
+
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = Orange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        25mNoseconeBlackWhite = false
+        25mNoseconeWhite = false
+        25mNoseconeOrange = true
+      }
+    }
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg

@@ -0,0 +1,45 @@
+// Patches applying art changes to lights
+// Contents:
+// - Illuminator Mk1 (spotLight1)
+// - Illuminator Mk2 (spotLight2)
+
+// Spotlight
+@PART[spotLight1]
+{
+	@author = Chris Adderley (Nertea)
+	!mesh = DELETE
+	!MODEL,* {}
+	MODEL
+	{
+		model = ReStock/Assets/Electrical/restock-light-spot-1
+		position = 0.0, 0.0, 0.0
+		scale = 1,1,1
+		rotation = 0, 0, 0
+	}
+
+	@MODULE[ModuleLight]
+	{
+		@animationName = RestockSpotLight_On
+		@lightName = Spot
+	}
+
+}
+// Floodlight
+@PART[spotLight2]
+{
+	@author = Chris Adderley (Nertea)
+	!mesh = DELETE
+	!MODEL,* {}
+	MODEL
+	{
+		model = ReStock/Assets/Electrical/restock-light-flood-1
+		position = 0.0, 0.0, 0.0
+		scale = 1,1,1
+		rotation = 0, 0, 0
+	}
+  @MODULE[ModuleLight]
+	{
+		@animationName = RestockFloodLight_On
+		@lightName = Spot
+	}
+}

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg

@@ -67,909 +67,3 @@
 		jettisonDirection = 0 0 1
 	}
 }
-
-// Spider
-@PART[radialEngineMini]
-{
-  @author = Chris Adderley (Nertea)
-
-  !mesh = DELETE
-  !MODEL {}
-  MODEL {
-    model = ReStock/Assets/Engine/restock-engine-spider-1
-  }
-  !EFFECTS {}
-  EFFECTS
-	{
-    engage
-	  {
-  		AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_vent_soft
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-	  }
-		flameout
-		{
-			PREFAB_PARTICLE
-			{
-				prefabName = fx_exhaustSparks_flameout_2
-				transformName = thrustTransform
-				oneShot = true
-			}
-			AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_explosion_low
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-		}
-		fx-spider-running
-		{
-      AUDIO
-      {
-        channel = Ship
-        clip = sound_rocket_mini
-        volume = 0.0 0.0
-        volume = 1.0 0.3
-        pitch = 0.0 0.75
-        pitch = 1.0 1.5
-        loop = true
-      }
-
-			MODEL_MULTI_PARTICLE
-			{
-        name = core
-				modelName = ReStock/FX/restock-fx-ant-1
-				transformName = fxTransform
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-		}
-  }
-  @MODULE[ModuleEnginesFX]
-  {
-	  @runningEffectName = fx-spider-running
-  }
-  @MODULE[ModuleGimbal]
-	{
-		@gimbalTransformName = B_Gimbal
-	}
-  MODULE
-	{
-		name = FXModuleLookAtConstraint
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop001
-			rotatorsName = Cyl001
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop002
-			rotatorsName = Cyl002
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = Cyl001
-			rotatorsName = CylTop001
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = Cyl002
-			rotatorsName = CylTop002
-		}
-	}
-  !MODULE[FXModuleAnimateThrottle] {}
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = heatColor
-    responseSpeed = 0.005
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = throttleColor
-    responseSpeed = 1.0
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = heatColor
-    animRate = 0.05
-    shaderProperty = _EmissiveColor
-    excludedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = throttleColor
-    animRate = 1
-    shaderProperty = _EmissiveColor
-    includedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-}
-
-// Spark
-@PART[liquidEngineMini]
-{
-  @author = Chris Adderley (Nertea)
-
-  !mesh = DELETE
-  !MODEL {}
-  MODEL {
-    model = ReStock/Assets/Engine/restock-engine-spark-1
-  }
-  %node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 3
-  @attachRules = 1,1,1,0,0
-  !EFFECTS {}
-  EFFECTS
-	{
-    engage
-	  {
-  		AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_vent_medium
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-	  }
-    disengage
-		{
-			AUDIO
-			{
-				channel = Ship
-				clip = sound_vent_soft
-				loop = false
-			}
-		}
-		flameout
-		{
-			PREFAB_PARTICLE
-			{
-				prefabName = fx_exhaustSparks_flameout_2
-				transformName = thrustTransform
-				oneShot = true
-			}
-			AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_explosion_low
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-		}
-		fx-spark-running
-		{
-      AUDIO
-      {
-        channel = Ship
-        clip = sound_rocket_mini
-        volume = 0.0 0.0
-        volume = 1.0 1.0
-        pitch = 0.0 0.75
-        pitch = 1.0 0.95
-        loop = true
-      }
-
-			MODEL_MULTI_PARTICLE
-			{
-        name = core
-				modelName = ReStock/FX/restock-fx-spark-core-1
-				transformName = fxTransformCore
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-			MODEL_MULTI_PARTICLE
-			{
-        name = plume
-				modelName = ReStock/FX/restock-fx-spark-plume-1
-				transformName = fxTransformPlume
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-      MODEL_MULTI_PARTICLE
-			{
-        name = turbo
-				modelName = ReStock/FX/restock-fx-spark-turbo-1
-				transformName = fxTransformTurbo
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-		}
-  }
-  MODULE
-	{
-		name = FXModuleLookAtConstraint
-
-		// Basic
-
-		CONSTRAINLOOKFX
-		{
-			targetName = CylBot001
-			rotatorsName = CylTop001
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylBot002
-			rotatorsName = CylTop002
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop001
-			rotatorsName = CylBot001
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop002
-			rotatorsName = CylBot002
-		}
-    CONSTRAINLOOKFX
-		{
-			targetName = CylBot003
-			rotatorsName = CylTop003
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylBot004
-			rotatorsName = CylTop004
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop003
-			rotatorsName = CylBot003
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop004
-			rotatorsName = CylBot004
-		}
-    CONSTRAINLOOKFX
-		{
-			targetName = CylBot005
-			rotatorsName = CylTop005
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylBot006
-			rotatorsName = CylTop006
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop005
-			rotatorsName = CylBot005
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop006
-			rotatorsName = CylBot006
-		}
-
-	}
-  @MODULE[ModuleGimbal]
-	{
-		@gimbalTransformName = B_Gimbal
-	}
-  MODULE
-	{
-		name = ModulePartVariants
-		baseVariant = Size0
-		VARIANT
-		{
-			name = Size0
-			displayName = #LOC_Restock_variant-engine_size0
-      primaryColor = #999999
-			secondaryColor = #da8544
-			GAMEOBJECTS
-			{
-				SparkBasic = true
-				CylBot001  = false
-        CylBot002 = false
-        CylBot003 = true
-        CylBot004 = true
-        CylBot005 = false
-        CylBot006 = false
-        SparkCompact = false
-        SparkBoattail = false
-        AdditionalColliders = false
-			}
-		}
-    VARIANT
-		{
-			name = Boattail
-			displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #da8544
-			secondaryColor = #999999
-			GAMEOBJECTS
-			{
-				SparkBasic = false
-				CylBot001  = false
-        CylBot002 = false
-        CylBot003 = false
-        CylBot004 = false
-        CylBot005 = true
-        CylBot006 = true
-        SparkCompact = false
-        SparkBoattail = true
-        AdditionalColliders = true
-			}
-
-		}
-    VARIANT
-		{
-			name = Compact
-			displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
-			secondaryColor = #555555
-			GAMEOBJECTS
-			{
-				SparkBasic = false
-				CylBot001  = true
-        CylBot002 = true
-        CylBot003 = false
-        CylBot004 = false
-        CylBot005 = false
-        CylBot006 = false
-        SparkCompact = true
-        SparkBoattail = false
-        AdditionalColliders = true
-
-			}
-		}
-	}
-  @MODULE[ModuleEnginesFX]
-  {
-	  %runningEffectName = fx-spark-running
-  }
-  !MODULE[FXModuleAnimateThrottle] {}
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = heatColor
-    responseSpeed = 0.005
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = throttleColor
-    responseSpeed = 1.0
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = heatColor
-    animRate = 0.0005
-    shaderProperty = _EmissiveColor
-    excludedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = throttleColor
-    animRate = 1
-    shaderProperty = _EmissiveColor
-    includedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-  @MODULE[ModuleJettison]
-	{
-		@jettisonName =  ShroudSparkBasic
-	}
-}
-
-// Twitch
-@PART[smallRadialEngine]
-{
-  @author = Chris Adderley (Nertea)
-
-  !mesh = DELETE
-  !MODEL {}
-  MODEL {
-    model = ReStock/Assets/Engine/restock-engine-twitch-1
-  }
-  !EFFECTS {}
-  EFFECTS
-	{
-    engage
-	  {
-  		AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_vent_medium
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-	  }
-    disengage
-		{
-			AUDIO
-			{
-				channel = Ship
-				clip = sound_vent_soft
-				loop = false
-			}
-		}
-		flameout
-		{
-			PREFAB_PARTICLE
-			{
-				prefabName = fx_exhaustSparks_flameout_2
-				transformName = thrustTransform
-				oneShot = true
-			}
-			AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_explosion_low
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-		}
-		fx-twitch-running
-		{
-      AUDIO
-      {
-        channel = Ship
-        clip = sound_rocket_mini
-        volume = 0.0 0.0
-        volume = 1.0 1.0
-        pitch = 0.0 0.8
-        pitch = 1.0 1.0
-        loop = true
-      }
-      MODEL_MULTI_PARTICLE
-			{
-        name = turbo
-				modelName = ReStock/FX/restock-fx-spark-turbo-1
-				transformName = fxTransformTurbo
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-			MODEL_MULTI_PARTICLE
-			{
-        name = core
-				modelName = ReStock/FX/restock-fx-spark-core-1
-				transformName = fxTransformCore
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-			MODEL_MULTI_PARTICLE
-			{
-        name = plume
-				modelName = ReStock/FX/restock-fx-spark-plume-1
-				transformName = fxTransformPlume
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-		}
-  }
-  MODULE
-	{
-		name = FXModuleLookAtConstraint
-
-		// Ringed
-		CONSTRAINLOOKFX
-		{
-			targetName = CyBotRad001
-			rotatorsName = CylTopRad001
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CyBotRad002
-			rotatorsName = CylTopRad002
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTopRad001
-			rotatorsName = CyBotRad001
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTopRad002
-			rotatorsName = CyBotRad002
-		}
-	}
-  @MODULE[ModuleEnginesFX]
-  {
-	  runningEffectName = fx-twitch-running
-  }
-  @MODULE[ModuleGimbal]
-	{
-		@gimbalTransformName = B_Gimbal
-	}
-  !MODULE[FXModuleAnimateThrottle] {}
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = heatColor
-    responseSpeed = 0.005
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = throttleColor
-    responseSpeed = 1.0
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = heatColor
-    animRate = 0.05
-    shaderProperty = _EmissiveColor
-    excludedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = throttleColor
-    animRate = 1
-    shaderProperty = _EmissiveColor
-    includedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-
-}
-
-// Puff
-@PART[omsEngine]
-{
-  @author = Chris Adderley (Nertea)
-
-  !mesh = DELETE
-  !MODEL {}
-  MODEL {
-    model = ReStock/Assets/Engine/restock-engine-puff-1
-  }
-  !EFFECTS {}
-  EFFECTS
-	{
-    engage
-	  {
-  		AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_vent_soft
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-	  }
-		flameout
-		{
-			PREFAB_PARTICLE
-			{
-				prefabName = fx_exhaustSparks_flameout_2
-				transformName = thrustTransform
-				oneShot = true
-			}
-			AUDIO
-  		{
-  		  channel = Ship
-  		  clip = sound_explosion_low
-  		  volume = 1.0
-  		  pitch = 2.0
-  		  loop = false
-  		}
-		}
-		fx-puff-running
-		{
-      AUDIO
-     {
-       channel = Ship
-       clip = sound_rocket_mini
-       volume = 0.0 0.0
-       volume = 1.0 0.5
-       pitch = 0.0 0.5
-       pitch = 1.0 1.0
-       loop = true
-     }
-
-			MODEL_MULTI_PARTICLE
-			{
-        name = plume
-				modelName = ReStock/FX/restock-fx-puff-1
-				transformName = fxTransform
-				emission = 0.0 0.0
-				emission = 0.01 0.1
-				emission = 0.075 0.25
-				emission = 1.0 1.0
-				speed = 0.0 0.35
-				speed = 1.0 1.0
-			}
-		}
-  }
-
-  MODULE
-	{
-		name = FXModuleLookAtConstraint
-
-		// Ringed
-		CONSTRAINLOOKFX
-		{
-			targetName = Cyl005
-			rotatorsName = CylTop005
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = Cyl006
-			rotatorsName = CylTop006
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop005
-			rotatorsName = Cyl005
-		}
-		CONSTRAINLOOKFX
-		{
-			targetName = CylTop006
-			rotatorsName = Cyl006
-		}
-
-	}
-  @MODULE[ModuleEnginesFX]
-  {
-	  @runningEffectName = fx-puff-running
-  }
-
-  !MODULE[FXModuleAnimateThrottle] {}
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = heatColor
-    responseSpeed = 0.005
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-  MODULE
-  {
-    name = FXModuleThrottleEffects
-    fxModuleNames = throttleColor
-    responseSpeed = 1.0
-    dependOnEngineState = True
-    dependOnThrottle = True
-  }
-
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = heatColor
-    animRate = 0.05
-    shaderProperty = _EmissiveColor
-    excludedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-  MODULE
-  {
-    name = ModuleColorChanger
-    moduleID = throttleColor
-    animRate = 1
-    shaderProperty = _EmissiveColor
-    includedRenderer = EngineCore
-    toggleInEditor = false
-    toggleInFlight = false
-    redCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    greenCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    blueCurve
-    {
-      key = 0 1
-      key = 1 1
-    }
-    alphaCurve
-    {
-      key = 0 0
-      key = 1 1
-    }
-  }
-}

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

@@ -2,7 +2,7 @@
 // Contents:
 // - LV-1 "Ant" Liquid Fuel Engine (microEngine)
 // - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini)
-// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini)
+// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini_v2)
 // - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
 // - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine)
 
@@ -350,7 +350,7 @@
 }
 
 // Spark
-@PART[liquidEngineMini]
+@PART[liquidEngineMini_v2]
 {
   @author = Chris Adderley (Nertea)
 
@@ -524,6 +524,7 @@
 	{
 		@gimbalTransformName = B_Gimbal
 	}
+  !MODULE[ModulePartVariants] {}
   MODULE
 	{
 		name = ModulePartVariants

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

@@ -2,7 +2,7 @@
 // Contents:
 // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine)
 // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME)
-// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3)
+// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2)
 // - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2)
 // - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine)
 
@@ -12,7 +12,7 @@
   @author = Chris Adderley (Nertea)
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/Engine/restock-engine-nerv-1
   }
@@ -156,7 +156,7 @@
   @author = Chris Adderley (Nertea)
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/Engine/restock-engine-vector-1
   }
@@ -433,18 +433,17 @@
 
 
 // Terrier
-@PART[liquidEngine3]
+@PART[liquidEngine3_v2]
 {
   @author = Porkjet and Chris Adderley (Nertea)
 
   !mesh = DELETE
-  !MODEL = {}
+  !MODEL {}
   MODEL {
     model = ReStock/Assets/Engine/restock-engine-terrier-1
   }
-  %rescaleFactor = 1
 
-  %node_attach = 0.0, 23.0, 0.0, 0.0, 1.0, 0.0, 1
+  node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1
   @attachRules = 1,1,1,0,0
 
   !fx_exhaustFlame_blue = DELETE
@@ -521,8 +520,9 @@
   }
 
   @bulkheadProfiles = srf, size1
-  @node_stack_top = 0.0, 28.75, 0.0, 0.0, 1.0, 0.0, 1
-  @node_stack_bottom = 0.0, -47.281375, 0.0, 0.0, -1.0, 0.0, 1
+
+  !MODULE[ModulePartVariants] {}
+
   MODULE
 	{
 		name = ModulePartVariants

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

@@ -0,0 +1,60 @@
+// Patches applying art changes to RCS blocks
+// Contents:
+// - RV-105 RCS Thruster Block (RCSBlock)
+// - Place-Anywhere 7 Linear RCS Port (linearRcs)
+
+// RCS block
+@PART[RCSBlock]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Control/restock-rcs-block-1
+  }
+}
+
+// Linear RCS port
+@PART[linearRcs]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Control/restock-rcs-linear-1
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Pod
+    VARIANT
+    {
+      name = Pod
+      displayName = #LOC_Restock_variant-linear-rcs-pod
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        RCSLinear = true
+        RCSLinearBase = false
+      }
+    }
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-linear-rcs-bare
+
+      primaryColor = #999999
+      secondaryColor = #999999
+    GAMEOBJECTS
+    {
+      RCSLinear = false
+      RCSLinearBase = true
+    }
+    }
+  }
+
+}

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

@@ -1,9 +1,9 @@
 // Patches applying art changes to 1.25m SRB engines
 // Contents:
-// - Kickback (MassiveBooster)
-// - Thumper (solidBooster1-1)
-// - Hammer (solidBooster)
-// - Flea (solidBooster_sm_v2)
+// - S1 SRB-KD25k "Kickback" Solid Fuel Booster (MassiveBooster)
+// - BACC "Thumper" Solid Fuel Booster (solidBooster1-1)
+// - RT-10 "Hammer" Solid Fuel Booster (solidBooster_v2)
+// - RT-5 "Flea" Solid Fuel Booster (solidBooster_sm_v2)
 // - Separatron I (sepMotor1)
 
 // Kickback
@@ -426,6 +426,10 @@
 			}
     }
   }
+  @MODULE[ModuleJettison]
+	{
+		@jettisonName =  ShroudSRB
+	}
 }
 
 // Flea
@@ -566,6 +570,10 @@
 			}
     }
   }
+  @MODULE[ModuleJettison]
+	{
+		@jettisonName =  ShroudSRB
+	}
 }
 // Separatron
 @PART[sepMotor1] {

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

@@ -7,7 +7,7 @@
 
 @PART[fuelTankSmallFlat]
 {
-  @author = Porkjet
+  @author =  Porkjet and Chris Adderley (Nertea)
 
   !mesh = DELETE
   !MODEL {}
@@ -15,11 +15,72 @@
     model = ReStock/Assets/FuelTank/restock-fueltank-125-4
   }
   !MODULE[ModulePartVariants] {}
+  MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = BlackAndWhite
+    VARIANT
+		{
+			name = Dark
+			displayName = #autoLOC_8007117
+			themeName = Dark
+      primaryColor = #4c4f47
+  		secondaryColor = #4c4f47
+			TEXTURE
+			{
+				mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark
+				_BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = BlackAndWhite
+			displayName = #autoLOC_8007122
+			themeName = BlackAndWhite
+			primaryColor = #ffffff
+			secondaryColor = #000000
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = White
+			displayName = #autoLOC_8007119
+			themeName = White
+			primaryColor = #ffffff
+			secondaryColor = #ffffff
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+		VARIANT
+		{
+			name = GrayAndOrange
+			displayName = #autoLOC_8007121
+			themeName = GrayAndOrange
+			primaryColor = #4c4f47
+			secondaryColor = #f49841
+			TEXTURE
+			{
+        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange
+        _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+  }
 }
 
 @PART[fuelTankSmall]
 {
-  @author = Porkjet
+  @author =  Porkjet and Chris Adderley (Nertea)
   // @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0
   // @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0
   // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
@@ -30,11 +91,72 @@
   }
   %rescaleFactor = 1
   !MODULE[ModulePartVariants] {}
+  MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = BlackAndWhite
+    VARIANT
+		{
+			name = Dark
+			displayName = #autoLOC_8007117
+			themeName = Dark
+      primaryColor = #4c4f47
+  		secondaryColor = #4c4f47
+			TEXTURE
+			{
+				mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark
+				_BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = BlackAndWhite
+			displayName = #autoLOC_8007122
+			themeName = BlackAndWhite
+			primaryColor = #ffffff
+			secondaryColor = #000000
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = White
+			displayName = #autoLOC_8007119
+			themeName = White
+			primaryColor = #ffffff
+			secondaryColor = #ffffff
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+		VARIANT
+		{
+			name = GrayAndOrange
+			displayName = #autoLOC_8007121
+			themeName = GrayAndOrange
+			primaryColor = #4c4f47
+			secondaryColor = #f49841
+			TEXTURE
+			{
+        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange
+        _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+  }
 }
 
 @PART[fuelTank]
 {
-  @author = Porkjet
+  @author =  Porkjet and Chris Adderley (Nertea)
 
   !mesh = DELETE
   !MODEL {}
@@ -43,6 +165,67 @@
   }
   %rescaleFactor = 1
   !MODULE[ModulePartVariants] {}
+  MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = BlackAndWhite
+    VARIANT
+		{
+			name = Dark
+			displayName = #autoLOC_8007117
+			themeName = Dark
+      primaryColor = #4c4f47
+  		secondaryColor = #4c4f47
+			TEXTURE
+			{
+				mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark
+				_BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = BlackAndWhite
+			displayName = #autoLOC_8007122
+			themeName = BlackAndWhite
+			primaryColor = #ffffff
+			secondaryColor = #000000
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = White
+			displayName = #autoLOC_8007119
+			themeName = White
+			primaryColor = #ffffff
+			secondaryColor = #ffffff
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+		VARIANT
+		{
+			name = GrayAndOrange
+			displayName = #autoLOC_8007121
+			themeName = GrayAndOrange
+			primaryColor = #4c4f47
+			secondaryColor = #f49841
+			TEXTURE
+			{
+        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange
+        _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+  }
   // @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0
   // @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0
   // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
@@ -50,7 +233,7 @@
 
 @PART[fuelTank_long]
 {
-  @author = Porkjet
+  @author =  Porkjet and Chris Adderley (Nertea)
   // @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0
   // @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0
   // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
@@ -60,5 +243,66 @@
     model = ReStock/Assets/FuelTank/restock-fueltank-125-1
   }
   !MODULE[ModulePartVariants] {}
+  MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = BlackAndWhite
+    VARIANT
+		{
+			name = Dark
+			displayName = #autoLOC_8007117
+			themeName = Dark
+      primaryColor = #4c4f47
+  		secondaryColor = #4c4f47
+			TEXTURE
+			{
+				mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark
+				_BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = BlackAndWhite
+			displayName = #autoLOC_8007122
+			themeName = BlackAndWhite
+			primaryColor = #ffffff
+			secondaryColor = #000000
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Bumped Specular
+			}
+		}
+		VARIANT
+		{
+			name = White
+			displayName = #autoLOC_8007119
+			themeName = White
+			primaryColor = #ffffff
+			secondaryColor = #ffffff
+			TEXTURE
+			{
+      mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white
+      _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+		VARIANT
+		{
+			name = GrayAndOrange
+			displayName = #autoLOC_8007121
+			themeName = GrayAndOrange
+			primaryColor = #4c4f47
+			secondaryColor = #f49841
+			TEXTURE
+			{
+        mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange
+        _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n
+				shader = KSP/Specular
+			}
+		}
+  }
   %rescaleFactor = 1
 }

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

@@ -26,31 +26,18 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
-  {
-    baseVariant = White
-    !primaryColor = DELETE
-    !secondaryColor = DELETE
-    !baseDisplayName = DELETE
-    !baseThemeName = DELETE
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
-      GAMEOBJECTS
-      {
-    		25TankTinyGrey = false
-    		25TankTinyOrange = true
-    		25TankTinyWhite = false
-      }
-    }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = BlackAndWhite
     VARIANT
     {
-      name = White
+      name = BlackAndWhite
       displayName = #autoLOC_8007122
-			themeName = BlackAndWhite
-			primaryColor = #ffffff
-			secondaryColor = #000000
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #000000
       GAMEOBJECTS
       {
     	  25TankTinyGrey = false
@@ -58,6 +45,21 @@
     		25TankTinyWhite = true
       }
     }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    		25TankTinyGrey = false
+    		25TankTinyOrange = true
+    		25TankTinyWhite = false
+      }
+    }
+
     VARIANT
     {
       name = Metallic
@@ -97,31 +99,18 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
-  {
-    baseVariant = White
-    !primaryColor = DELETE
-    !secondaryColor = DELETE
-    !baseDisplayName = DELETE
-    !baseThemeName = DELETE
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
-      GAMEOBJECTS
-      {
-    		25TankMedGrey = false
-    		25TankMedOrange = true
-    		25TankMedWhite = false
-      }
-    }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+	{
+		name = ModulePartVariants
+		baseVariant = BlackAndWhite
     VARIANT
     {
-      name = White
-      displayName = #autoLOC_8007122
+      name = BlackAndWhite
 			themeName = BlackAndWhite
-			primaryColor = #ffffff
-			secondaryColor = #000000
+      primaryColor = #ffffff
+  		secondaryColor = #000000
+  		displayName = #autoLOC_8007122
       GAMEOBJECTS
       {
     	  25TankMedGrey = false
@@ -129,6 +118,21 @@
     		25TankMedWhite = true
       }
     }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    		25TankMedGrey = false
+    		25TankMedOrange = true
+    		25TankMedWhite = false
+      }
+    }
+
     VARIANT
     {
       name = Metallic
@@ -167,31 +171,18 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
+  MODULE
   {
-    baseVariant = White
-    !primaryColor = DELETE
-		!secondaryColor = DELETE
-		!baseDisplayName = DELETE
-		!baseThemeName = DELETE
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
-      GAMEOBJECTS
-      {
-    		25TankSmallGrey = false
-		    25TankSmallOrange = true
-		    25TankSmallWhite = false
-      }
-    }
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
     VARIANT
     {
-      name = White
+      name = BlackAndWhite
       displayName = #autoLOC_8007122
 			themeName = BlackAndWhite
-			primaryColor = #ffffff
-			secondaryColor = #000000
+      primaryColor = #ffffff
+  		secondaryColor = #000000
       GAMEOBJECTS
       {
     	  25TankSmallGrey = false
@@ -199,6 +190,21 @@
     		25TankSmallWhite = true
       }
     }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    		25TankSmallGrey = false
+		    25TankSmallOrange = true
+		    25TankSmallWhite = false
+      }
+    }
+
     VARIANT
     {
       name = Metallic
@@ -237,12 +243,18 @@
     scale = 1,-1,1
     rotation = 0, 0, 0
   }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
+  MODULE
   {
-    @VARIANT[White]
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
+    VARIANT
     {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
       GAMEOBJECTS
       {
     		25TankLargeGrey = false
@@ -250,17 +262,23 @@
     		25TankLargeWhite = true
       }
     }
-    @VARIANT[Orange]
+    VARIANT
     {
-      !TEXTURE {}
-      !GAMEOBJECTS {}
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
       GAMEOBJECTS
       {
-    		25TankLargeGrey = false
-    		25TankLargeOrange = true
-    		25TankLargeWhite = false
+        25TankLargeGrey = false
+        25TankLargeOrange = true
+        25TankLargeWhite = false
       }
     }
+
+
+
     VARIANT
     {
       name = Metallic

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

@@ -0,0 +1,26 @@
+// Patches applying art changes to Mk2 Fuselage Parts
+// Contents:
+// - Mk2 Liquid Fuel Fuselage Short (mk2FuselageShortLiquid)
+// - Mk2 Rocket Fuel Fuselage Short (mk2FuselageShortLFO)
+// - Mk2 Monopropellant Tank (mk2FuselageShortMono)
+
+@PART[mk2FuselageShortLiquid|mk2FuselageShortLFO|mk2FuselageShortMono]:FOR[Restock]
+{
+    @author = Porkjet and blowfish
+
+    MODULE
+    {
+        name = ModuleRestockModifyMaterials
+
+        MATERIAL
+        {
+            shader = KSP/Bumped Specular
+            TEXTURE_PROPERTY
+            {
+                name = _BumpMap
+                textureUrl = Restock/Assets/FuelTank/restock-fueltank-mk2-short-n
+                isNormalMap = true
+            }
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+// Patches applying art changes to RCS tanks
+// Contents:
+// - Stratus-V Roundified Monopropellant Tank (radialRCSTank)
+// - Stratus-V Cylindrified Monopropellant Tank (rcsTankRadialLong)
+// - FL-R10 RCS Fuel Tank (rcsTankMini)
+// - FL-R25 RCS Fuel Tank (RCSFuelTank)
+// - FL-R1 RCS Fuel Tank (RCSTank1-2)
+
+//  Spherical Radial Tank
+@PART[radialRCSTank]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-1
+  }
+
+}
+
+//  Capsule Radial Tank
+@PART[rcsTankRadialLong]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-radial-2
+  }
+
+}
+
+// 0.625m Tank
+@PART[rcsTankMini]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-0625-1
+  }
+
+
+}
+
+// 1.25m Tank
+@PART[RCSFuelTank]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-125-1
+  }
+}
+
+// 2.5m Tank
+@PART[RCSTank1-2]
+{
+  @author = Chris Adderley (Nertea)
+
+  !mesh = DELETE
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/FuelTank/restock-fueltank-rcs-25-1
+  }
+  !MODULE[ModulePartVariants] {}
+}

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg

@@ -12,6 +12,58 @@
   MODEL {
     model = ReStock/Assets/Structural/restock-adapter-125-0625-1
   }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+    	  125mAdapterTallOrange = false
+    		125mAdapterTallWhite = true
+    		125mAdapterTallDark = false
+      }
+
+    }
+
+
+    VARIANT
+    {
+      name = GrayAndOrange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+    	  125mAdapterTallOrange = true
+    		125mAdapterTallWhite = false
+    		125mAdapterTallDark = false
+      }
+    }
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    	  125mAdapterTallOrange = false
+    		125mAdapterTallWhite = false
+    		125mAdapterTallDark = true
+      }
+    }
+
+  }
 }
 
 @PART[adapterSmallMiniShort]
@@ -23,4 +75,72 @@
   MODEL {
     model = ReStock/Assets/Structural/restock-adapter-125-0625-2
   }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+    	  125mAdapterShortOrange = false
+    		125mAdapterShortWhite = true
+    		125mAdapterShortDark = false
+        125mAdapterShortMetal = false
+      }
+    }
+    VARIANT
+    {
+      name = GrayAndOrange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+    	  125mAdapterShortOrange = true
+    		125mAdapterShortWhite = false
+    		125mAdapterShortDark = false
+        125mAdapterShortMetal = false
+      }
+    }
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+    	  125mAdapterShortOrange = false
+    		125mAdapterShortWhite = false
+    		125mAdapterShortDark = true
+        125mAdapterShortMetal = false
+      }
+
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+    	  125mAdapterShortOrange = false
+    		125mAdapterShortWhite = false
+    		125mAdapterShortDark = false
+        125mAdapterShortMetal = true
+      }
+
+    }
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg

@@ -12,7 +12,40 @@
   MODEL {
     model = ReStock/Assets/Structural/restock-adapter-25-125-1
   }
+  !MODULE[ModulePartVariants] {}
   %rescaleFactor = 1
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
+
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+    	  25mAdapterTallOrange = false
+    		25mAdapterTallWhite = true
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        25mAdapterTallOrange = true
+        25mAdapterTallWhite = false
+      }
+    }
+  }
 }
 
 @PART[largeAdapter2] {
@@ -24,4 +57,54 @@
     model = ReStock/Assets/Structural/restock-adapter-25-125-2
   }
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
+
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        25mAdapterShortOrange = false
+        25mAdapterShortWhite = true
+        25mAdapterShortMetal = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        25mAdapterShortOrange = true
+        25mAdapterShortWhite = false
+        25mAdapterShortMetal = false
+      }
+    }
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+        25mAdapterShortOrange = false
+        25mAdapterShortWhite = false
+        25mAdapterShortMetal = true
+      }
+    }
+
+  }
 }

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg

@@ -1,14 +1,75 @@
 // Patches applying art changes to 3.75m structural parts
 // Contents:
-// - Kerbodyne ADTP-2-3 (Size3to2Adapter)
+// - Kerbodyne ADTP-2-3 (Size3to2Adapter_v2)
 
-@PART[Size3to2Adapter] {
+@PART[Size3To2Adapter_v2] {
   @author = Chris Adderley (Nertea)
 
   !mesh = DELETE
   !MODEL {}
   MODEL {
-    model = ReStock/Assets/FuelTank/restock-adapter-375-solid-1
+    model = ReStock/Assets/FuelTank/restock-adapter-375-fueled-1
   }
+  MODEL
+	{
+		model = ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange
+		scale = 1.0, 1.0, 1.0
+		position = 0.0, 1.148, 0.0
+	}
+	MODEL
+	{
+		model = ReStock/Assets/FuelTank/restock-endcap-fueltank-375-orange
+		scale = 1.0, -1.0, 1.0
+		position = 0.0, -1.098, 0.0
+	}
   %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        375mAdapterBlackWhite = true
+        375mAdapterWhite = false
+        375mAdapterOrange = false
+      }
+
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        375mAdapterBlackWhite = false
+        375mAdapterWhite = true
+        375mAdapterOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        375mAdapterBlackWhite = false
+        375mAdapterWhite = false
+        375mAdapterOrange = true
+      }
+    }
+  }
 }

Distribution/Restock/changelog.txt

@@ -1,4 +1,4 @@
-0.1.0
+0.1.0
 -----
 - Initial release
 - Parts included:
@@ -7,6 +7,8 @@
   - PPD-10 Hitchhiker Storage Container (Nertea)
  - Control
   - .625m reaction wheel (Andrew Cassidy)
+  - RV-105 RCS Thruster Block (Nertea)
+  - Place-Anywhere 7 Linear RCS Port (Nertea)
  - Coupling
   - Inline Clamp-O-Tron (Passinglurker)
   - Clamp-O-Tron Jr. Docking Port (Nertea)
@@ -15,6 +17,8 @@
   - Clamp-O-Tron Shielded Port (Nertea)
  - Aero
   - Aerodynamic Nose Cone (Nertea)
+  - Advanced Nose Cone - Type A
+  - Advanced Nose Cone - Type B
   - Protective Rocket Nose Cone Mk7 (Nertea)
  - Thermal
   - Heat Shield (0.625m) (Nertea)
@@ -35,10 +39,10 @@
   - Kerbodyne ADTP-2-3 (Nertea)
  - Fuel Tanks
   - Oscar-B Fuel Tank (Beale)
-  - FL-T200 Fuel Tank Porkjet
-  - FL-T400 Fuel Tank Porkjet
-  - FL-T800 Fuel Tank Porkjet
-  - FL-T100 Fuel Tank Porkjet
+  - FL-T200 Fuel Tank (Porkjet/Nertea)
+  - FL-T400 Fuel Tank (Porkje/Nertea)
+  - FL-T800 Fuel Tank (Porkjet/Nertea)
+  - FL-T100 Fuel Tank (Porkjet/Nertea)
   - Rockomax Jumbo-64 Fuel Tank (Nertea)
   - Rockomax X200-16 Fuel Tank (Nertea)
   - Rockomax X200-32 Fuel Tank (Nertea)
@@ -49,12 +53,17 @@
   - PB-X150 Xenon Container (Nertea)
   - PB-X750 Xenon Container (Nertea)
   - PB-X50R Xenon Container (Nertea)
+  - Stratus-V Roundified Monopropellant Tank (Nertea)
+  - Stratus-V Cylindrified Monopropellant Tank (Nertea)
+  - FL-R10 RCS Fuel Tank (Nertea)
+  - FL-R25 RCS Fuel Tank (Nertea)
+  - FL-R1 RCS Fuel Tank (Nertea)
  - Engines
   - Separatron I (Nertea)
-  - Flea (Nertea)
-  - Hammer (Nertea)
-  - Thumper (Nertea)
-  - Kickback (Nertea)
+  - RT-5 "Flea" Solid Fuel Booster (Nertea)
+  - RT-10 "Hammer" Solid Fuel Booster (Nertea)
+  - BACC "Thumper" Solid Fuel Booster (Nertea)
+  - S1 SRB-KD25k "Kickback" Solid Fuel Booster (Nertea)
   - LV-1 "Ant" Liquid Fuel Engine (Nertea)
   - LV-1R "Spider" Liquid Fuel Engine (Nertea)
   - 48-7S "Spark" Liquid Fuel Engine (Nertea)
@@ -87,6 +96,7 @@
 - Engines are all surface attachable
 - New 'Metallic' variant for 2.5m tanks
 - New Unpainted, Black variants for heat shields
+- New Bare variant for Linear RCS
 - Engines have a basic and a compact variant
 - Most atmospheric engines also have a boattail variant
 - New plumes/FX for all redone engines

Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg

@@ -1,7 +1,7 @@
 // Adds gimballing to SRBs
 
 // Kickback
-@PART[MassiveBooster] {
+@PART[MassiveBooster]:NEEDS[!BetterSRBs] {
   MODULE
   {
     name = ModuleGimbal
@@ -11,7 +11,7 @@
 }
 
 // Thumper
-@PART[solidBooster1-1] {
+@PART[solidBooster1-1]:NEEDS[!BetterSRBs] {
 
   MODULE
   {
@@ -22,7 +22,7 @@
 }
 
 // Hammer
-@PART[solidBooster] {
+@PART[solidBooster]:NEEDS[!BetterSRBs] {
   MODULE
   {
     name = ModuleGimbal
@@ -32,7 +32,7 @@
 }
 
 // Flea
-@PART[solidBooster_sm] {
+@PART[solidBooster_sm]:NEEDS[!BetterSRBs] {
   MODULE
   {
     name = ModuleGimbal