cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes mulligan not randomizing ethereal color, removes default_color for every race except ethereals [MDB IGNORE] (#13492)

Browse Source 
* Fixes mulligan not randomizing ethereal color, removes default_color for every race except ethereals

* Fixing a merge conflict

* f

* e

Co-authored-by: wesoda25 <37246588+wesoda25@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-05-11 01:37:57 +01:00
committed by GitHub
co-authored by wesoda25 GoldenAlpharex Gandalf
parent bde7d40699
commit c11596d700
31 changed files with 46 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/create_mob.dm
+35 -36
View File
@@ -10,46 +10,45 @@
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.
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION
/*
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)
/* SKYRAT EDIT REMOVAL
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)
*/
//SKYRAT EDIT REMOVAL END
//SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION
H.dna.features = H.dna.species.get_random_features()
H.dna.mutant_bodyparts = H.dna.species.get_random_mutant_bodyparts(H.dna.features)
H.dna.body_markings = H.dna.species.get_random_body_markings(H.dna.features)
H.dna.species.mutant_bodyparts = H.dna.mutant_bodyparts.Copy()
H.dna.species.body_markings = H.dna.body_markings.Copy()
human.dna.features = human.dna.species.get_random_features()
human.dna.mutant_bodyparts = human.dna.species.get_random_mutant_bodyparts(human.dna.features)
human.dna.body_markings = human.dna.species.get_random_body_markings(human.dna.features)
human.dna.species.mutant_bodyparts = human.dna.mutant_bodyparts.Copy()
human.dna.species.body_markings = human.dna.body_markings.Copy()
//SKYRAT EDIT ADDITION END
H.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)