Merge branch 'master' into modular_prosthetics

media/lua/shared/NPCs/ExtraBodyLocations.lua

@@ -4,7 +4,7 @@ local function addBodyLocationBefore(new_location, move_to_location)
   group:getOrCreateLocation(new_location)
   local new_item = list:get(list:size()-1)
   print("TOC: Created new body location" .. new_item:getId())
-  list:remove(new_item)
+  list:remove(new_item)   -- We can't use the Index, it works if we pass the item though!
   local i = group:indexOf(move_to_location)
   list:add(i, new_item)
 end
@@ -20,4 +20,4 @@ addBodyLocationBefore("TOC_ArmRightProsthesis", "Shoes")
 addBodyLocationBefore("TOC_ArmLeftProsthesis", "Shoes")
 
 addBodyLocationBefore("TOC_LegRightProsthesis", "Shoes")
-addBodyLocationBefore("TOC_LegLeftProsthesis", "Shoes")
+addBodyLocationBefore("TOC_LegLeftProsthesis", "Shoes")

media/lua/shared/translate/EN/ContextMenu_EN.txt

@@ -1,4 +1,8 @@
 ContextMenu_EN = {
+	
 	ContextMenu_Cut_Arm = "Cut arm",
 	ContextMenu_Operate_Arm = "Operate arm",
+
+	ContextMenu_TourniquetRightSwitch = "Tourniquet on Right Arm",
+    ContextMenu_TourniquetLeftSwitch = "Tourniquet on Left Arm",
 } 

media/lua/shared/translate/EN/Sandbox_EN.txt

@@ -6,4 +6,9 @@ Sandbox_EN = {
 
     Sandbox_TOC_CicatrizationSpeedMultiplier = "Cicatrization speed multiplier",
     Sandbox_TOC_CicatrizationSpeedMultiplier_tooltip = "Customize this to make the cicatrization process faster",
+
+    Sandbox_TOC_AmputationTimeMultiplier = "Amputation Time Scaler",
+    Sandbox_TOC_AmputationTimeMultiplier_tooltip = "Scales the amount of time multplying added after amputation"
+
+
 }