Master to dev merge.

2026-08-23 05:07:51 +01:00 · 2014-08-27 20:24:07 +09:30
parent 3dfbaac368 ac6ffacec8
commit cf68ad7c87
21 changed files with 3475 additions and 3518 deletions
@@ -1212,6 +1212,8 @@ datum/preferences
 					var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in valid_facialhairstyles
 					if(new_f_style)
 						f_style = new_f_style
+								if(organ_data[third_limb] == "amputated")
+									organ_data[third_limb] = null

 				if("underwear")
 					var/list/underwear_options