Fixes mulligan not randomizing ethereal color, removes default_color for every race except ethereals (#66229)

Judging from code this is a fix, although I initially thought it would be a feature. It tried to update color but there was nothing in ethereal code to make that do anything. Now it does.

Moth wings also do not update. I tried to figure it out but species code makes me want to hit my head against a wall so I gave up on that.

default_color wasn't used anywhere except for ethereals, so I made it a var unique to ethereals.
This commit is contained in:
wesoda25
2022-05-09 18:38:27 -07:00
committed by GitHub
parent d944f69a9f
commit 6f58040394
12 changed files with 40 additions and 45 deletions
+29 -28
View File
@@ -10,35 +10,36 @@
user << browse(create_panel_helper(create_mob_html), "window=create_mob;size=425x475")
/proc/randomize_human(mob/living/carbon/human/H)
H.gender = pick(MALE, FEMALE)
H.physique = H.gender
H.real_name = random_unique_name(H.gender)
H.name = H.real_name
H.underwear = random_underwear(H.gender)
H.underwear_color = "#[random_color()]"
H.skin_tone = random_skin_tone()
H.hairstyle = random_hairstyle(H.gender)
H.facial_hairstyle = random_facial_hairstyle(H.gender)
H.hair_color = "#[random_color()]"
H.facial_hair_color = H.hair_color
/proc/randomize_human(mob/living/carbon/human/human)
human.gender = pick(MALE, FEMALE)
human.physique = human.gender
human.real_name = random_unique_name(human.gender)
human.name = human.real_name
human.underwear = random_underwear(human.gender)
human.underwear_color = "#[random_color()]"
human.skin_tone = random_skin_tone()
human.hairstyle = random_hairstyle(human.gender)
human.facial_hairstyle = random_facial_hairstyle(human.gender)
human.hair_color = "#[random_color()]"
human.facial_hair_color = human.hair_color
var/random_eye_color = random_eye_color()
H.eye_color_left = random_eye_color
H.eye_color_right = random_eye_color
H.dna.blood_type = random_blood_type()
human.eye_color_left = random_eye_color
human.eye_color_right = random_eye_color
human.dna.blood_type = random_blood_type()
// Mutant randomizing, doesn't affect the mob appearance unless it's the specific mutant.
H.dna.features["mcolor"] = "#[random_color()]"
H.dna.features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
H.dna.features["tail_lizard"] = pick(GLOB.tails_list_lizard)
H.dna.features["snout"] = pick(GLOB.snouts_list)
H.dna.features["horns"] = pick(GLOB.horns_list)
H.dna.features["frills"] = pick(GLOB.frills_list)
H.dna.features["spines"] = pick(GLOB.spines_list)
H.dna.features["body_markings"] = pick(GLOB.body_markings_list)
H.dna.features["moth_wings"] = pick(GLOB.moth_wings_list)
H.dna.features["moth_antennae"] = pick(GLOB.moth_antennae_list)
H.dna.features["pod_hair"] = pick(GLOB.pod_hair_list)
human.dna.features["mcolor"] = "#[random_color()]"
human.dna.features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
human.dna.features["tail_lizard"] = pick(GLOB.tails_list_lizard)
human.dna.features["snout"] = pick(GLOB.snouts_list)
human.dna.features["horns"] = pick(GLOB.horns_list)
human.dna.features["frills"] = pick(GLOB.frills_list)
human.dna.features["spines"] = pick(GLOB.spines_list)
human.dna.features["body_markings"] = pick(GLOB.body_markings_list)
human.dna.features["moth_wings"] = pick(GLOB.moth_wings_list)
human.dna.features["moth_antennae"] = pick(GLOB.moth_antennae_list)
human.dna.features["pod_hair"] = pick(GLOB.pod_hair_list)
H.update_body(is_creating = TRUE)
H.update_hair(is_creating = TRUE)
human.update_body(is_creating = TRUE)
human.update_hair(is_creating = TRUE)
human.dna.species.spec_updatehealth(human)