diff --git a/FOR_RELEASE/GameData/ModuleManager.2.6.13.dll b/FOR_RELEASE/GameData/ModuleManager.2.6.13.dll
new file mode 100644
index 0000000..a965fca
Binary files /dev/null and b/FOR_RELEASE/GameData/ModuleManager.2.6.13.dll differ
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/CTT.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/CTT.cfg
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/CTT.cfg
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/CTT.cfg
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
similarity index 73%
rename from GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
index dc25ba6..7b5a0e1 100644
--- a/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt
@@ -1,7 +1,13 @@
-USI Life Support - ChangeLog
+0.1.7 - 2015.11.19
+------------------
+Pushed version number up a bit due to some version number shenanigans
+Adjusted mass of Nom-O-Matic 5000 (thanks mhoram!)
+Corrected various part costs (thanks fat-lobyte!)
+Fixed an issue where returned Kerbals were remaining tourists
-0.1.4 - 2015.07.01
-* Corrected collider and node issues with large greenhouse
+0.1.4 - 2015.11.09
+------------------
+Update for KSP 1.0.5
0.1.3 - 2015.06.26
* You can now access the life support screen from the KSC, VAB, and Tracking Station
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/LSModule.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/LSModule.cfg
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/LSModule.cfg
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/LSModule.cfg
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass30.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass30.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass30.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/BlueGlass30.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FrostedGlass30.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FrostedGlass30.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/FrostedGlass30.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/FrostedGlass30.dds
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.cfg
new file mode 100644
index 0000000..295d5e7
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.cfg
@@ -0,0 +1,72 @@
+PART
+{
+ name = USILS_Greenhouse
+ module = Part
+ author = RoverDude
+ rescaleFactor = 1
+ node_attach = 0,-.15,0,0,-1,0
+ node_stack_bottom = 0,-.25,0,0,-1,0
+ TechRequired = survivability
+ entryCost = 1000
+ cost = 100
+ category = Utility
+ subcategory = 0
+ title = Nom-O-Matic 5000
+ manufacturer = Umbra Space Industries
+ description = The Nom-O-Matic offers the latest in automated gardening and food generation. Simply toss in mulch (not included!) and harvest bland but mildly nutritions noms.
+ attachRules = 1,1,0,0,0
+ mass = 1.5
+ dragModelType = default
+ maximum_drag = 0.25
+ minimum_drag = 0.25
+ angularDrag = .5
+ crashTolerance = 45
+ breakingForce = 280
+ breakingTorque = 280
+ maxTemp = 1700
+ bulkheadProfiles = size1,srf
+
+ MODEL
+ {
+ model = UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse
+ }
+
+ RESOURCE
+ {
+ name = Mulch
+ amount = 0
+ maxAmount = 100
+ }
+ RESOURCE
+ {
+ name = Supplies
+ amount = 100
+ maxAmount = 100
+ }
+
+ MODULE
+ {
+ name = ModuleResourceConverter
+ ConverterName = Greenhouse
+ tag = Greenhouse
+ StartActionName = Start Greenhouse
+ StopActionName = Stop Greenhouse
+
+ INPUT_RESOURCE
+ {
+ ResourceName = Mulch
+ Ratio = 0.00005
+ }
+ INPUT_RESOURCE
+ {
+ ResourceName = ElectricCharge
+ Ratio = 3
+ }
+ OUTPUT_RESOURCE
+ {
+ ResourceName = Supplies
+ Ratio = 0.000025
+ DumpExcess = False
+ }
+ }
+}
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.mu
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.mu
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.mu
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.cfg
new file mode 100644
index 0000000..4f691d5
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.cfg
@@ -0,0 +1,108 @@
+PART
+{
+ name = USILS_Greenhouse_LG
+ module = Part
+ author = RoverDude
+ rescaleFactor = 1
+ node_attach = 0,-.15,0,0,-1,0
+ node_stack_bottom = 0,-.25,0,0,-1,0
+ TechRequired = survivability
+ entryCost = 1000
+ cost = 5000
+ category = Utility
+ subcategory = 0
+ title = Nom-O-Matic 25000
+ manufacturer = Umbra Space Industries
+ description = The Nom-O-Matic offers the latest in automated gardening and food generation. Simply toss in mulch (not included!) and harvest bland but mildly nutritions noms. Now in a larger, more efficient model!
+ attachRules = 1,1,0,0,0
+ mass = 4.5
+ dragModelType = default
+ maximum_drag = 0.25
+ minimum_drag = 0.25
+ angularDrag = .5
+ crashTolerance = 45
+ breakingForce = 280
+ breakingTorque = 280
+ maxTemp = 1700
+
+ MODEL
+ {
+ model = UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse
+ }
+
+ RESOURCE
+ {
+ name = Mulch
+ amount = 0
+ maxAmount = 500
+ }
+ RESOURCE
+ {
+ name = Supplies
+ amount = 500
+ maxAmount = 500
+ }
+ RESOURCE
+ {
+ name = Fertilizer
+ amount = 500
+ maxAmount = 500
+ }
+
+ MODULE
+ {
+ name = ModuleResourceConverter
+ tag = Greenhouse
+ ConverterName = Greenhouse
+ StartActionName = Start Greenhouse
+ StopActionName = Stop Greenhouse
+ INPUT_RESOURCE
+ {
+ ResourceName = Mulch
+ Ratio = 0.0002
+ }
+ OUTPUT_RESOURCE
+ {
+ ResourceName = Supplies
+ Ratio = 0.0001
+ DumpExcess = False
+ }
+ INPUT_RESOURCE
+ {
+ ResourceName = ElectricCharge
+ Ratio = 12
+ }
+ }
+
+ MODULE
+ {
+ name = ModuleResourceConverter
+ tag = Agroponics
+ ConverterName = Agroponics
+ StartActionName = Start Agroponics
+ StopActionName = Stop Agroponics
+ INPUT_RESOURCE
+ {
+ ResourceName = Mulch
+ Ratio = 0.0002
+ }
+ INPUT_RESOURCE
+ {
+ ResourceName = Fertilizer
+ Ratio = 0.00004
+
+ }
+ OUTPUT_RESOURCE
+ {
+ ResourceName = Supplies
+ Ratio = 0.00024
+ DumpExcess = False
+ }
+ INPUT_RESOURCE
+ {
+ ResourceName = ElectricCharge
+ Ratio = 12
+ }
+ }
+
+}
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.mu
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.mu
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.mu
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak.mu
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak.mu
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak.mu
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_01.cfg
new file mode 100644
index 0000000..c5404dd
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_01.cfg
@@ -0,0 +1,39 @@
+PART
+{
+ name = LifeSupportMiniPack
+ module = Part
+ author = RoverDude
+ rescaleFactor = 1
+ node_attach = 0,0,.15,0,0,-1
+ TechRequired = survivability
+ entryCost = 1000
+ cost = 100
+ category = Utility
+ subcategory = 0
+ title = Life Support MiniPak (Supplies)
+ manufacturer = Umbra Space Industries
+ description = While we firmly believe you can never have enough snacks, the engineers and load planners disagreed, and provided this smaller, more conveniently sized supply container.
+ attachRules = 0,1,0,0,0
+ mass = 0.02
+ dragModelType = default
+ maximum_drag = 0.25
+ minimum_drag = 0.25
+ angularDrag = .5
+ crashTolerance = 45
+ breakingForce = 280
+ breakingTorque = 280
+ maxTemp = 1700
+
+ MODEL
+ {
+ model = UmbraSpaceIndustries/LifeSupport/Parts/MiniPak
+ texture = miniPak, UmbraSpaceIndustries/LifeSupport/Parts/miniPak_01
+ }
+
+ RESOURCE
+ {
+ name = Supplies
+ amount = 100
+ maxAmount = 100
+ }
+}
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_02.cfg
new file mode 100644
index 0000000..73bdd0c
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_02.cfg
@@ -0,0 +1,39 @@
+PART
+{
+ name = FertilizerMiniPack
+ module = Part
+ author = RoverDude
+ rescaleFactor = 1
+ node_attach = 0,0,.15,0,0,-1
+ TechRequired = survivability
+ entryCost = 1000
+ cost = 100
+ category = Utility
+ subcategory = 0
+ title = Life Support MiniPak (Fertilizer)
+ manufacturer = Umbra Space Industries
+ description = For the larger Nom-O-Matic, provided a starter (Fertilizer) to dramatically extend life support capabilities.
+ attachRules = 0,1,0,0,0
+ mass = 0.02
+ dragModelType = default
+ maximum_drag = 0.25
+ minimum_drag = 0.25
+ angularDrag = .5
+ crashTolerance = 45
+ breakingForce = 280
+ breakingTorque = 280
+ maxTemp = 1700
+
+ MODEL
+ {
+ model = UmbraSpaceIndustries/LifeSupport/Parts/MiniPak
+ texture = miniPak, UmbraSpaceIndustries/LifeSupport/Parts/miniPak_03
+ }
+
+ RESOURCE
+ {
+ name = Fertilizer
+ amount = 100
+ maxAmount = 100
+ }
+}
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_03.cfg
new file mode 100644
index 0000000..287a62f
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_03.cfg
@@ -0,0 +1,39 @@
+PART
+{
+ name = MulchMiniPack
+ module = Part
+ author = RoverDude
+ rescaleFactor = 1
+ node_attach = 0,0,.15,0,0,-1
+ TechRequired = survivability
+ entryCost = 1000
+ cost = 100
+ category = Utility
+ subcategory = 0
+ title = Life Support MiniPak (Mulch)
+ manufacturer = Umbra Space Industries
+ description = When tossing stuff out the airlock is simply not an option.
+ attachRules = 0,1,0,0,0
+ mass = 0.02
+ dragModelType = default
+ maximum_drag = 0.25
+ minimum_drag = 0.25
+ angularDrag = .5
+ crashTolerance = 45
+ breakingForce = 280
+ breakingTorque = 280
+ maxTemp = 1700
+
+ MODEL
+ {
+ model = UmbraSpaceIndustries/LifeSupport/Parts/MiniPak
+ texture = miniPak, UmbraSpaceIndustries/LifeSupport/Parts/miniPak_02
+ }
+
+ RESOURCE
+ {
+ name = Mulch
+ amount = 0
+ maxAmount = 100
+ }
+}
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N_NRM.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N_NRM.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N_NRM.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/NomTank_N_NRM.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Plant.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Plant.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/Plant.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Plant.dds
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.cfg
new file mode 100644
index 0000000..c35b7e3
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.cfg
@@ -0,0 +1,53 @@
+PART
+{
+name = LS_Tank_125
+module = Part
+author = RoverDude
+
+MODEL
+{
+ model = UmbraSpaceIndustries/LifeSupport/Parts/Tank_125
+}
+
+rescaleFactor = 1
+
+node_attach = 0,0,0.6,0,0,-1,1
+node_stack_top = 0.0, .25, 0.0, 0.0, 1.0, 0.0, 1
+node_stack_bottom = 0.0, -.25, 0.0, 0.0, -1.0, 0.0, 1
+
+
+TechRequired = survivability
+entryCost = 3000
+cost = 500
+category = Utility
+subcategory = 0
+title = Life Support Tank (1.25)
+manufacturer = Umbra Space Industries
+description = A tank filled to the brim with Nutritional Organic Meal Substitutes (N.O.M.S.).
+attachRules = 1,1,1,1,0
+
+// --- standard part parameters ---
+mass = 0.1
+dragModelType = default
+maximum_drag = 0.2
+minimum_drag = 0.2
+angularDrag = 2
+crashTolerance = 7
+maxTemp = 2000 // = 3000
+bulkheadProfiles = size1,srf
+
+RESOURCE
+{
+ name = Supplies
+ amount = 500
+ maxAmount = 500
+}
+
+RESOURCE
+{
+ name = Mulch
+ amount = 0
+ maxAmount = 10
+}
+
+}
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.mu
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.mu
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.mu
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.cfg
new file mode 100644
index 0000000..f705460
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.cfg
@@ -0,0 +1,53 @@
+PART
+{
+name = LS_Tank_250
+module = Part
+author = RoverDude
+
+MODEL
+{
+ model = UmbraSpaceIndustries/LifeSupport/Parts/Tank_250
+}
+
+rescaleFactor = 1
+
+node_attach = 0,0,1.2,0,0,-1,1
+node_stack_top = 0.0, .5, 0.0, 0.0, 1.0, 0.0, 1
+node_stack_bottom = 0.0, -.5, 0.0, 0.0, -1.0, 0.0, 1
+
+
+TechRequired = survivability
+entryCost = 3000
+cost = 1000
+category = Utility
+subcategory = 0
+title = Life Support Tank (2.5)
+manufacturer = Umbra Space Industries
+description = A tank filled to the brim with Nutritional Organic Meal Substitutes (N.O.M.S.).
+attachRules = 1,1,1,1,0
+
+// --- standard part parameters ---
+mass = 0.9
+dragModelType = default
+maximum_drag = 0.2
+minimum_drag = 0.2
+angularDrag = 2
+crashTolerance = 7
+maxTemp = 2000 // = 3000
+bulkheadProfiles = size2,srf
+
+RESOURCE
+{
+ name = Supplies
+ amount = 4500
+ maxAmount = 4500
+}
+
+RESOURCE
+{
+ name = Mulch
+ amount = 0
+ maxAmount = 150
+}
+
+}
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.mu
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.mu
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.mu
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.cfg
new file mode 100644
index 0000000..48bc531
--- /dev/null
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.cfg
@@ -0,0 +1,53 @@
+PART
+{
+name = LS_Tank_375
+module = Part
+author = RoverDude
+
+MODEL
+{
+ model = UmbraSpaceIndustries/LifeSupport/Parts/Tank_375
+}
+rescaleFactor = 1
+
+node_attach = 0,0,1.8,0,0,-1,1
+node_stack_top = 0.0, .75, 0.0, 0.0, 1.0, 0.0, 1
+node_stack_bottom = 0.0, -.75, 0.0, 0.0, -1.0, 0.0, 1
+
+
+TechRequired = survivability
+entryCost = 3000
+cost = 1500
+category = Utility
+subcategory = 0
+title = Life Support Tank (3.75)
+manufacturer = Umbra Space Industries
+description = A tank filled to the brim with Nutritional Organic Meal Substitutes (N.O.M.S.).
+attachRules = 1,1,1,1,0
+
+// --- standard part parameters ---
+mass = 3.0
+dragModelType = default
+maximum_drag = 0.2
+minimum_drag = 0.2
+angularDrag = 2
+crashTolerance = 7
+maxTemp = 2000 // = 3000
+bulkheadProfiles = size3,srf
+
+RESOURCE
+{
+ name = Supplies
+ amount = 15000
+ maxAmount = 15000
+}
+
+RESOURCE
+{
+ name = Mulch
+ amount = 0
+ maxAmount = 300
+}
+
+
+}
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.mu b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.mu
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.mu
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.mu
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_01.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_01.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_01.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_01.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_02.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_02.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_02.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_02.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_03.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_03.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_03.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_03.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_N_NRM.dds b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_N_NRM.dds
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_N_NRM.dds
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/miniPak_N_NRM.dds
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Resources.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Resources.cfg
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Resources.cfg
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Resources.cfg
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Settings.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Settings.cfg
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Settings.cfg
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Settings.cfg
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/Supplies.png b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Supplies.png
similarity index 100%
rename from GameData/UmbraSpaceIndustries/LifeSupport/Supplies.png
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Supplies.png
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version
similarity index 91%
rename from GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version
rename to FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version
index c418aa2..1b92fd3 100644
--- a/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version
+++ b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version
@@ -10,13 +10,13 @@
"VERSION":{
"MAJOR":0,
"MINOR":1,
- "PATCH":5,
+ "PATCH":7,
"BUILD":0
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":0,
- "PATCH":4
+ "PATCH":5
},
"KSP_VERSION_MIN":{
"MAJOR":1,
@@ -26,6 +26,6 @@
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":0,
- "PATCH":4
+ "PATCH":5
}
}
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll
new file mode 100644
index 0000000..868c75a
Binary files /dev/null and b/FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll differ
diff --git a/license.txt b/FOR_RELEASE/license.txt
similarity index 100%
rename from license.txt
rename to FOR_RELEASE/license.txt
diff --git a/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll b/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll
deleted file mode 100644
index c581b07..0000000
Binary files a/GameData/UmbraSpaceIndustries/LifeSupport/USILifeSupport.dll and /dev/null differ
diff --git a/Source/USILifeSupport/LifeSupportManager.cs b/Source/USILifeSupport/LifeSupportManager.cs
index b492e69..5c8fb32 100644
--- a/Source/USILifeSupport/LifeSupportManager.cs
+++ b/Source/USILifeSupport/LifeSupportManager.cs
@@ -82,6 +82,7 @@ public LifeSupportStatus FetchKerbal(ProtoCrewMember crew)
k.LastMeal = Planetarium.GetUniversalTime();
k.LastUpdate = Planetarium.GetUniversalTime();
k.IsGrouchy = false;
+ k.OldTrait = crew.experienceTrait.Title;
TrackKerbal(k);
}
@@ -102,6 +103,7 @@ public void TrackKerbal(LifeSupportStatus status)
kerbInfo.LastMeal = status.LastMeal;
kerbInfo.LastUpdate = status.LastUpdate;
kerbInfo.IsGrouchy = status.IsGrouchy;
+ kerbInfo.OldTrait = status.OldTrait;
LifeSupportScenario.Instance.settings.SaveStatusNode(status);
}
diff --git a/Source/USILifeSupport/LifeSupportPersistance.cs b/Source/USILifeSupport/LifeSupportPersistance.cs
index 3b1abe8..e75c89c 100644
--- a/Source/USILifeSupport/LifeSupportPersistance.cs
+++ b/Source/USILifeSupport/LifeSupportPersistance.cs
@@ -78,6 +78,7 @@ public void Save(ConfigNode node)
rNode.AddValue("KerbalName", r.KerbalName);
rNode.AddValue("LastMeal", r.LastMeal);
rNode.AddValue("IsGrouchy", r.IsGrouchy);
+ rNode.AddValue("OldTrait", r.OldTrait);
rNode.AddValue("LastUpdate", r.LastUpdate);
SettingsNode.AddNode(rNode);
}
@@ -190,6 +191,7 @@ public void SaveStatusNode(LifeSupportStatus status)
}
kerbInfo.LastMeal = status.LastMeal;
kerbInfo.IsGrouchy = status.IsGrouchy;
+ kerbInfo.OldTrait = status.OldTrait;
kerbInfo.LastUpdate = status.LastUpdate;
}
diff --git a/Source/USILifeSupport/LifeSupportStatus.cs b/Source/USILifeSupport/LifeSupportStatus.cs
index c06a949..32f030b 100644
--- a/Source/USILifeSupport/LifeSupportStatus.cs
+++ b/Source/USILifeSupport/LifeSupportStatus.cs
@@ -6,5 +6,7 @@ public class LifeSupportStatus
public double LastMeal { get; set; }
public double LastUpdate { get; set; }
public bool IsGrouchy { get; set; }
+
+ public string OldTrait { get; set; }
}
}
\ No newline at end of file
diff --git a/Source/USILifeSupport/ModuleLifeSupport.cs b/Source/USILifeSupport/ModuleLifeSupport.cs
index 5198d4f..f161043 100644
--- a/Source/USILifeSupport/ModuleLifeSupport.cs
+++ b/Source/USILifeSupport/ModuleLifeSupport.cs
@@ -19,15 +19,10 @@ public override void OnStart(StartState state)
v.VesselId = part.vessel.id.ToString();
LifeSupportManager.Instance.TrackVessel(v);
Fields["status"].guiActive = false;
+ IsActivated = true;
}
}
- protected override float GetHeatMultiplier(ConverterResults result, double deltaTime)
- {
- //No need for heat generation
- return 0f;
- }
-
protected override ConversionRecipe PrepareRecipe(double deltatime)
{
//This is where the rubber hits the road. Let us see if we can
@@ -43,6 +38,11 @@ protected override ConversionRecipe PrepareRecipe(double deltatime)
return recipe;
}
+
+ protected override void PreProcessing()
+ {
+ }
+
public override bool IsSituationValid()
{
//Disable life support if we are in a pre-launch state.
@@ -83,7 +83,7 @@ protected override void PostProcess(ConverterResults result, double deltaTime)
string msg = string.Format("{0} has returned to duty", c.name);
ScreenMessages.PostScreenMessage(msg, 5f, ScreenMessageStyle.UPPER_CENTER);
c.type = ProtoCrewMember.KerbalType.Crew;
- KerbalRoster.SetExperienceTrait(c, "");
+ KerbalRoster.SetExperienceTrait(c,k.OldTrait);
k.IsGrouchy = false;
}
}
@@ -141,8 +141,10 @@ private void CheckSideEffects(LifeSupportStatus kStat, ProtoCrewMember crew)
string msg = string.Format("{0} refuses to work.", crew.name);
ScreenMessages.PostScreenMessage(msg, 5f, ScreenMessageStyle.UPPER_CENTER);
crew.type = ProtoCrewMember.KerbalType.Tourist;
+ kStat.OldTrait = crew.experienceTrait.Title;
KerbalRoster.SetExperienceTrait(crew, "Tourist");
kStat.IsGrouchy = true;
+
LifeSupportManager.Instance.TrackKerbal(kStat);
}
}
diff --git a/Source/USILifeSupport/USILifeSupport.csproj b/Source/USILifeSupport/USILifeSupport.csproj
index cdb2c4a..be9990c 100644
--- a/Source/USILifeSupport/USILifeSupport.csproj
+++ b/Source/USILifeSupport/USILifeSupport.csproj
@@ -17,7 +17,7 @@
false
none
false
- ..\..\..\..\..\..\..\KSP_DEV\GameData\UmbraSpaceIndustries\LifeSupport\
+ ..\..\..\..\KSP_DEV\GameData\UmbraSpaceIndustries\LifeSupport\
DEBUG;TRACE
prompt
4
@@ -32,7 +32,7 @@
- ..\..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll
+ ..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll
False
@@ -42,7 +42,7 @@
- ..\..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll
+ ..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll
False