Merge remote-tracking branch 'origin/master' into develop

2024-09-01 17:34:42 +00:00 · 2020-09-21 18:51:29 -07:00
parent a57ed98c17 492753dce4
commit fcd24b7c5c
118 changed files with 2763 additions and 629 deletions
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-1.cfg
@ -22,24 +22,26 @@ PART

  /// Flag to disable this part if MH is installed
  MHReplacement = True
-  
+
  TechRequired = start
  entryCost = 0
-  cost = 1000
+  cost = 600
  category = Pods
  title = #LOC_RestockPlus_restock-pod-sphere-1_title // SP-1 'Clementine' Reentry Module
  manufacturer = #autoLOC_501678 //#autoLOC_501678 = Probodobodyne Inc
  description = #LOC_RestockPlus_restock-pod-sphere-1_description 
  // When faced with the challenge of keeping the heat shield facing forward during reentry, one engineer suggested making the whole thing a heat shield, and this spherical command module was born.
-  mass = 1
+  mass = 0.75
  dragModelType = default
-  maximum_drag = 0.2
+  maximum_drag = 0.20
  minimum_drag = 0.15
  angularDrag = 2
  CoMOffset = 0.0, -0.2, 0.0
  CoPOffset = 0.0, 0.2, 0.0
  crashTolerance = 12
-  maxTemp = 2000 // = 3400
+  maxTemp = 1400 // = 3400
+  skinMaxTemp = 2400
+  thermalMassModifier = 2.5
  explosionPotential = 0
  vesselType = Ship
  stagingIcon = DECOUPLER_VERT
@ -60,6 +62,13 @@ PART
  {
    name = ModuleCommand
    minimumCrew = 1
+    defaultControlPointDisplayName = #autoLOC_6011003 //#autoLOC_6011003 = Default
+    CONTROLPOINT
+    {
+      name = reverse
+      displayName = #autoLOC_6011004 //#autoLOC_6011004 = Reversed
+      orientation = 0,0,180
+    }
  }

  RESOURCE
@ -74,7 +83,6 @@ PART
    name = ModulePartVariants
    useMultipleDragCubes = false
    baseVariant = Green
-
    VARIANT
    {
      name = Bare
@ -101,9 +109,9 @@ PART
    }
  }

-
  fx_gasBurst_white = 0.0, 0.0650517, 0.0, 0.0, 1.0, 0.0, decouple
  sound_vent_large = decouple
+
  MODULE
  {
    name = ModuleAnchoredDecoupler
@ -113,19 +121,6 @@ PART
    partDecoupled = false
  }

-  MODULE
-  {
-    name = ModuleReactionWheel
-    PitchTorque = 0.15
-    YawTorque = 0.15
-    RollTorque = 0.15
-    RESOURCE
-    {
-      name = ElectricCharge
-      rate = 0.015
-    }
-  }
-
  MODULE
  {
    name = ModuleDataTransmitter
@ -140,10 +135,25 @@ PART
    packetCeiling = 5
  }

+  MODULE
+  {
+    name = ModuleScienceExperiment  
+    experimentID = crewReport
+    experimentActionName = #autoLOC_502009 //#autoLOC_502009 = Crew Report
+    resetActionName = #autoLOC_502010 //#autoLOC_502010 = Discard Crew Report
+    reviewActionName = #autoLOC_502200 //#autoLOC_502200 = Review Report
+    useStaging = False  
+    useActionGroups = True
+    hideUIwhenUnavailable = True  
+    rerunnable = True
+    xmitDataScalar = 1.0
+    usageReqMaskInternal = 5
+    usageReqMaskExternal = -1
+  }  
+
  MODULE
  {
    name = ModuleScienceContainer
-  
    reviewActionName = #autoLOC_502201  //#autoLOC_502201 = Review Stored Data
    storeActionName = #autoLOC_502202 //#autoLOC_502202 = Store Experiments
    evaOnlyStorage = True
@ -159,7 +169,6 @@ PART
    pyrolysisLossFactor = 6000
    reentryConductivity = 0.01
    ablationTempThresh = 500
-    
    useChar = True
    charModuleName = shieldChar
  }
@ -172,7 +181,6 @@ PART
    useRate = False
    toggleInEditor = False
    toggleInFlight = False
-    
    redCurve
    {
      key = 0 0
@ -193,6 +201,7 @@ PART
      key = 0 0.8
    }
  }
+
  RESOURCE
  {
    name = Ablator
@ -246,6 +255,6 @@ PART

  DRAG_CUBE
  {
-     cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815
+    cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815
  } 
 }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-2.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-2.cfg
@ -22,10 +22,10 @@ PART

  /// Flag to disable this part if MH is installed
  MHReplacement = True
-  
-  TechRequired = start
-  entryCost = 0
-  cost = 1500
+
+  TechRequired = flightControl
+  entryCost = 3000
+  cost = 2000
  category = Pods
  title = #LOC_RestockPlus_restock-pod-sphere-2_title // SP-2 'Tangerine' Reentry Module
  manufacturer = #autoLOC_501678 //#autoLOC_501678 = Probodobodyne Inc
@ -33,13 +33,15 @@ PART
  // We removed some "unnecessary" equipment from the SP-1 Reentry Module to make room for a second seat. This decision had made the design department very unpopular with the astronauts.
  mass = 1.5
  dragModelType = default
-  maximum_drag = 0.2
+  maximum_drag = 0.20
  minimum_drag = 0.15
  angularDrag = 2
  CoMOffset = 0.0, -0.2, 0.0
  CoPOffset = 0.0, 0.2, 0.0
  crashTolerance = 12
-  maxTemp = 2000 // = 3400
+  maxTemp = 1400 // = 3400
+  skinMaxTemp = 2400
+  thermalMassModifier = 2.5 
  explosionPotential = 0
  vesselType = Ship
  stagingIcon = DECOUPLER_VERT
@ -60,6 +62,19 @@ PART
  {
    name = ModuleCommand
    minimumCrew = 1
+    defaultControlPointDisplayName = #autoLOC_6011003 //#autoLOC_6011003 = Default
+    CONTROLPOINT
+    {
+      name = reverse
+      displayName = #autoLOC_6011004 //#autoLOC_6011004 = Reversed
+      orientation = 0,0,180
+    }
+    CONTROLPOINT
+    {
+      name = forward
+      displayName = #autoLOC_6011001 //#autoLOC_6011001 = Forward
+      orientation = 0,90,0
+    }
  }

  RESOURCE
@ -74,7 +89,6 @@ PART
    name = ModulePartVariants
    useMultipleDragCubes = false
    baseVariant = Beige
-
    VARIANT
    {
      name = Bare
@ -101,9 +115,9 @@ PART
    }
  }

-
  fx_gasBurst_white = 0.0, 0.0650517, 0.0, 0.0, 1.0, 0.0, decouple
  sound_vent_large = decouple
+
  MODULE
  {
    name = ModuleAnchoredDecoupler
@ -127,10 +141,25 @@ PART
    packetCeiling = 5
  }

+  MODULE
+  {
+    name = ModuleScienceExperiment  
+    experimentID = crewReport
+    experimentActionName = #autoLOC_502009 //#autoLOC_502009 = Crew Report
+    resetActionName = #autoLOC_502010 //#autoLOC_502010 = Discard Crew Report
+    reviewActionName = #autoLOC_502200 //#autoLOC_502200 = Review Report
+    useStaging = False  
+    useActionGroups = True
+    hideUIwhenUnavailable = True  
+    rerunnable = True
+    xmitDataScalar = 1.0
+    usageReqMaskInternal = 5
+    usageReqMaskExternal = -1
+  }
+
  MODULE
  {
    name = ModuleScienceContainer
-  
    reviewActionName = #autoLOC_502201  //#autoLOC_502201 = Review Stored Data
    storeActionName = #autoLOC_502202 //#autoLOC_502202 = Store Experiments
    evaOnlyStorage = True
@ -146,7 +175,6 @@ PART
    pyrolysisLossFactor = 6000
    reentryConductivity = 0.01
    ablationTempThresh = 500
-    
    useChar = True
    charModuleName = shieldChar
  }
@ -159,7 +187,6 @@ PART
    useRate = False
    toggleInEditor = False
    toggleInFlight = False
-    
    redCurve
    {
      key = 0 0
@ -180,6 +207,7 @@ PART
      key = 0 0.8
    }
  }
+
  RESOURCE
  {
    name = Ablator
@ -233,6 +261,6 @@ PART

  DRAG_CUBE
  {
-     cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815
+    cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815
  } 
 }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-3.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/125/restock-pod-sphere-3.cfg
@ -22,24 +22,26 @@ PART

  /// Flag to disable this part if MH is installed
  MHReplacement = True
-  
-  TechRequired = start
-  entryCost = 0
-  cost = 2000
+
+  TechRequired = advFlightControl
+  entryCost = 4000
+  cost = 3000
  category = Pods
  title = #LOC_RestockPlus_restock-pod-sphere-3_title // SP-3 'Mandarin' Reentry Module
  manufacturer = #autoLOC_501678 //#autoLOC_501678 = Probodobodyne Inc
  description =  #LOC_RestockPlus_restock-pod-sphere-3_description 
  // We hired a shady interior decorator to fit three seats into the same space as one. The occupants are no longer able to move their arms to access the controls, but at least they'll probably survive.
-  mass = 2
+  mass = 2.25
  dragModelType = default
-  maximum_drag = 0.2
+  maximum_drag = 0.20
  minimum_drag = 0.15
  angularDrag = 2
  CoMOffset = 0.0, -0.2, 0.0
  CoPOffset = 0.0, 0.2, 0.0
  crashTolerance = 12
-  maxTemp = 2000 // = 3400
+  maxTemp = 1400 // = 3400
+  skinMaxTemp = 2400
+  thermalMassModifier = 2.5
  explosionPotential = 0
  vesselType = Ship
  stagingIcon = DECOUPLER_VERT
@ -60,13 +62,26 @@ PART
  {
    name = ModuleCommand
    minimumCrew = 1
+    defaultControlPointDisplayName = #autoLOC_6011003 //#autoLOC_6011003 = Default
+    CONTROLPOINT
+    {
+      name = reverse
+      displayName = #autoLOC_6011004 //#autoLOC_6011004 = Reversed
+      orientation = 0,0,180
+    }
+    CONTROLPOINT
+    {
+      name = forward
+      displayName = #autoLOC_6011001 //#autoLOC_6011001 = Forward
+      orientation = 0,90,0
+    }
  }

  RESOURCE
  {
    name = ElectricCharge
-    amount = 40
-    maxAmount = 40
+    amount = 50
+    maxAmount = 50
  }

  MODULE
@ -74,7 +89,6 @@ PART
    name = ModulePartVariants
    useMultipleDragCubes = false
    baseVariant = White
-
    VARIANT
    {
      name = Bare
@ -103,6 +117,7 @@ PART

  fx_gasBurst_white = 0.0, 0.0650517, 0.0, 0.0, 1.0, 0.0, decouple
  sound_vent_large = decouple
+
  MODULE
  {
    name = ModuleAnchoredDecoupler
@ -126,10 +141,25 @@ PART
    packetCeiling = 5
  }

+  MODULE
+  {
+    name = ModuleScienceExperiment  
+    experimentID = crewReport
+    experimentActionName = #autoLOC_502009 //#autoLOC_502009 = Crew Report
+    resetActionName = #autoLOC_502010 //#autoLOC_502010 = Discard Crew Report
+    reviewActionName = #autoLOC_502200 //#autoLOC_502200 = Review Report
+    useStaging = False  
+    useActionGroups = True
+    hideUIwhenUnavailable = True  
+    rerunnable = True
+    xmitDataScalar = 1.0
+    usageReqMaskInternal = 5
+    usageReqMaskExternal = -1
+  }
+
  MODULE
  {
    name = ModuleScienceContainer
-  
    reviewActionName = #autoLOC_502201  //#autoLOC_502201 = Review Stored Data
    storeActionName = #autoLOC_502202 //#autoLOC_502202 = Store Experiments
    evaOnlyStorage = True
@ -145,7 +175,6 @@ PART
    pyrolysisLossFactor = 6000
    reentryConductivity = 0.01
    ablationTempThresh = 500
-    
    useChar = True
    charModuleName = shieldChar
  }
@ -158,7 +187,6 @@ PART
    useRate = False
    toggleInEditor = False
    toggleInFlight = False
-    
    redCurve
    {
      key = 0 0
@ -179,6 +207,7 @@ PART
      key = 0 0.8
    }
  }
+
  RESOURCE
  {
    name = Ablator
@ -232,6 +261,6 @@ PART

  DRAG_CUBE
  {
-     cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815
+    cube = Default,2.543,1.0245,1.065,2.543,1.03905,0.977,2.449,0.9777,1.093,2.449,1.0857,1.246,2.634,1.04415,1.051,2.631,1.0437,0.9639, 0.04938,0.25,0.03567, 1.842,1.85,1.815
  } 
 }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg
@ -1,5 +1,6 @@
 // ReStock+ 0.1.0
 // size 0 claw
+// NOTE: Soft-deprecated as of KSP 1.10 update
 PART
 {
  name = restock-claw-625-1
@ -7,7 +8,7 @@ PART
  author = Andrew Cassidy
  MODEL
  {
-    model = ReStockPlus/Assets/Coupling/restock-claw-625
+    model = ReStock/Assets/Coupling/restock-claw-625-1
    scale = 1.0, 1.0, 1.0
  }
  rescaleFactor = 1.0
@ -19,7 +20,8 @@ PART
  entryCost = 4000
  cost = 350
  mass = 0.03
-  category = Coupling
+  category = none
+  TechHidden = True
  subcategory = 0
  title = #LOC_RestockPlus_restock-claw-625-1_title //Advanced Grabbing Unit Junior
  manufacturer = #autoLOC_501631 //#autoLOC_501631 = STEADLER Engineering Corps
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/5/restock-decoupler-5-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/5/restock-decoupler-5-1.cfg
@ -38,7 +38,7 @@ PART
  sound_decoupler_fire = decouple
  /// Flag to disable this part if MH is installed
  MHReplacement = True
-  MODULE
+   MODULE
  {
    name = ModulePartVariants
    useMultipleDragCubes = false
@ -46,7 +46,7 @@ PART
    VARIANT
    {
      name = White
-      displayName = 
+      displayName = #autoLOC_8007122
      themeName = BlackAndWhite
      primaryColor = #ffffff
      secondaryColor = #000000
@ -54,12 +54,13 @@ PART
      {
        5mDecoupler = true
        5mDecouplerOrange = false
+        5mDecouplerClassic = false
      }
    }
    VARIANT
    {
      name = Orange
-      displayName = 
+      displayName = #autoLOC_8007123
      themeName = Orange
      primaryColor = #f49841
      secondaryColor = #4c4f47
@ -67,6 +68,20 @@ PART
      {
        5mDecoupler = false
        5mDecouplerOrange = true
+        5mDecouplerClassic = false
+      }
+    }
+    VARIANT
+    {
+       name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        5mDecoupler = false
+        5mDecouplerOrange = false
+        5mDecouplerClassic = true
      }
    }
  }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/5/restock-separator-5-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/5/restock-separator-5-1.cfg
@ -46,7 +46,7 @@ PART
    VARIANT
    {
      name = White
-      displayName = 
+      displayName = #autoLOC_8007122
      themeName = BlackAndWhite
      primaryColor = #ffffff
      secondaryColor = #000000
@ -54,12 +54,13 @@ PART
      {
        5mSeparator = true
        5mSeparatorOrange = false
+         5mSeparatorClassic = false
      }
    }
    VARIANT
    {
      name = Orange
-      displayName = 
+      displayName = #autoLOC_8007123
      themeName = Orange
      primaryColor = #f49841
      secondaryColor = #4c4f47
@ -67,6 +68,20 @@ PART
      {
        5mSeparator = false
        5mSeparatorOrange = true
+        5mSeparatorClassic = false
+      }
+    }
+    VARIANT
+    {
+       name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        5mSeparator = false
+        5mSeparatorOrange = false
+        5mSeparatorClassic = true
      }
    }
  }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
@ -146,7 +146,7 @@ PART
    {
      key = 0 295
      key = 1 275
-      key = 12 100
+      key = 12 0.001
    }
  }
  MODULE
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-anvil.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-anvil.cfg
@ -135,7 +135,7 @@ PART
    {
      key = 0 238
      key = 1 212
-      key = 4 100
+      key = 4 0.001
    }
  }
  RESOURCE
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg
@ -164,7 +164,7 @@ PART
    {
      key = 0 300
      key = 1 280
-      key = 12 100
+      key = 12 0.001
    }
  }
  MODULE
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/125/restock-service-module-125-625-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/125/restock-service-module-125-625-1.cfg
@ -0,0 +1,189 @@
+PART
+{
+  name = restock-service-module-125-625-1
+  module = Part
+  author = Well
+    
+  MODEL
+  {
+    model = ReStock/Assets/Payload/restock-Size1to0ServiceModule
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-crewed-endcap-2
+    position = 0.0, -0.336654, 0.0
+    scale = 1,-1,1
+    rotation = 0, 0, 0  
+    name = endcap_bottom
+  }
+  MODEL
+  {
+    model = ReStock/Assets/Command/restock-crewed-endcap-2
+    position = 0.0, 0.3125, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0    
+    name = endcap_top
+  }
+  
+  rescaleFactor = 1
+  node_stack_top = 0.0, 0.3125, 0.0, 0.0, 1.0, 0.0, 0
+  node_stack_bottom = 0.0, -0.31966, 0.0, 0.0, -1.0, 0.0, 1
+  
+  fx_gasBurst_white = 0.0, 0.3, 0.0, 0.0, 1.0, 0.0, deploy
+  sound_vent_large = deploy
+  
+  // Flag to disable this part if MH is installed
+  MHReplacement = True
+
+  TechRequired = advConstruction
+  entryCost = 3000
+  cost = 300
+  category = Payload
+  subcategory = 0
+  title = #LOC_RestockPlus_restock-service-module-125-625-1_title // Service Module (1.25m)
+  manufacturer = #autoLOC_501665   //#autoLOC_501665 = FLOOYD Dynamics Research Labs
+  description = #LOC_RestockPlus_restock-service-module-125-625-1_description 
+  // A small conical service module, for storing parachutes, instruments, and other small devices. Includes an optional docking tunnel.
+  tags = #LOC_RestockPlus_restock-service-module-125-625-1_tags // restock bus contain hollow protect (stor cone tunnel.
+
+  attachRules = 1,0,1,1,0
+  mass = 0.075
+  thermalMassModifier = 2.0
+  skinMassPerArea = 4.0
+  skinInternalConductionMult = 0.25
+  // heatConductivity = 0.06 // half default
+  emissiveConstant = 0.8
+  dragModelType = default
+  maximum_drag = 0.2
+  minimum_drag = 0.2
+  angularDrag = 2
+  crashTolerance = 9
+  maxTemp = 2600 // = 3400
+  
+  stageOffset = 1
+  childStageOffset = 1
+  
+  fuelCrossFeed = True
+  bulkheadProfiles = size1 size0
+  
+  MODULE
+  {
+    name = ModuleServiceModule
+    ExteriorColliderName = COLShell
+    partDecoupled = false
+  }
+  
+  MODULE
+  {
+    name = ModuleCargoBay
+    DeployModuleIndex = 0
+    closedPosition = 0
+    lookupRadius = 0.75
+    useBayContainer = true
+    bayContainerName = COLShell
+  }
+
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName = Shell1
+    isFairing = False
+    jettisonedObjectMass = 0.1
+    jettisonForce = 1
+    jettisonDirection = 1 0 0
+    hideJettisonMenu = true
+    allowShroudToggle = false
+    ignoreNodes = true
+  }
+
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName = Shell2
+    isFairing = False
+    jettisonedObjectMass = 0.1
+    jettisonForce = 1
+    jettisonDirection = -1 0 0
+    hideJettisonMenu = true    
+    allowShroudToggle = false
+    ignoreNodes = true
+  }  
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = NoTunnel
+    VARIANT
+    {
+      name = NoTunnel
+      displayName = #LOC_Restock_variant-service-bay-open // Open
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        endcap_top = false      
+        endcap_bottom = false
+        Base_CrewTunnel = false
+        Base_Structural = true
+        EndCap_Structural = true
+        COLCrewTunnel = false      
+      }
+    }
+    VARIANT
+    {
+      name = Tunnel
+      displayName = #LOC_Restock_variant-service-bay-tunnel
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        endcap_top = true      
+        endcap_bottom = true
+        Base_CrewTunnel = true
+        Base_Structural = false
+        EndCap_Structural = false
+        COLCrewTunnel = true      
+      }
+    }  
+  }
+
+  MODULE
+  {
+    name = ModuleColorChanger
+    shaderProperty = _EmissiveColor
+    animRate = 0.8
+    animState = false
+    useRate = true
+    toggleInEditor = true
+    toggleInFlight = true
+    toggleInFlight = true
+    unfocusedRange = 5
+    toggleName = Toggle Lights
+    eventOnName = #autoLOC_6001409   //#autoLOC_6001409 = Lights On
+    eventOffName = #autoLOC_6001408   //#autoLOC_6001408 = 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
+    }
+  }  
+}
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-fairing-1875-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-fairing-1875-1.cfg
@ -309,6 +309,7 @@ PART
        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
+        BaseMaterialName = FairingBase
        _Shininess= 0.3
      }
      GAMEOBJECTS
@ -339,6 +340,7 @@ PART
        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
+        BaseMaterialName = FairingBase
        _Shininess= 0.3
      }
      GAMEOBJECTS
@ -369,6 +371,7 @@ PART
        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
+        BaseMaterialName = FairingBase
        _Shininess= 0.3
      }
      GAMEOBJECTS
@ -382,34 +385,40 @@ PART
        FairingBase1875Silver = false
      }
    }
-    VARIANT
+	VARIANT
    {
-      name = Metal
-      displayName = #LOC_Restock_variant-surface_metal
-      themeName = Metal
-      primaryColor = #6f6e6d
-      secondaryColor = #6f6e6d
+      name = Gold
+      displayName = #autoLOC_8007118
+      themeName = Gold
+      description = #autoLOC_8003046
+      primaryColor = #fccb0a
      TEXTURE
      {
        materialName=FairingsMat
-        mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-gold
      }
      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
+        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
      {
        FairingBase1875White = false
        FairingBase1875BlackWhite = false
        FairingBase1875Orange = false
-        FairingBase1875Metal = true
-        FairingBase1875Gold = false
+        FairingBase1875Metal = false
+        FairingBase1875Gold = true
        FairingBase1875Silver = false
        FairingBase1875Inner = true
      }
@ -452,40 +461,35 @@ PART
        FairingBase1875Inner = true
      }
    }
-    VARIANT
+	VARIANT
    {
-      name = Gold
-      displayName = #autoLOC_8007118
-      themeName = Gold
-      description = #autoLOC_8003046
-      primaryColor = #fccb0a
+      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-gold
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-metal
      }
      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
-
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
+        BaseMaterialName = FairingBase
+        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
      {
        FairingBase1875White = false
        FairingBase1875BlackWhite = false
        FairingBase1875Orange = false
-        FairingBase1875Metal = false
-        FairingBase1875Gold = true
+        FairingBase1875Metal = true
+        FairingBase1875Gold = false
        FairingBase1875Silver = false
        FairingBase1875Inner = true
      }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-service-module-1875-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-service-module-1875-1.cfg
@ -0,0 +1,156 @@
+PART
+{
+  name = restock-service-module-1875-1
+  module = Part
+  author = Well
+    
+  MODEL
+  {
+    model = ReStock/Assets/Payload/restock-ServiceModule18
+  }
+
+  rescaleFactor = 1
+  node_stack_top = 0.0, 0.75, 0.0, 0.0, 1.0, 0.0, 1
+  node_stack_bottom = 0.0, -0.75, 0.0, 0.0, -1.0, 0.0, 1
+  
+  fx_gasBurst_white = 0.0, 0.3, 0.0, 0.0, 1.0, 0.0, deploy
+  sound_vent_large = deploy
+  
+  // Flag to disable this part if MH is installed
+  MHReplacement = True
+
+  TechRequired = advConstruction
+  entryCost = 3000
+  cost = 300
+  category = Payload
+  subcategory = 0
+  title = #LOC_RestockPlus_restock-service-module-1875-1_title // Service Module (1.875m)
+  manufacturer = #autoLOC_501665   //#autoLOC_501665 = FLOOYD Dynamics Research Labs
+  description =  #LOC_RestockPlus_restock-service-module-1875-1_description 
+  // A medium sized service module, for storing fuel tanks, batteries, fuel cells, etc.
+  tags = #LOC_RestockPlus_restock-service-module-1875-1_tags // restock bus contain hollow protect (stor Gemini
+  attachRules = 1,0,1,1,0
+  mass = 0.15
+  thermalMassModifier = 2.0
+  skinMassPerArea = 4.0
+  skinInternalConductionMult = 0.25
+  // heatConductivity = 0.06 // half default
+  emissiveConstant = 0.8
+  dragModelType = default
+  maximum_drag = 0.2
+  minimum_drag = 0.2
+  angularDrag = 2
+  crashTolerance = 9
+  maxTemp = 2600 // = 3400
+  
+  stageOffset = 1
+  childStageOffset = 1
+  
+  fuelCrossFeed = True
+  bulkheadProfiles = size1p5
+  MODULE
+  {
+    name = ModuleServiceModule
+    ExteriorColliderName = COLShell
+    partDecoupled = false
+  }
+  
+  MODULE
+  {
+    name = ModuleCargoBay
+    DeployModuleIndex = 0
+    closedPosition = 0
+    lookupRadius = 0.75
+    useBayContainer = true
+    bayContainerName = COLShell
+  }
+
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName = Shell1
+    isFairing = False
+    jettisonedObjectMass = 0.2
+    jettisonForce = 2
+    jettisonDirection = 1 0 0
+    hideJettisonMenu = true
+    allowShroudToggle = false
+    ignoreNodes = true
+  }
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName = Shell2
+    isFairing = False
+    jettisonedObjectMass = 0.2
+    jettisonForce = 30
+    jettisonDirection = -1 0 0
+    hideJettisonMenu = true    
+    allowShroudToggle = false
+    ignoreNodes = true
+  }
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName = Shell3
+    isFairing = False
+    jettisonedObjectMass = 0.2
+    jettisonForce = 2
+    jettisonDirection = 1 0 0
+    hideJettisonMenu = true    
+    allowShroudToggle = false
+    ignoreNodes = true
+  }    
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName = Shell4
+    isFairing = False
+    jettisonedObjectMass = 0.2
+    jettisonForce = 2
+    jettisonDirection = -1 0 0
+    hideJettisonMenu = true    
+    allowShroudToggle = false
+    ignoreNodes = true
+  }
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = NoShelves
+    VARIANT
+    {
+      name = NoShelves
+      displayName = #LOC_Restock_variant-service-bay-open // Open
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        COLMid01 = false      
+        COLMid02 = false
+        Core_Platform = false
+        Core_Without_Platform = true
+        Platform = false
+        Torus = false      
+      }
+    }  
+    VARIANT
+    {
+      name = Shelves
+      displayName = #LOC_Restock_variant-service-bay-shelves // Shelves
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        COLMid01 = true      
+        COLMid02 = true
+        Core_Platform = true
+        Core_Without_Platform = false
+        Platform = true
+        Torus = true      
+      }
+    }
+  }  
+}
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/5/restock-fairing-5-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/5/restock-fairing-5-1.cfg
@ -283,7 +283,7 @@ PART
    VARIANT
    {
      name = White
-      displayName = 
+      displayName = #autoLOC_8007119
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
@ -314,7 +314,7 @@ PART
    VARIANT
    {
      name = BlackAndWhite
-      displayName = 
+      displayName = #autoLOC_8007120
      themeName = BlackAndWhite
      primaryColor = #000000
      secondaryColor = #ffffff
@ -345,7 +345,7 @@ PART
    VARIANT
    {
      name = Orange
-      displayName = 
+      displayName = #autoLOC_8007121
      themeName = Orange
      primaryColor = #f49841
      secondaryColor = #4c4f47
@ -373,35 +373,40 @@ PART
        FairingBase5Silver = false
      }
    }
-    VARIANT
+	VARIANT
    {
-      name = Metal
-      displayName = #LOC_Restock_variant-surface_metal
-      themeName = Metal
-      primaryColor = #6f6e6d
-      secondaryColor = #6f6e6d
+      name = Gold
+      displayName = #autoLOC_8007118
+      themeName = Gold
+      description = #autoLOC_8003046
+      primaryColor = #fccb0a
      TEXTURE
      {
        materialName=FairingsMat
-        mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-metal
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-5-1-gold
      }
      EXTRA_INFO
      {
-        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-metal
-        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n
+        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-5-1-gold
+        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-5-1-n
+        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular5
        BaseMaterialName=FairingBase
-        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
+        shaderName=KSP/Bumped Specular (Mapped)
+        
+        _SpecMap=ReStock/Assets/Payload/FairingsMat_goldSpecular
+        _Shininess= 0.41
+        _Opacity= 1.0
+        _RimFalloff= 2.0
+        _AmbientMultiplier= 0.3
+
      }
      GAMEOBJECTS
      {
        FairingBase5White = false
        FairingBase5BlackWhite = false
        FairingBase5Orange = false
-        FairingBase5Metal = true
-        FairingBase5Gold = false
+        FairingBase5Metal = false
+        FairingBase5Gold = true
        FairingBase5Silver = false
        FairingBase5Inner = true
      }
@ -444,40 +449,35 @@ PART
        FairingBase5Inner = true
      }
    }
-    VARIANT
+	VARIANT
    {
-      name = Gold
-      displayName = #autoLOC_8007118
-      themeName = Gold
-      description = #autoLOC_8003046
-      primaryColor = #fccb0a
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
      TEXTURE
      {
        materialName=FairingsMat
-        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-5-1-gold
+        mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-metal
      }
      EXTRA_INFO
      {
-        FairingsTextureURL=ReStock/Assets/Payload/restock-fairing-5-1-gold
-        FairingsNormalURL=ReStock/Assets/Payload/restock-fairing-5-1-n
-        FairingsSpecularURL=ReStock/Assets/Payload/FairingsMat_goldSpecular5
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-metal
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n
        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
-
+        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
      {
        FairingBase5White = false
        FairingBase5BlackWhite = false
        FairingBase5Orange = false
-        FairingBase5Metal = false
-        FairingBase5Gold = true
+        FairingBase5Metal = true
+        FairingBase5Gold = false
        FairingBase5Silver = false
        FairingBase5Inner = true
      }