Merge branch 'develop' into 1875-suite

Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg

@@ -130,6 +130,6 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Science/restock-sciencebox-radial
+    model = ReStock/Assets/Science/restock-sciencebox-radial-1
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg

@@ -303,6 +303,10 @@ Localization
     #LOC_RestockPlus_restock-goocanister-625-1_description = After an unfortunate accident where a technician attempted to stack delicate machinery on the classic Mystery Goo™ canister, FLOOYD Dynamics Labs saw a market opportunity for a version with a flat top and bottom.
     #LOC_RestockPlus_restock-goocanister-625-1_tags = experiment research science 0.625 restock mystery goo inline
 
+    #LOC_RestockPlus_restock-sciencebox-inline-1_title = Experiment Return Unit
+    #LOC_RestockPlus_restock-sciencebox-inline-1_description = Since science experiments kept getting destroyed before being recovered, our kerbal engineers designed the Experiment Return Unit in a conical shape to better survive the rigors of atmospheric reentry. Heat shield sold separately.
+    #LOC_RestockPlus_restock-sciencebox-inline-1_tags = experiment research science recovery reentry restock .625 1.25 inline
+
     // COMMUNICATIONS
     // ==============
     #LOC_RestockPlus_restock-relay-radial-2_title = HG-20 High Gain Antenna

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-sciencebox-stack-1.cfg

@@ -0,0 +1,66 @@
+// ReStock+ 0.2.0
+// inline science canister
+PART
+{
+  name = restock-sciencebox-stack-1
+  module = Part
+  author = Andrew Cassidy
+  MODEL
+  {
+    model = ReStock/Assets/Science/restock-sciencebox-stack-1
+    scale = 1.0, 1.0, 1.0
+  }
+  rescaleFactor = 1.0
+  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
+  attachRules = 1,0,1,1,1
+  node_stack_top =    0.0, 0.266,  0.0,  0.0,  1.0,  0.0, 0
+  node_stack_bottom = 0.0,-0.16,  0.0,  0.0, -1.0,  0.0, 0
+  TechRequired = start
+  entryCost = 0
+  cost = 1000
+  category = Science
+  subcatagory = 0
+  title = #LOC_RestockPlus_restock-sciencebox-inline-1_title //Experiment Return Unit
+  manufacturer = #autoLOC_501644 //#autoLOC_501644 = Experimental Engineering Group
+  description = #LOC_RestockPlus_restock-goocanister-625-1_description
+  // Since science experiments kept getting destroyed before being recovered, our kerbal engineers designed the Experiment Return Unit in a conical shape to better survive the rigors of atmospheric reentry. Heat shield sold separately.
+  mass = 0.10
+  dragModelType = default
+  dragModelType = default
+  maximum_drag = 0.1
+  minimum_drag = 0.1
+  angularDrag = 2
+  crashTolerance = 12
+  maxTemp = 2900
+  breakingForce = 50
+  breakingTorque = 50
+  childStageOffset = 1
+  bulkheadProfiles = size0, size1
+  tags = #LOC_RestockPlus_restock-sciencebox-inline-1_tags //experiment research science recovery reentry restock .625 1.25 inline
+
+  MODULE
+  {
+    name = FlagDecal
+    textureQuadName = flags
+  }
+
+  MODULE
+  {
+    name = ModuleConductionMultiplier
+    modifiedConductionFactor = 0.001
+    convectionFluxThreshold = 500
+  } 
+
+  MODULE
+  {
+    name = ModuleScienceContainer
+    
+    reviewActionName = #autoLOC_502201 //#autoLOC_502201 = Review Stored Data
+    storeActionName = #autoLOC_502202 //#autoLOC_502202 = Store Experiments
+    evaOnlyStorage = True // i.e. can nearby regular vessels also do this, or EVA only
+    storageRange = 1.5
+    canBeTransferredToInVessel = True
+    canTransferInVessel = True
+    showStatus = True
+  }
+}