Merge branch 'master' into digileg-runtime

2018-03-19 21:33:50 -05:00
parent 5d2ec7dd88 dad2d44ea2
commit 8cbdf9fcb4
1329 changed files with 2726 additions and 1986 deletions
@@ -1069,7 +1069,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					undershirt = random_undershirt(gender)
 				if("socks")
 					socks = random_socks()
-				if("eyes")
+				if(BODY_ZONE_PRECISE_EYES)
 					eye_color = random_eye_color()
 				if("s_tone")
 					skin_tone = random_skin_tone()
@@ -1211,7 +1211,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_socks)
 						socks = new_socks

-				if("eyes")
+				if(BODY_ZONE_PRECISE_EYES)
 					var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null
 					if(new_eyes)
 						eye_color = sanitize_hexcolor(new_eyes)