Large merge resultion. Used remote for map conflicts.

2026-08-26 06:39:22 +01:00 · 2014-09-23 21:41:54 +09:30
parent c529e014a7 29c29cd408
commit 0c83a95b90
164 changed files with 8010 additions and 7210 deletions
@@ -1347,7 +1347,8 @@ datum/preferences
 							organ_data[limb] = "cyborg"
 							if(second_limb)
 								organ_data[second_limb] = "cyborg"
-
+							if(third_limb && organ_data[third_limb] == "amputated")
+								organ_data[third_limb] = null
 				if("organs")
 					var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes")
 					if(!organ_name) return