Fixes Pepelsibirsk's hair and eye color randomization

+ Removes an unnecessary line
savethetreez · Apr 10, 2024 · 92fd999 · 92fd999
1 parent 2dfc253
commit 92fd999
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/code/game/mob/living/carbon/human/human.dm b/code/game/mob/living/carbon/human/human.dm
@@ -69,10 +69,7 @@
 				if (istype(original_job, /datum/job/civilian/prisoner))
 					nutrition = max_nutrition*0.1
 					water = max_water*0.2
-				else
-					nutrition = max_nutrition
-					water = max_water
-		if (map.ID == MAP_PEPELSIBIRSK)
+		else
 			nutrition = max_nutrition
 			water = max_water
 	else

diff --git a/code/game/mob/living/carbon/human/nomads_spawn.dm b/code/game/mob/living/carbon/human/nomads_spawn.dm
@@ -1138,21 +1138,21 @@
 					possible_e_list = list("Black","Brown","Green")
 					possible_s_list = list(-25,-60)
 					give_languages()
-		new_hair = pick(possible_h_list)
-		new_eyes = pick(possible_e_list)
-		s_tone = rand(possible_s_list[2],possible_s_list[1])
-		var/hex_hair = hair_colors[new_hair]
-		r_hair = hex2num(copytext(hex_hair, 2, 4))
-		g_hair = hex2num(copytext(hex_hair, 4, 6))
-		b_hair = hex2num(copytext(hex_hair, 6, 8))
-		r_facial = hex2num(copytext(hex_hair, 2, 4))
-		g_facial = hex2num(copytext(hex_hair, 4, 6))
-		b_facial = hex2num(copytext(hex_hair, 6, 8))
-		var/hex_eyes = eye_colors[new_eyes]
-		r_eyes = hex2num(copytext(hex_eyes, 2, 4))
-		g_eyes = hex2num(copytext(hex_eyes, 4, 6))
-		b_eyes = hex2num(copytext(hex_eyes, 6, 8))
-		change_eye_color(r_eyes, g_eyes, b_eyes)
+			new_hair = pick(possible_h_list)
+			new_eyes = pick(possible_e_list)
+			s_tone = rand(possible_s_list[2],possible_s_list[1])
+			var/hex_hair = hair_colors[new_hair]
+			r_hair = hex2num(copytext(hex_hair, 2, 4))
+			g_hair = hex2num(copytext(hex_hair, 4, 6))
+			b_hair = hex2num(copytext(hex_hair, 6, 8))
+			r_facial = hex2num(copytext(hex_hair, 2, 4))
+			g_facial = hex2num(copytext(hex_hair, 4, 6))
+			b_facial = hex2num(copytext(hex_hair, 6, 8))
+			var/hex_eyes = eye_colors[new_eyes]
+			r_eyes = hex2num(copytext(hex_eyes, 2, 4))
+			g_eyes = hex2num(copytext(hex_eyes, 4, 6))
+			b_eyes = hex2num(copytext(hex_eyes, 6, 8))
+			change_eye_color(r_eyes, g_eyes, b_eyes)
 
 	else if (map.ID == MAP_NATIONSRP)
 		var/new_hair = "Black"