Merge pull request #235 from BobPalmer/DEVELOP

Develop

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,4 +1,8 @@
-0.8.16 - 2017.02.11
+0.8.17 - 2017.03.17
+-------------------
+Dependency Updates
+
+0.8.16 - 2017.02.24
 -------------------
 Mechanics can now perform EVA maintenance
 Fixed an issue where resources were being double-consumed when converters were swapped

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":16,
+         "PATCH":17,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/CLS.cfg

@@ -0,0 +1,30 @@
+//transcribed by theRagingIrishman
+
+@PART[Fert_Tank_125,Fert_Tank_250,Fert_Tank_375,USILS_LgRecycler,LS_Tank_125,LS_Tank_250,LS_Tank_375]:NEEDS[ConnectedLivingSpace]
+{
+  MODULE
+   {
+       name = ModuleConnectedLivingSpace
+       passable = true
+   }
+}
+
+@PART[USILS_Greenhouse_Inline]:NEEDS[ConnectedLivingSpace]
+{
+  MODULE
+  {
+    name = ModuleConnectedLivingSpace
+    passable = true
+    surfaceAttachmentsPassable = true
+  }
+}
+
+@PART[USILS_ViewingCupola]:NEEDS[ConnectedLivingSpace]
+{
+  MODULE
+    {
+      name = ModuleConnectedLivingSpace
+      passable = true
+      passableWhenSurfaceAttached = true
+    }
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/CTT.cfg

@@ -10,21 +10,19 @@
 {
     @TechRequired = enhancedSurvivability
 }
-
 @PART[USILS_Recycler]:NEEDS[CommunityTechTree]
 {
     @TechRequired = recycling
 }
-
-@PART[USILS_Greenhouse_Sm]:NEEDS[CommunityTechTree]
+@PART[USILS_Greenhouse_MiniCupola]:NEEDS[CommunityTechTree]
 {
     @TechRequired = hydroponics
 }
-@PART[USILS_Greenhouse_250]:NEEDS[CommunityTechTree]
+@PART[USILS_Greenhouse_Inline]:NEEDS[CommunityTechTree]
 {
     @TechRequired = hydroponics
 }
-@PART[USILS_Greenhouse_Lg]:NEEDS[CommunityTechTree]
+@PART[USILS_Greenhouse_Cupola]:NEEDS[CommunityTechTree]
 {
     @TechRequired = hydroponics
 }
@@ -47,4 +45,12 @@
 @PART[MulchMiniPack]:NEEDS[CommunityTechTree]
 {
     @TechRequired = hydroponics
-}
+}
+@PART[USILS_LgRecycler]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = recycling
+}
+@PART[USILS_ViewingCupola]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = enhancedSurvivability
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/ChangeLog.txt

@@ -1,3 +1,13 @@
+0.5.24 - 2017.03.17
+-------------------
+Large recycler is now CLS Passable (Thanks mjdillon!)
+Removed all references to ReplacementParts as those are not being currently used
+Fixed an initialization issue that was causing some timer weirdness
+Fixed an issue on colony growth - having both a male and a female kerbal present is now required (no more instant kerbals!)
+Fixed an issue with refused to work / return to work spam
+Fixed an issue causing the starvation timer to be set to zero on load
+Supplies can be locked again!  Note that if the Kerbals are looking for a snack (even during the 15 day grace period) they WILL unlock all containers on your vessel.  Use with care.
+
 0.5.23 - 2017.02.24
 -------------------
 Fixed an issue where habitation was not being shared correctly

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/LSModule.cfg

@@ -4,13 +4,6 @@
 	{
 		name = ModuleLifeSupport
 	}
-
-    RESOURCE
-    {
-        name = ReplacementParts
-        amount = 2500
-        maxAmount = 2500
-    }
 
 	MODULE 
 	{
@@ -41,13 +34,6 @@
 		name = ModuleLifeSupport
 	}
 
-    RESOURCE
-    {
-        name = ReplacementParts
-        amount = 100
-        maxAmount = 100
-    }
-
 	MODULE 
 	{
 		name = ModuleHabitation
@@ -77,14 +63,7 @@
 	{
 		name = ModuleLifeSupport
 	}
-
-    RESOURCE
-    {
-        name = ReplacementParts
-        amount = 200
-        maxAmount = 200
-    }
-
+
 	MODULE
 	{
 		name = ModuleLifeSupportRecycler
@@ -115,15 +94,6 @@
 		name = ModuleLifeSupport
 	}
 
-    RESOURCE
-    {
-        name = ReplacementParts
-        amount = 100
-        maxAmount = 100
-        @amount *= #$/CrewCapacity$
-        @maxAmount *= #$/CrewCapacity$
-    }	
-
 	MODULE
 	{
 		name = USI_ModuleFieldRepair
@@ -137,15 +107,6 @@
 		name = ModuleLifeSupport
 	}
 
-    RESOURCE
-    {
-        name = ReplacementParts
-        amount = 500
-        maxAmount = 500
-        @amount *= #$/CrewCapacity$
-        @maxAmount *= #$/CrewCapacity$
-    }	
-
 	MODULE
 	{
 		name = USI_ModuleFieldRepair

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_125.cfg

@@ -42,10 +42,4 @@ RESOURCE
 	amount = 500
 	maxAmount = 500
 }
-
-  MODULE
-   {
-       name = ModuleConnectedLivingSpace
-       passable = true
-   }
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_250.cfg

@@ -42,12 +42,4 @@ RESOURCE
 	amount = 4500
 	maxAmount = 4500
 }
-
-  MODULE
-   {
-       name = ModuleConnectedLivingSpace
-       passable = true
-   }
-
-
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Fert_375.cfg

@@ -41,11 +41,4 @@ RESOURCE
 	amount = 15000
 	maxAmount = 15000
 }
-
-  MODULE
-   {
-       name = ModuleConnectedLivingSpace
-       passable = true
-   }
-
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse_Inline.cfg

@@ -2,7 +2,7 @@ PART
 {
 	name = USILS_Greenhouse_Inline
 	module = Part
-	author = RoverDude 
+	author = RoverDude
 	rescaleFactor = 1
 	node_stack_bottom = 0,-2,0,0,-1,0,2
 	node_stack_top = 0,2,0,0,1,0,2
@@ -11,9 +11,9 @@ PART
 	cost = 5000
 	category = none
 	subcategory = 0
-	title = Nom-O-Matic 25000-I	
+	title = Nom-O-Matic 25000-I
 	manufacturer = USI - Life Support Division
-	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.  
+	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,0,1,1,0
 	mass = 1.52
 	dragModelType = default
@@ -29,8 +29,8 @@ PART
 	INTERNAL
 	{
 		name = crewCabinInternals
-	}	
-	
+	}
+
 	MODEL
 	{
 		model = UmbraSpaceIndustries/LifeSupport/Assets/InlineGreenhouse
@@ -60,9 +60,7 @@ PART
 		amount = 600
 		maxAmount = 600
 	}
-
 
-
 	MODULE
 	{
 		name = ModuleResourceConverter_USI
@@ -91,12 +89,5 @@ PART
 			ResourceName = ElectricCharge
 			Ratio = 2.64
 		}
-	}	
-
-	MODULE
-	{
-		name = ModuleConnectedLivingSpace
-		passable = true
-		surfaceAttachmentsPassable = true
-	}	
+	}
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/LgRecycler.cfg

@@ -2,7 +2,7 @@ PART
 {
 	name = USILS_LgRecycler
 	module = Part
-	author = RoverDude 
+	author = RoverDude
 	rescaleFactor = 1
 	node_stack_top = 0,1,0,0,1,0,2
 	node_stack_bottom = 0,-1,0,0,-1,0,2
@@ -46,12 +46,4 @@ PART
 			Ratio = 18.75
 		}
 	}
-
-	MODULE
- 	{
-		name = ModuleConnectedLivingSpace
-		passable = true
-	}
-
-
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_125.cfg

@@ -49,9 +49,4 @@ RESOURCE
 	amount = 0
 	maxAmount = 10
 }
-  MODULE
-   {
-       name = ModuleConnectedLivingSpace
-       passable = true
-   }
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.cfg

@@ -49,9 +49,4 @@ RESOURCE
 	amount = 0
 	maxAmount = 150
 }
-  MODULE
-   {
-       name = ModuleConnectedLivingSpace
-       passable = true
-   }
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.cfg

@@ -48,10 +48,4 @@ RESOURCE
 	amount = 0
 	maxAmount = 300
 }
-
-  MODULE
-   {
-       name = ModuleConnectedLivingSpace
-       passable = true
-   }
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Parts/ViewingCupola.cfg

@@ -2,7 +2,7 @@ PART
 {
 	name = USILS_ViewingCupola
 	module = Part
-	author = RoverDude 
+	author = RoverDude
 	rescaleFactor = 1
 	node_attach = 0,-.05,0,0,-1,0
 	node_stack_bottom = 0,0,0,0,-1,0
@@ -11,7 +11,7 @@ PART
 	cost = 100
 	category = none
 	subcategory = 0
-	title = Viewing Cupola	
+	title = Viewing Cupola
 	manufacturer = USI - Life Support Division
 	description = A small window into the stars!  One Kerbal at a time only.  Don't ask how they get in here...
 	attachRules = 1,1,0,0,0
@@ -34,32 +34,25 @@ PART
 	INTERNAL
 	{
 		name = ViewingCupolaInternal
-	}	
+	}
 	MODULE
 	{
 		name = FlagDecal
 		textureQuadName = FLAG
-	}	
-	MODULE 
+	}
+	MODULE
 	{
 		name = ModuleHabitation
 		BaseKerbalMonths = 0
 		CrewCapacity = 1
 		BaseHabMultiplier = 0.5
 		ConverterName = Habitat
 		StartActionName = Start Habitat
-		StopActionName = Stop Habitat		
+		StopActionName = Stop Habitat
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
 			Ratio = 0.0125
 		}
 	}
-	
-	MODULE
-    {
-        name = ModuleConnectedLivingSpace
-        passable = true
-        passableWhenSurfaceAttached = true
-    }
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/Resources.cfg

@@ -1,10 +0,0 @@
-RESOURCE_DEFINITION
-{
-   name = ReplacementParts
-   density = 0.0
-   flowMode = NO_FLOW
-   transfer = NONE
-   unitCost = 0
-   isTweakable = false
-   isVisible = false
-}

FOR_RELEASE/GameData/UmbraSpaceIndustries/LifeSupport/USI-LS.version

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":5,
-         "PATCH":23,
+         "PATCH":24,
          "BUILD":0
      },
      "KSP_VERSION":{