Merge pull request #39 from Nils277/development

Development
Nils277 · Apr 30, 2018 · cfebe87 · cfebe87
2 parents a86c1db + 916ce85
commit cfebe87
Show file tree

Hide file tree

Showing 62 changed files with 210 additions and 138 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,24 @@
+# v1.2.5 *-Preparations-*
+*[Released 30.APRIL.2018]*
+
+**Update:**
+
+* Recompile for KSP 1.4.3
+
+**General:**
+
+* Moved Props from FUR to Kerbetrotter directory
+
+**Enhancements:**
+
+* Enhanced the ladder of the ladder with platform a bit
+* Tweaked friction of the wheels to reduce risk of rover tipping 
+
+**Bug Fixes:**
+
+* Fixed problems of IVA switch for docking bay
+* Fixed the IVA being off on parts behind hitches when the rover crashes
+
 # v1.2.4 *-Ten Four-*
 *[Released 04.APRIL.2018]*
 

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,15 @@
+v1.2.5 [Released 30.APRIL.2018] ~Preparations~
+    Update:
+        - Recompile for KSP 1.4.3 
+    General:
+        - Moved Props from FUR to Kerbetrotter directory
+    Enhancements:
+        - Enhanced the ladder of the ladder with platform a bit
+        - Tweaked friction of the wheels to reduce risk of rover tipping 
+    Bug Fixes:
+        - Fixed problems of IVA switch for docking bay
+        - Fixed the IVA being off on parts behind hitches when the rover crashes
+-------------------------------------------------------
 v1.2.4 [Released 04.APRIL.2018] ~Ten Four~
     Update:
         - Recompile for KSP 1.4.2

diff --git a/.../Assets/Props/Lynx_Atmosphere_Analysis.mu → ...Props/Kerbetrotter_Atmosphere_Analysis.mu b/.../Assets/Props/Lynx_Atmosphere_Analysis.mu → ...Props/Kerbetrotter_Atmosphere_Analysis.mu
diff --git a/...lineUtilityRover/Assets/Props/Lynx_Bed.mu → ...terTools/Assets/Props/Kerbetrotter_Bed.mu b/...lineUtilityRover/Assets/Props/Lynx_Bed.mu → ...terTools/Assets/Props/Kerbetrotter_Bed.mu
diff --git a/...tyRover/Assets/Props/Lynx_Computer_Lab.mu → ...ols/Assets/Props/Kerbetrotter_Computer.mu b/...tyRover/Assets/Props/Lynx_Computer_Lab.mu → ...ols/Assets/Props/Kerbetrotter_Computer.mu
diff --git a/...tilityRover/Assets/Props/Lynx_Computer.mu → ...Assets/Props/Kerbetrotter_Computer_Lab.mu b/...tilityRover/Assets/Props/Lynx_Computer.mu → ...Assets/Props/Kerbetrotter_Computer_Lab.mu
diff --git a/...lineUtilityRover/Assets/Props/Lynx_Cup.mu → ...terTools/Assets/Props/Kerbetrotter_Cup.mu b/...lineUtilityRover/Assets/Props/Lynx_Cup.mu → ...terTools/Assets/Props/Kerbetrotter_Cup.mu
diff --git a/...neUtilityRover/Assets/Props/Lynx_Drink.mu → ...rTools/Assets/Props/Kerbetrotter_Drink.mu b/...neUtilityRover/Assets/Props/Lynx_Drink.mu → ...rTools/Assets/Props/Kerbetrotter_Drink.mu
diff --git a/...tyRover/Assets/Props/Lynx_Extinguisher.mu → ...Assets/Props/Kerbetrotter_Extinguisher.mu b/...tyRover/Assets/Props/Lynx_Extinguisher.mu → ...Assets/Props/Kerbetrotter_Extinguisher.mu
diff --git a/...ease/GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_FirstAid.mu b/...ease/GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_FirstAid.mu
diff --git a/...Rover/Assets/Props/Lynx_Fluid_Analysis.mu → ...sets/Props/Kerbetrotter_Fluid_Analysis.mu b/...Rover/Assets/Props/Lynx_Fluid_Analysis.mu → ...sets/Props/Kerbetrotter_Fluid_Analysis.mu
diff --git a/...neUtilityRover/Assets/Props/Lynx_Hatch.mu → ...rTools/Assets/Props/Kerbetrotter_Hatch.mu b/...neUtilityRover/Assets/Props/Lynx_Hatch.mu → ...rTools/Assets/Props/Kerbetrotter_Hatch.mu
diff --git a/...tilityRover/Assets/Props/Lynx_LabChair.mu → ...ols/Assets/Props/Kerbetrotter_LabChair.mu b/...tilityRover/Assets/Props/Lynx_LabChair.mu → ...ols/Assets/Props/Kerbetrotter_LabChair.mu
diff --git a/...Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Lamps.mu b/...Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Lamps.mu
diff --git a/...ineUtilityRover/Assets/Props/Lynx_Seat.mu → ...erTools/Assets/Props/Kerbetrotter_Seat.mu b/...ineUtilityRover/Assets/Props/Lynx_Seat.mu → ...erTools/Assets/Props/Kerbetrotter_Seat.mu
diff --git a/...ilityRover/Assets/Props/Lynx_SeatSmall.mu → ...ls/Assets/Props/Kerbetrotter_SeatSmall.mu b/...ilityRover/Assets/Props/Lynx_SeatSmall.mu → ...ls/Assets/Props/Kerbetrotter_SeatSmall.mu
diff --git a/...GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Soil_Analysis.mu b/...GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Soil_Analysis.mu
diff --git a/...GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Statusdisplay.mu b/...GameData/KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Statusdisplay.mu
diff --git a/...neUtilityRover/Assets/Props/Lynx_Teddy.mu → ...rTools/Assets/Props/Kerbetrotter_Teddy.mu b/...neUtilityRover/Assets/Props/Lynx_Teddy.mu → ...rTools/Assets/Props/Kerbetrotter_Teddy.mu
diff --git a/...eUtilityRover/Assets/Props/Lynx_props.dds → ...Tools/Assets/Props/Kerbetrotter_props.dds b/...eUtilityRover/Assets/Props/Lynx_props.dds → ...Tools/Assets/Props/Kerbetrotter_props.dds
diff --git a/...lityRover/Assets/Props/Lynx_props_NRM.dds → ...s/Assets/Props/Kerbetrotter_props_NRM.dds b/...lityRover/Assets/Props/Lynx_props_NRM.dds → ...s/Assets/Props/Kerbetrotter_props_NRM.dds
diff --git a/...over/Assets/Props/Lynx_props_emissive.dds → ...ets/Props/Kerbetrotter_props_emissive.dds b/...over/Assets/Props/Lynx_props_emissive.dds → ...ets/Props/Kerbetrotter_props_emissive.dds
diff --git a/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Plugins/KerbetrotterTools.dll b/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Plugins/KerbetrotterTools.dll
diff --git a/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Props/Atmosphere_Analysis.cfg b/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Props/Atmosphere_Analysis.cfg
@@ -0,0 +1,15 @@
+PROP
+{
+    name = Kerbetrotter_Atmosphere_Analysis
+    MODEL
+    {
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Atmosphere_Analysis
+    }
+    MODULE
+    {
+        name = internalGeneric
+    }
+}
+
+proxy = 0, 0, 0, 	0.40, 0.60, 0.40, 	0, 1, 0
+
diff --git a/...otterLtd/FelineUtilityRover/Props/Bed.cfg → ...erLtd/000_KerbetrotterTools/Props/Bed.cfg b/...otterLtd/FelineUtilityRover/Props/Bed.cfg → ...erLtd/000_KerbetrotterTools/Props/Bed.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Bed
+    name = Kerbetrotter_Bed
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Bed
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Bed
     }
 
     MODULE

diff --git a/...Ltd/FelineUtilityRover/Props/Computer.cfg → .../000_KerbetrotterTools/Props/Computer.cfg b/...Ltd/FelineUtilityRover/Props/Computer.cfg → .../000_KerbetrotterTools/Props/Computer.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Computer
+    name = Kerbetrotter_Computer
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Computer
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Computer
     }
     MODULE
     {

diff --git a/...FelineUtilityRover/Props/Computer_Lab.cfg → ..._KerbetrotterTools/Props/Computer_Lab.cfg b/...FelineUtilityRover/Props/Computer_Lab.cfg → ..._KerbetrotterTools/Props/Computer_Lab.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Computer_Lab
+    name = Kerbetrotter_Computer_Lab
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Computer_Lab
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Computer_Lab
     }
     MODULE
     {

diff --git a/...otterLtd/FelineUtilityRover/Props/Cup.cfg → ...erLtd/000_KerbetrotterTools/Props/Cup.cfg b/...otterLtd/FelineUtilityRover/Props/Cup.cfg → ...erLtd/000_KerbetrotterTools/Props/Cup.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Cup
+    name = Kerbetrotter_Cup
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Cup
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Cup
     }
     MODULE
     {

diff --git a/...terLtd/FelineUtilityRover/Props/Drink.cfg → ...Ltd/000_KerbetrotterTools/Props/Drink.cfg b/...terLtd/FelineUtilityRover/Props/Drink.cfg → ...Ltd/000_KerbetrotterTools/Props/Drink.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Drink
+    name = Kerbetrotter_Drink
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Drink
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Drink
     }
 
     MODULE

diff --git a/...FelineUtilityRover/Props/Extinguisher.cfg → ..._KerbetrotterTools/Props/Extinguisher.cfg b/...FelineUtilityRover/Props/Extinguisher.cfg → ..._KerbetrotterTools/Props/Extinguisher.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Extinguisher
+    name = Kerbetrotter_Extinguisher
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Extinguisher
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Extinguisher
     }
 
     MODULE

diff --git a/...Ltd/FelineUtilityRover/Props/FirstAid.cfg → .../000_KerbetrotterTools/Props/FirstAid.cfg b/...Ltd/FelineUtilityRover/Props/FirstAid.cfg → .../000_KerbetrotterTools/Props/FirstAid.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_FirstAid
+    name = Kerbetrotter_FirstAid
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_FirstAid
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_FirstAid
     }
     MODULE
     {

diff --git a/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Props/Fluid_Analysis.cfg b/For Release/GameData/KerbetrotterLtd/000_KerbetrotterTools/Props/Fluid_Analysis.cfg
@@ -0,0 +1,15 @@
+PROP
+{
+    name = Kerbetrotter_Fluid_Analysis
+    MODEL
+    {
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Fluid_Analysis
+    }
+    MODULE
+    {
+        name = internalGeneric
+    }
+}
+
+proxy = 0, 0, 0, 	0.40, 0.60, 0.40, 	0, 1, 0
+
diff --git a/...terLtd/FelineUtilityRover/Props/Hatch.cfg → ...Ltd/000_KerbetrotterTools/Props/Hatch.cfg b/...terLtd/FelineUtilityRover/Props/Hatch.cfg → ...Ltd/000_KerbetrotterTools/Props/Hatch.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Hatch
+    name = Kerbetrotter_Hatch
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Hatch
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Hatch
     }
     MODULE
     {

diff --git a/...Ltd/FelineUtilityRover/Props/LabChair.cfg → .../000_KerbetrotterTools/Props/LabChair.cfg b/...Ltd/FelineUtilityRover/Props/LabChair.cfg → .../000_KerbetrotterTools/Props/LabChair.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_LabChair
+    name = Kerbetrotter_LabChair
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_LabChair
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_LabChair
     }
     MODULE
     {

diff --git a/...terLtd/FelineUtilityRover/Props/Lamps.cfg → ...Ltd/000_KerbetrotterTools/Props/Lamps.cfg b/...terLtd/FelineUtilityRover/Props/Lamps.cfg → ...Ltd/000_KerbetrotterTools/Props/Lamps.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Lamps
+    name = Kerbetrotter_Lamps
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Lamps
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Lamps
     }
     MODULE
     {

diff --git a/...tterLtd/FelineUtilityRover/Props/Seat.cfg → ...rLtd/000_KerbetrotterTools/Props/Seat.cfg b/...tterLtd/FelineUtilityRover/Props/Seat.cfg → ...rLtd/000_KerbetrotterTools/Props/Seat.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Seat
+    name = Kerbetrotter_Seat
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Seat
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Seat
     }
     MODULE
     {

diff --git a/...td/FelineUtilityRover/Props/SeatSmall.cfg → ...000_KerbetrotterTools/Props/SeatSmall.cfg b/...td/FelineUtilityRover/Props/SeatSmall.cfg → ...000_KerbetrotterTools/Props/SeatSmall.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_SeatSmall
+    name = Kerbetrotter_SeatSmall
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_SeatSmall
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_SeatSmall
     }
     MODULE
     {

diff --git a/...elineUtilityRover/Props/Soil_Analysis.cfg → ...KerbetrotterTools/Props/Soil_Analysis.cfg b/...elineUtilityRover/Props/Soil_Analysis.cfg → ...KerbetrotterTools/Props/Soil_Analysis.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Soil_Analysis
+    name = Kerbetrotter_Soil_Analysis
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Soil_Analysis
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Soil_Analysis
     }
     MODULE
     {

diff --git a/...elineUtilityRover/Props/Statusdisplay.cfg → ...KerbetrotterTools/Props/Statusdisplay.cfg b/...elineUtilityRover/Props/Statusdisplay.cfg → ...KerbetrotterTools/Props/Statusdisplay.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Statusdisplay
+    name = Kerbetrotter_Statusdisplay
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Statusdisplay
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Statusdisplay
     }
 
     MODULE

diff --git a/...terLtd/FelineUtilityRover/Props/Teddy.cfg → ...Ltd/000_KerbetrotterTools/Props/Teddy.cfg b/...terLtd/FelineUtilityRover/Props/Teddy.cfg → ...Ltd/000_KerbetrotterTools/Props/Teddy.cfg
@@ -1,9 +1,9 @@
 PROP
 {
-    name = Lynx_Teddy
+    name = Kerbetrotter_Teddy
     MODEL
     {
-        model = KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Teddy
+        model = KerbetrotterLtd/000_KerbetrotterTools/Assets/Props/Kerbetrotter_Teddy
     }
 
     MODULE

diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Parts/DockingBay.mu b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Parts/DockingBay.mu
diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Parts/Ladder_Platform.mu b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Parts/Ladder_Platform.mu
diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_FirstAid.mu b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_FirstAid.mu
diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Lamps.mu b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Lamps.mu
diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Soil_Analysis.mu b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Soil_Analysis.mu
diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Statusdisplay.mu b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Assets/Props/Lynx_Statusdisplay.mu
diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/FelineUtilityRover.version b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/FelineUtilityRover.version
@@ -12,7 +12,7 @@
     "VERSION": {
         "MAJOR": 1,
         "MINOR": 2,
-        "PATCH": 4
+        "PATCH": 5
     },
 
     "KSP_VERSION": {
@@ -25,7 +25,7 @@
     {
         "MAJOR": 1,
         "MINOR": 4,
-        "PATCH": 9
+        "PATCH": 99
     }
 
     "KSP_VERSION_MIN":

diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Parts/Wheels/Paw_Wheel.cfg b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Parts/Wheels/Paw_Wheel.cfg
@@ -61,7 +61,7 @@ PART
         radius = 0.34
         center = 0,0,0
         mass = 0.5
-        frictionLimit = 0.9
+        frictionLimit = 0.85
         frictionPeak = 1.0
         groundHeightOffset = 0.0
         TooltipTitle = #autoLOC_502081

diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Parts/Wheels/Talon_Wheel.cfg b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Parts/Wheels/Talon_Wheel.cfg
@@ -62,7 +62,7 @@ PART
         radius = 0.36
         center = 0,0,0
         mass = 0.3
-        frictionLimit = 0.95
+        frictionLimit = 0.90
         frictionPeak = 1.05
         groundHeightOffset = 0.0
         TooltipTitle = #autoLOC_502081

diff --git a/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Patches/ASET.cfg b/For Release/GameData/KerbetrotterLtd/FelineUtilityRover/Patches/ASET.cfg
@@ -34,14 +34,14 @@
 	}
 	PROP
 	{
-		name = Lynx_Extinguisher
+		name = Kerbetrotter_Extinguisher
 		position = 0.8872,0.304,0.0436
 		rotation = 0,0.9999997,0,-0.000752857
 		scale = 1,1,1
 	}
 	PROP
 	{
-		name = Lynx_Drink
+		name = Kerbetrotter_Drink
 		position = 0.0507,-0.206,-0.2631
 		rotation = 0,0.9999997,0,-0.000752857
 		scale = 1,1,1
@@ -97,14 +97,14 @@
 	}
 	PROP
 	{
-		name = Lynx_Hatch
+		name = Kerbetrotter_Hatch
 		position = -0.0069,0.136,0.686
 		rotation = 0,0.9999997,0,-0.000752857
 		scale = 1,1,1
 	}
 	PROP
 	{
-		name = Lynx_Hatch
+		name = Kerbetrotter_Hatch
 		position = -0.3563,0.134,0.3755
 		rotation = 0,0.7076389,0,0.7065744
 		scale = 1,1,1
@@ -462,28 +462,28 @@
 	}
 	PROP
 	{
-		name = Lynx_Hatch
+		name = Kerbetrotter_Hatch
 		position = -0.3577,0.134,0.4411
 		rotation = 0,0.7076389,0,0.7065744
 		scale = 0.9126617,1,1
 	}
 	PROP
 	{
-		name = Lynx_Hatch
+		name = Kerbetrotter_Hatch
 		position = -0.01,0.1118,0.7344
 		rotation = 0,0.9999997,0,-0.000752857
 		scale = 1,1,1
 	}
 	PROP
 	{
-		name = Lynx_FirstAid
+		name = Kerbetrotter_FirstAid
 		position = 0.892,0.243,0.176
 		rotation = 0,-0.7071068,0,0.7071067
 		scale = 1,1,1
 	}
 	PROP
 	{
-		name = Lynx_Drink
+		name = Kerbetrotter_Drink
 		position = -0.049,-0.211,-0.19
 		rotation = 0,0.9999997,0,-0.000752857
 		scale = 1,1,1