"
if(is_banned_from(user.ckey, "Appearance"))
dat += "You are banned from using custom names and appearances. You can continue to adjust your characters, but you will be randomised once you join the game.
"
- if (!be_random_species) // don't let random species choose their name
- dat += "Random Name "
- dat += "Always Random Name: [be_random_name ? "Yes" : "No"]
"
- dat += "Name: "
- dat += "[real_name]
"
- else
- dat += "Name Randomized (always random species)
"
+ dat += "Random Name "
+ dat += "Always Random Name: [(randomise[RANDOM_NAME]) ? "Yes" : "No"]
"
+ dat += "Name: "
+ dat += "[real_name]
"
if(!(AGENDER in pref_species.species_traits))
var/dispGender
@@ -198,10 +193,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dispGender = "Female"
else
dispGender = "Other"
- dat += "Gender: [dispGender]
"
- dat += "Age: [age]
"
+ dat += "Gender: [dispGender]"
+ dat += "Always Random Gender: [(randomise[RANDOM_GENDER]) ? "Yes" : "No"]"
- dat += "Special Names:
"
+ dat += "
Age: [age]"
+ dat += "Always Random Age: [(randomise[RANDOM_AGE]) ? "Yes" : "No"]"
+
+ dat += "
Special Names:
"
var/old_group
for(var/custom_name_id in GLOB.preferences_custom_names)
var/namedata = GLOB.preferences_custom_names[custom_name_id]
@@ -221,21 +219,37 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Body"
dat += "Random Body "
- dat += "Always Random Body: [be_random_body ? "Yes" : "No"]
"
+ dat += "Always Random Body: [(randomise[RANDOM_BODY]) ? "Yes" : "No"]
"
dat += ""
dat += "Species:
[pref_species.name]
"
- dat += "Random Species "
- dat += "Always Random Species: [be_random_species ? "Yes" : "No"]
"
+ dat += "Random Species "
+ dat += "Always Random Species: [(randomise[RANDOM_SPECIES]) ? "Yes" : "No"]
"
- dat += "Underwear:
[underwear]
"
- dat += "Underwear Color:
Change
"
- dat += "Undershirt:
[undershirt]
"
- dat += "Socks:
[socks]
"
- dat += "Backpack:
[backbag]
"
- dat += "Jumpsuit:
[jumpsuit_style]
"
- dat += "Uplink Spawn Location:
[uplink_spawn_loc]
| "
+ dat += "Underwear:
[underwear]"
+ dat += "[(randomise[RANDOM_UNDERWEAR]) ? "Lock" : "Unlock"]"
+
+ dat += "
Underwear Color:
Change"
+ dat += "[(randomise[RANDOM_UNDERWEAR_COLOR]) ? "Lock" : "Unlock"]"
+
+ dat += "
Undershirt:
[undershirt]"
+ dat += "[(randomise[RANDOM_UNDERSHIRT]) ? "Lock" : "Unlock"]"
+
+
+ dat += "
Socks:
[socks]"
+ dat += "[(randomise[RANDOM_SOCKS]) ? "Lock" : "Unlock"]"
+
+
+ dat += "
Backpack:
[backpack]"
+ dat += "[(randomise[RANDOM_BACKPACK]) ? "Lock" : "Unlock"]"
+
+
+ dat += "
Jumpsuit Style:
[jumpsuit_style]"
+ dat += "[(randomise[RANDOM_JUMPSUIT_STYLE]) ? "Lock" : "Unlock"]"
+
+
+ dat += "
Uplink Spawn Location:
[uplink_spawn_loc]
"
var/use_skintones = pref_species.use_skintones
if(use_skintones)
@@ -244,7 +258,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Skin Tone"
- dat += "[skin_tone]
"
+ dat += "[skin_tone]"
+ dat += "[(randomise[RANDOM_SKIN_TONE]) ? "Lock" : "Unlock"]"
+ dat += "
"
var/mutant_colors
if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
@@ -274,10 +290,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += APPEARANCE_CATEGORY_COLUMN
dat += "Eye Color"
+ dat += " Change"
+ dat += "[(randomise[RANDOM_EYE_COLOR]) ? "Lock" : "Unlock"]"
- dat += " Change
"
-
- dat += ""
+ dat += "
"
else if(use_skintones || mutant_colors)
dat += ""
@@ -285,19 +301,24 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += APPEARANCE_CATEGORY_COLUMN
- dat += "Hair Style"
+ dat += "Hairstyle"
- dat += "[hair_style]
"
- dat += "< >
"
- dat += " Change
"
+ dat += "[hairstyle]"
+ dat += "< >"
+ dat += "[(randomise[RANDOM_HAIRSTYLE]) ? "Lock" : "Unlock"]"
- dat += "Facial Hair Style"
+ dat += "
Change"
+ dat += "[(randomise[RANDOM_HAIR_COLOR]) ? "Lock" : "Unlock"]"
- dat += "[facial_hair_style]
"
- dat += "< >
"
- dat += " Change
"
+ dat += "
Facial Hairstyle"
- dat += ""
+ dat += "[facial_hairstyle]"
+ dat += "< >"
+ dat += "[(randomise[RANDOM_FACIAL_HAIRSTYLE]) ? "Lock" : "Unlock"]"
+
+ dat += "
Change"
+ dat += "[(randomise[RANDOM_FACIAL_HAIR_COLOR]) ? "Lock" : "Unlock"]"
+ dat += "
"
//Mutant stuff
var/mutant_category = 0
@@ -1006,9 +1027,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
return TRUE
switch(href_list["task"])
- if ("random_race")
- random_species()
-
if("random")
switch(href_list["preference"])
if("name")
@@ -1017,12 +1035,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
age = rand(AGE_MIN, AGE_MAX)
if("hair")
hair_color = random_short_color()
- if("hair_style")
- hair_style = random_hair_style(gender)
+ if("hairstyle")
+ hairstyle = random_hairstyle(gender)
if("facial")
facial_hair_color = random_short_color()
- if("facial_hair_style")
- facial_hair_style = random_facial_hair_style(gender)
+ if("facial_hairstyle")
+ facial_hairstyle = random_facial_hairstyle(gender)
if("underwear")
underwear = random_underwear(gender)
if("underwear_color")
@@ -1035,12 +1053,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
eye_color = random_eye_color()
if("s_tone")
skin_tone = random_skin_tone()
+ if("species")
+ random_species()
if("bag")
- backbag = pick(GLOB.backbaglist)
+ backpack = pick(GLOB.backpacklist)
if("suit")
jumpsuit_style = pick(GLOB.jumpsuitlist)
if("all")
- random_character()
+ random_character(gender)
if("input")
@@ -1099,64 +1119,64 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_hair)
hair_color = sanitize_hexcolor(new_hair)
- if("hair_style")
- var/new_hair_style
+ if("hairstyle")
+ var/new_hairstyle
if(gender == MALE)
- new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_male_list
+ new_hairstyle = input(user, "Choose your character's hairstyle:", "Character Preference") as null|anything in GLOB.hairstyles_male_list
else if(gender == FEMALE)
- new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_female_list
+ new_hairstyle = input(user, "Choose your character's hairstyle:", "Character Preference") as null|anything in GLOB.hairstyles_female_list
else
- new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_list
- if(new_hair_style)
- hair_style = new_hair_style
+ new_hairstyle = input(user, "Choose your character's hairstyle:", "Character Preference") as null|anything in GLOB.hairstyles_list
+ if(new_hairstyle)
+ hairstyle = new_hairstyle
- if("next_hair_style")
+ if("next_hairstyle")
if (gender == MALE)
- hair_style = next_list_item(hair_style, GLOB.hair_styles_male_list)
+ hairstyle = next_list_item(hairstyle, GLOB.hairstyles_male_list)
else if(gender == FEMALE)
- hair_style = next_list_item(hair_style, GLOB.hair_styles_female_list)
+ hairstyle = next_list_item(hairstyle, GLOB.hairstyles_female_list)
else
- hair_style = next_list_item(hair_style, GLOB.hair_styles_list)
+ hairstyle = next_list_item(hairstyle, GLOB.hairstyles_list)
- if("previous_hair_style")
+ if("previous_hairstyle")
if (gender == MALE)
- hair_style = previous_list_item(hair_style, GLOB.hair_styles_male_list)
+ hairstyle = previous_list_item(hairstyle, GLOB.hairstyles_male_list)
else if(gender == FEMALE)
- hair_style = previous_list_item(hair_style, GLOB.hair_styles_female_list)
+ hairstyle = previous_list_item(hairstyle, GLOB.hairstyles_female_list)
else
- hair_style = previous_list_item(hair_style, GLOB.hair_styles_list)
+ hairstyle = previous_list_item(hairstyle, GLOB.hairstyles_list)
if("facial")
var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null
if(new_facial)
facial_hair_color = sanitize_hexcolor(new_facial)
- if("facial_hair_style")
- var/new_facial_hair_style
+ if("facial_hairstyle")
+ var/new_facial_hairstyle
if(gender == MALE)
- new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_male_list
+ new_facial_hairstyle = input(user, "Choose your character's facial-hairstyle:", "Character Preference") as null|anything in GLOB.facial_hairstyles_male_list
else if(gender == FEMALE)
- new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_female_list
+ new_facial_hairstyle = input(user, "Choose your character's facial-hairstyle:", "Character Preference") as null|anything in GLOB.facial_hairstyles_female_list
else
- new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_list
- if(new_facial_hair_style)
- facial_hair_style = new_facial_hair_style
+ new_facial_hairstyle = input(user, "Choose your character's facial-hairstyle:", "Character Preference") as null|anything in GLOB.facial_hairstyles_list
+ if(new_facial_hairstyle)
+ facial_hairstyle = new_facial_hairstyle
- if("next_facehair_style")
+ if("next_facehairstyle")
if (gender == MALE)
- facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
+ facial_hairstyle = next_list_item(facial_hairstyle, GLOB.facial_hairstyles_male_list)
else if(gender == FEMALE)
- facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
+ facial_hairstyle = next_list_item(facial_hairstyle, GLOB.facial_hairstyles_female_list)
else
- facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_list)
+ facial_hairstyle = next_list_item(facial_hairstyle, GLOB.facial_hairstyles_list)
- if("previous_facehair_style")
+ if("previous_facehairstyle")
if (gender == MALE)
- facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
+ facial_hairstyle = previous_list_item(facial_hairstyle, GLOB.facial_hairstyles_male_list)
else if (gender == FEMALE)
- facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
+ facial_hairstyle = previous_list_item(facial_hairstyle, GLOB.facial_hairstyles_female_list)
else
- facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_list)
+ facial_hairstyle = previous_list_item(facial_hairstyle, GLOB.facial_hairstyles_list)
if("underwear")
var/new_underwear
@@ -1207,6 +1227,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/temp_hsv = RGBtoHSV(features["mcolor"])
if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#7F7F7F")[3]))
features["mcolor"] = pref_species.default_color
+ if(randomise[RANDOM_NAME])
+ real_name = pref_species.random_name(gender)
if("mutant_color")
var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null
@@ -1313,9 +1335,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
asaycolor = new_asaycolor
if("bag")
- var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in GLOB.backbaglist
- if(new_backbag)
- backbag = new_backbag
+ var/new_backpack = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in GLOB.backpacklist
+ if(new_backpack)
+ backpack = new_backpack
if("suit")
if(jumpsuit_style == PREF_SUIT)
@@ -1388,8 +1410,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
underwear = random_underwear(gender)
undershirt = random_undershirt(gender)
socks = random_socks()
- facial_hair_style = random_facial_hair_style(gender)
- hair_style = random_hair_style(gender)
+ facial_hairstyle = random_facial_hairstyle(gender)
+ hairstyle = random_hairstyle(gender)
if("hotkeys")
hotkeys = !hotkeys
@@ -1440,14 +1462,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
else
be_special += be_special_type
- if("rand_species")
- be_random_species = !be_random_species
-
- if("name")
- be_random_name = !be_random_name
-
- if("all")
- be_random_body = !be_random_body
+ if("toggle_random")
+ var/random_type = href_list["random_type"]
+ if(randomise[random_type])
+ randomise -= random_type
+ else
+ randomise[random_type] = TRUE
if("hear_midis")
toggles ^= SOUND_MIDI
@@ -1529,18 +1549,17 @@ GLOBAL_LIST_EMPTY(preferences_datums)
ShowChoices(user)
return 1
-/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE)
+/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE, character_setup = FALSE)
- if(be_random_species)
- be_random_name = 1
+ if(randomise[RANDOM_SPECIES] && !character_setup)
random_species()
-
- if(be_random_name)
- real_name = pref_species.random_name(gender)
- if(be_random_body)
+ if(randomise[RANDOM_BODY] && !character_setup)
random_character(gender)
+ if(randomise[RANDOM_NAME] && !character_setup)
+ real_name = pref_species.random_name(gender)
+
if(roundstart_checks)
if(CONFIG_GET(flag/humans_need_surnames) && (pref_species.id == "human"))
var/firstspace = findtext(real_name, " ")
@@ -1566,14 +1585,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
character.facial_hair_color = facial_hair_color
character.skin_tone = skin_tone
- character.hair_style = hair_style
- character.facial_hair_style = facial_hair_style
+ character.hairstyle = hairstyle
+ character.facial_hairstyle = facial_hairstyle
character.underwear = underwear
character.underwear_color = underwear_color
character.undershirt = undershirt
character.socks = socks
- character.backbag = backbag
+ character.backpack = backpack
character.jumpsuit_style = jumpsuit_style
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 6d4306f4403..d1650b8304d 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 24
+#define SAVEFILE_VERSION_MAX 25
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -112,6 +112,20 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(current_version < 24)
if (!(underwear in GLOB.underwear_list))
underwear = "Nude"
+ if(current_version < 25)
+ randomise = list(RANDOM_UNDERWEAR = TRUE, RANDOM_UNDERWEAR_COLOR = TRUE, RANDOM_UNDERSHIRT = TRUE, RANDOM_SOCKS = TRUE, RANDOM_BACKPACK = TRUE, RANDOM_JUMPSUIT_STYLE = TRUE, RANDOM_HAIRSTYLE = TRUE, RANDOM_HAIR_COLOR = TRUE, RANDOM_FACIAL_HAIRSTYLE = TRUE, RANDOM_FACIAL_HAIR_COLOR = TRUE, RANDOM_SKIN_TONE = TRUE, RANDOM_EYE_COLOR = TRUE)
+ if(S["name_is_always_random"] == 1)
+ randomise[RANDOM_NAME] = TRUE
+ if(S["body_is_always_random"] == 1)
+ randomise[RANDOM_BODY] = TRUE
+ if(S["species_is_always_random"] == 1)
+ randomise[RANDOM_SPECIES] = TRUE
+ if(S["backbag"])
+ S["backbag"] >> backpack
+ if(S["hair_style_name"])
+ S["hair_style_name"] >> hairstyle
+ if(S["facial_style_name"])
+ S["facial_style_name"] >> facial_hairstyle
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
@@ -284,24 +298,22 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Character
S["real_name"] >> real_name
- S["name_is_always_random"] >> be_random_name
- S["body_is_always_random"] >> be_random_body
- S["species_is_always_random"] >> be_random_species
S["gender"] >> gender
S["age"] >> age
S["hair_color"] >> hair_color
S["facial_hair_color"] >> facial_hair_color
S["eye_color"] >> eye_color
S["skin_tone"] >> skin_tone
- S["hair_style_name"] >> hair_style
- S["facial_style_name"] >> facial_hair_style
+ S["hairstyle_name"] >> hairstyle
+ S["facial_style_name"] >> facial_hairstyle
S["underwear"] >> underwear
S["underwear_color"] >> underwear_color
S["undershirt"] >> undershirt
S["socks"] >> socks
- S["backbag"] >> backbag
+ S["backpack"] >> backpack
S["jumpsuit_style"] >> jumpsuit_style
S["uplink_loc"] >> uplink_spawn_loc
+ S["randomise"] >> randomise
S["feature_mcolor"] >> features["mcolor"]
S["feature_ethcolor"] >> features["ethcolor"]
S["feature_lizard_tail"] >> features["tail_lizard"]
@@ -359,27 +371,24 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(!features["ethcolor"] || features["ethcolor"] == "#000")
features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
- be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
- be_random_body = sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
- be_random_species = sanitize_integer(be_random_species, 0, 1, initial(be_random_species))
+ randomise = SANITIZE_LIST(randomise)
if(gender == MALE)
- hair_style = sanitize_inlist(hair_style, GLOB.hair_styles_male_list)
- facial_hair_style = sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_male_list)
+ hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_male_list)
+ facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list)
underwear = sanitize_inlist(underwear, GLOB.underwear_m)
undershirt = sanitize_inlist(undershirt, GLOB.undershirt_m)
else if(gender == FEMALE)
- hair_style = sanitize_inlist(hair_style, GLOB.hair_styles_female_list)
- facial_hair_style = sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_female_list)
+ hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_female_list)
+ facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list)
underwear = sanitize_inlist(underwear, GLOB.underwear_f)
undershirt = sanitize_inlist(undershirt, GLOB.undershirt_f)
else
- hair_style = sanitize_inlist(hair_style, GLOB.hair_styles_list)
- facial_hair_style = sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_list)
+ hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_list)
+ facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list)
underwear = sanitize_inlist(underwear, GLOB.underwear_list)
undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list)
-
socks = sanitize_inlist(socks, GLOB.socks_list)
age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
hair_color = sanitize_hexcolor(hair_color, 3, 0)
@@ -387,7 +396,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
underwear_color = sanitize_hexcolor(underwear_color, 3, 0)
eye_color = sanitize_hexcolor(eye_color, 3, 0)
skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones)
- backbag = sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag))
+ backpack = sanitize_inlist(backpack, GLOB.backpacklist, initial(backpack))
jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0)
@@ -426,24 +435,22 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Character
WRITE_FILE(S["real_name"] , real_name)
- WRITE_FILE(S["name_is_always_random"] , be_random_name)
- WRITE_FILE(S["body_is_always_random"] , be_random_body)
- WRITE_FILE(S["species_is_always_random"] , be_random_species)
- WRITE_FILE(S["gender"] , gender)
- WRITE_FILE(S["age"] , age)
+ WRITE_FILE(S["gender"] , gender)
+ WRITE_FILE(S["age"] , age)
WRITE_FILE(S["hair_color"] , hair_color)
- WRITE_FILE(S["facial_hair_color"] , facial_hair_color)
+ WRITE_FILE(S["facial_hair_color"] , facial_hair_color)
WRITE_FILE(S["eye_color"] , eye_color)
WRITE_FILE(S["skin_tone"] , skin_tone)
- WRITE_FILE(S["hair_style_name"] , hair_style)
- WRITE_FILE(S["facial_style_name"] , facial_hair_style)
+ WRITE_FILE(S["hairstyle_name"] , hairstyle)
+ WRITE_FILE(S["facial_style_name"] , facial_hairstyle)
WRITE_FILE(S["underwear"] , underwear)
- WRITE_FILE(S["underwear_color"] , underwear_color)
+ WRITE_FILE(S["underwear_color"] , underwear_color)
WRITE_FILE(S["undershirt"] , undershirt)
- WRITE_FILE(S["socks"] , socks)
- WRITE_FILE(S["backbag"] , backbag)
- WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style)
+ WRITE_FILE(S["socks"] , socks)
+ WRITE_FILE(S["backpack"] , backpack)
+ WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style)
WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc)
+ WRITE_FILE(S["randomise"] , randomise)
WRITE_FILE(S["species"] , pref_species.id)
WRITE_FILE(S["feature_mcolor"] , features["mcolor"])
WRITE_FILE(S["feature_ethcolor"] , features["ethcolor"])
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 87d94bd7a2a..0c10ba2a8ed 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -221,7 +221,7 @@
user.visible_message("[user] is donning [src]! It looks like [user.p_theyre()] trying to be nice to girls.")
user.say("M'lady.", forced = "fedora suicide")
sleep(10)
- H.facial_hair_style = "Neckbeard"
+ H.facial_hairstyle = "Neckbeard"
return(BRUTELOSS)
/obj/item/clothing/head/sombrero
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index e3173a27f9d..058d110940a 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -192,7 +192,7 @@
item_state = "pwig"
flags_inv = HIDEHAIR
color = "#000"
- var/hair_style = "Very Long Hair"
+ var/hairstyle = "Very Long Hair"
var/adjustablecolor = TRUE //can color be changed manually?
/obj/item/clothing/head/wig/Initialize(mapload)
@@ -200,7 +200,7 @@
update_icon()
/obj/item/clothing/head/wig/update_icon()
- var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
+ var/datum/sprite_accessory/S = GLOB.hairstyles_list[hairstyle]
if(!S)
icon = 'icons/obj/clothing/hats.dmi'
icon_state = "pwig"
@@ -211,7 +211,7 @@
/obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, file2use)
. = list()
if(!isinhands)
- var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
+ var/datum/sprite_accessory/S = GLOB.hairstyles_list[hairstyle]
if(!S)
return
var/mutable_appearance/M = mutable_appearance(S.icon, S.icon_state,layer = -HAIR_LAYER)
@@ -220,18 +220,18 @@
. += M
/obj/item/clothing/head/wig/attack_self(mob/user)
- var/new_style = input(user, "Select a hair style", "Wig Styling") as null|anything in (GLOB.hair_styles_list - "Bald")
+ var/new_style = input(user, "Select a hairstyle", "Wig Styling") as null|anything in (GLOB.hairstyles_list - "Bald")
if(!user.canUseTopic(src, BE_CLOSE))
return
- if(new_style && new_style != hair_style)
- hair_style = new_style
+ if(new_style && new_style != hairstyle)
+ hairstyle = new_style
user.visible_message("[user] changes \the [src]'s hairstyle to [new_style].", "You change \the [src]'s hairstyle to [new_style].")
if(adjustablecolor)
color = input(usr,"","Choose Color",color) as color|null
update_icon()
/obj/item/clothing/head/wig/random/Initialize(mapload)
- hair_style = pick(GLOB.hair_styles_list - "Bald") //Don't want invisible wig
+ hairstyle = pick(GLOB.hairstyles_list - "Bald") //Don't want invisible wig
color = "#[random_short_color()]"
. = ..()
@@ -243,7 +243,7 @@
custom_price = 25
/obj/item/clothing/head/wig/natural/Initialize(mapload)
- hair_style = pick(GLOB.hair_styles_list - "Bald")
+ hairstyle = pick(GLOB.hairstyles_list - "Bald")
. = ..()
/obj/item/clothing/head/wig/natural/equipped(mob/living/carbon/human/user, slot)
diff --git a/code/modules/clothing/outfits/event.dm b/code/modules/clothing/outfits/event.dm
index 70d16f3ae96..f42316d04ca 100644
--- a/code/modules/clothing/outfits/event.dm
+++ b/code/modules/clothing/outfits/event.dm
@@ -19,8 +19,8 @@
H.mind.assigned_role = "Santa"
H.mind.special_role = "Santa"
- H.hair_style = "Long Hair 3"
- H.facial_hair_style = "Beard (Full)"
+ H.hairstyle = "Long Hair 3"
+ H.facial_hairstyle = "Beard (Full)"
H.hair_color = "FFF"
H.facial_hair_color = "FFF"
H.update_hair()
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 6d8958c4a93..d9e258401f5 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -175,7 +175,7 @@
var/pda_slot = SLOT_BELT
/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- switch(H.backbag)
+ switch(H.backpack)
if(GBACKPACK)
back = /obj/item/storage/backpack //Grey backpack
if(GSATCHEL)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index abea88c4213..547918295d8 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -1,29 +1,50 @@
//The mob should have a gender you want before running this proc. Will run fine without H
/datum/preferences/proc/random_character(gender_override)
- if(gender_override)
+ if(randomise[RANDOM_SPECIES])
+ random_species()
+ else if(randomise[RANDOM_NAME])
+ real_name = pref_species.random_name(gender,1)
+ if(gender_override && !(randomise[RANDOM_GENDER]))
gender = gender_override
else
gender = pick(MALE,FEMALE)
- underwear = random_underwear(gender)
- underwear_color = random_short_color()
- undershirt = random_undershirt(gender)
- socks = random_socks()
- skin_tone = random_skin_tone()
- hair_style = random_hair_style(gender)
- facial_hair_style = random_facial_hair_style(gender)
- hair_color = random_short_color()
- facial_hair_color = hair_color
- eye_color = random_eye_color()
+ if(randomise[RANDOM_AGE])
+ age = rand(AGE_MIN,AGE_MAX)
+ if(randomise[RANDOM_UNDERWEAR])
+ underwear = random_underwear(gender)
+ if(randomise[RANDOM_UNDERWEAR_COLOR])
+ underwear_color = random_short_color()
+ if(randomise[RANDOM_UNDERSHIRT])
+ undershirt = random_undershirt(gender)
+ if(randomise[RANDOM_SOCKS])
+ socks = random_socks()
+ if(randomise[RANDOM_BACKPACK])
+ backpack = random_backpack()
+ if(randomise[RANDOM_JUMPSUIT_STYLE])
+ jumpsuit_style = pick(GLOB.jumpsuitlist)
+ if(randomise[RANDOM_HAIRSTYLE])
+ hairstyle = random_hairstyle(gender)
+ if(randomise[RANDOM_FACIAL_HAIRSTYLE])
+ facial_hairstyle = random_facial_hairstyle(gender)
+ if(randomise[RANDOM_HAIR_COLOR])
+ hair_color = random_short_color()
+ if(randomise[RANDOM_FACIAL_HAIR_COLOR])
+ facial_hair_color = random_short_color()
+ if(randomise[RANDOM_SKIN_TONE])
+ skin_tone = random_skin_tone()
+ if(randomise[RANDOM_EYE_COLOR])
+ eye_color = random_eye_color()
if(!pref_species)
var/rando_race = pick(GLOB.roundstart_races)
pref_species = new rando_race()
features = random_features()
- age = rand(AGE_MIN,AGE_MAX)
/datum/preferences/proc/random_species()
var/random_species_type = GLOB.species_list[pick(GLOB.roundstart_races)]
pref_species = new random_species_type
+ if(randomise[RANDOM_NAME])
+ real_name = pref_species.random_name(gender,1)
/datum/preferences/proc/update_preview_icon()
// Determine what job is marked as 'High' priority, and dress them up as such.
@@ -45,7 +66,7 @@
// Set up the dummy for its photoshoot
var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
- copy_to(mannequin)
+ copy_to(mannequin, 1, TRUE, TRUE)
if(previewJob)
mannequin.job = previewJob.title
@@ -53,4 +74,4 @@
COMPILE_OVERLAYS(mannequin)
parent.show_character_previews(new /mutable_appearance(mannequin))
- unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
+ unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
\ No newline at end of file
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 1615cedfbfc..e4cdfc90f25 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -37,10 +37,10 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
var/ghost_orbit = GHOST_ORBIT_CIRCLE
//These variables store hair data if the ghost originates from a species with head and/or facial hair.
- var/hair_style
+ var/hairstyle
var/hair_color
var/mutable_appearance/hair_overlay
- var/facial_hair_style
+ var/facial_hairstyle
var/facial_hair_color
var/mutable_appearance/facial_hair_overlay
@@ -98,10 +98,10 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
if(ishuman(body))
var/mob/living/carbon/human/body_human = body
if(HAIR in body_human.dna.species.species_traits)
- hair_style = body_human.hair_style
+ hairstyle = body_human.hairstyle
hair_color = brighten_color(body_human.hair_color)
if(FACEHAIR in body_human.dna.species.species_traits)
- facial_hair_style = body_human.facial_hair_style
+ facial_hairstyle = body_human.facial_hairstyle
facial_hair_color = brighten_color(body_human.facial_hair_color)
update_icon()
@@ -206,16 +206,16 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
if(ghost_accs == GHOST_ACCS_FULL && icon_state in GLOB.ghost_forms_with_accessories_list) //check if this form supports accessories and if the client wants to show them
var/datum/sprite_accessory/S
- if(facial_hair_style)
- S = GLOB.facial_hair_styles_list[facial_hair_style]
+ if(facial_hairstyle)
+ S = GLOB.facial_hairstyles_list[facial_hairstyle]
if(S)
facial_hair_overlay = mutable_appearance(S.icon, "[S.icon_state]", -HAIR_LAYER)
if(facial_hair_color)
facial_hair_overlay.color = "#" + facial_hair_color
facial_hair_overlay.alpha = 200
add_overlay(facial_hair_overlay)
- if(hair_style)
- S = GLOB.hair_styles_list[hair_style]
+ if(hairstyle)
+ S = GLOB.hairstyles_list[hairstyle]
if(S)
hair_overlay = mutable_appearance(S.icon, "[S.icon_state]", -HAIR_LAYER)
if(hair_color)
@@ -351,7 +351,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. ","Are you sure you want to stay dead?","DNR","Save Me")
if(response != "DNR")
- return
+ return
can_reenter_corpse = FALSE
to_chat(src, "You can no longer be brought back into your body.")
@@ -738,16 +738,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if((!client) || (!client.prefs))
return
- if(client.prefs.be_random_name)
+ if(client.prefs.randomise[RANDOM_NAME])
client.prefs.real_name = random_unique_name(gender)
- if(client.prefs.be_random_body)
+ if(client.prefs.randomise[RANDOM_BODY])
client.prefs.random_character(gender)
if(HAIR in client.prefs.pref_species.species_traits)
- hair_style = client.prefs.hair_style
+ hairstyle = client.prefs.hairstyle
hair_color = brighten_color(client.prefs.hair_color)
if(FACEHAIR in client.prefs.pref_species.species_traits)
- facial_hair_style = client.prefs.facial_hair_style
+ facial_hairstyle = client.prefs.facial_hairstyle
facial_hair_color = brighten_color(client.prefs.facial_hair_color)
update_icon()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ad91b22710b..5dfd7bbb9e1 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -597,10 +597,10 @@
//Used for new human mobs created by cloning/goleming/podding
/mob/living/carbon/human/proc/set_cloned_appearance()
if(gender == MALE)
- facial_hair_style = "Full Beard"
+ facial_hairstyle = "Full Beard"
else
- facial_hair_style = "Shaved"
- hair_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
+ facial_hairstyle = "Shaved"
+ hairstyle = pick("Bedhead", "Bedhead 2", "Bedhead 3")
underwear = "Nude"
update_body()
update_hair()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 55bf8d0fd90..6e39b5c207a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -614,8 +614,8 @@
if(prob(min(acidpwr*acid_volume/10, 90))) //Applies disfigurement
affecting.receive_damage(acidity, 2*acidity)
emote("scream")
- facial_hair_style = "Shaved"
- hair_style = "Bald"
+ facial_hairstyle = "Shaved"
+ hairstyle = "Bald"
update_hair()
ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 601cbe1373f..74e7313ed28 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -8,11 +8,11 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
//Hair colour and style
var/hair_color = "000"
- var/hair_style = "Bald"
+ var/hairstyle = "Bald"
//Facial hair colour and style
var/facial_hair_color = "000"
- var/facial_hair_style = "Shaved"
+ var/facial_hairstyle = "Shaved"
//Eye colour
var/eye_color = "000"
@@ -28,7 +28,7 @@
var/underwear_color = "000"
var/undershirt = "Nude" //Which undershirt the player wants
var/socks = "Nude" //Which socks the player wants
- var/backbag = DBACKPACK //Which backpack type the player has chosen.
+ var/backpack = DBACKPACK //Which backpack type the player has chosen.
var/jumpsuit_style = PREF_SUIT //suit/skirt
//Equipment slots
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 411a20d432a..bf50f605ca2 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -391,8 +391,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(M.flags_inv & HIDEFACIALHAIR)
facialhair_hidden = TRUE
- if(H.facial_hair_style && (FACEHAIR in species_traits) && (!facialhair_hidden || dynamic_fhair_suffix))
- S = GLOB.facial_hair_styles_list[H.facial_hair_style]
+ if(H.facial_hairstyle && (FACEHAIR in species_traits) && (!facialhair_hidden || dynamic_fhair_suffix))
+ S = GLOB.facial_hairstyles_list[H.facial_hairstyle]
if(S)
//List of all valid dynamic_fhair_suffixes
@@ -450,8 +450,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
hair_overlay.icon = 'icons/mob/human_face.dmi'
hair_overlay.icon_state = "debrained"
- else if(H.hair_style && (HAIR in species_traits))
- S = GLOB.hair_styles_list[H.hair_style]
+ else if(H.hairstyle && (HAIR in species_traits))
+ S = GLOB.hairstyles_list[H.hairstyle]
if(S)
//List of all valid dynamic_hair_suffixes
@@ -1118,15 +1118,15 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.domutcheck()
if(radiation > RAD_MOB_HAIRLOSS)
- if(prob(15) && !(H.hair_style == "Bald") && (HAIR in species_traits))
+ if(prob(15) && !(H.hairstyle == "Bald") && (HAIR in species_traits))
to_chat(H, "Your hair starts to fall out in clumps...")
addtimer(CALLBACK(src, .proc/go_bald, H), 50)
/datum/species/proc/go_bald(mob/living/carbon/human/H)
if(QDELETED(H)) //may be called from a timer
return
- H.facial_hair_style = "Shaved"
- H.hair_style = "Bald"
+ H.facial_hairstyle = "Shaved"
+ H.hairstyle = "Bald"
H.update_hair()
////////////////
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index b4b24099f81..ca033eebdff 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -11,8 +11,8 @@
/obj/effect/mob_spawn/human/corpse/syndicatesoldier
name = "Syndicate Operative"
id_job = "Operative"
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
outfit = /datum/outfit/syndicatesoldiercorpse
/datum/outfit/syndicatesoldiercorpse
@@ -30,8 +30,8 @@
/obj/effect/mob_spawn/human/corpse/syndicatecommando
name = "Syndicate Commando"
id_job = "Operative"
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
outfit = /datum/outfit/syndicatecommandocorpse
/datum/outfit/syndicatecommandocorpse
@@ -50,8 +50,8 @@
/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
name = "Syndicate Stormtrooper"
id_job = "Operative"
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
outfit = /datum/outfit/syndicatestormtroopercorpse
/datum/outfit/syndicatestormtroopercorpse
@@ -70,15 +70,15 @@
roundstart = FALSE
instant = TRUE
skin_tone = "caucasian1"
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
/obj/effect/mob_spawn/human/corpse/pirate
name = "Pirate"
skin_tone = "caucasian1" //all pirates are white because it's easier that way
outfit = /datum/outfit/piratecorpse
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
/datum/outfit/piratecorpse
name = "Pirate Corpse"
@@ -101,8 +101,8 @@
/obj/effect/mob_spawn/human/corpse/russian
name = "Russian"
outfit = /datum/outfit/russiancorpse
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
/datum/outfit/russiancorpse
name = "Russian Corpse"
@@ -152,8 +152,8 @@
/obj/effect/mob_spawn/human/corpse/wizard
name = "Space Wizard Corpse"
outfit = /datum/outfit/wizardcorpse
- hair_style = "Bald"
- facial_hair_style = "Long Beard"
+ hairstyle = "Bald"
+ facial_hairstyle = "Long Beard"
skin_tone = "caucasian1"
/datum/outfit/wizardcorpse
@@ -169,8 +169,8 @@
id_job = "Private Security Force"
id_access = "Security Officer"
outfit = /datum/outfit/nanotrasensoldiercorpse2
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
/datum/outfit/nanotrasensoldiercorpse2
name = "NT Private Security Officer Corpse"
@@ -188,8 +188,8 @@
name = "The Cat Surgeon"
id_job = "Cat Surgeon"
id_access_list = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT)
- hair_style = "Cut Hair"
- facial_hair_style = "Watson Mustache"
+ hairstyle = "Cut Hair"
+ facial_hairstyle = "Watson Mustache"
skin_tone = "caucasian1"
outfit = /datum/outfit/cat_butcher
@@ -207,7 +207,7 @@
/obj/effect/mob_spawn/human/corpse/bee_terrorist
name = "BLF Operative"
outfit = /datum/outfit/bee_terrorist
-
+
/datum/outfit/bee_terrorist
name = "BLF Operative"
uniform = /obj/item/clothing/under/color/yellow
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
index 1b9652eb351..05dd02af6ad 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
@@ -31,10 +31,10 @@
movement_type = FLYING
pressure_resistance = 300
gold_core_spawnable = NO_SPAWN //too spooky for science
- var/ghost_hair_style
+ var/ghost_hairstyle
var/ghost_hair_color
var/mutable_appearance/ghost_hair
- var/ghost_facial_hair_style
+ var/ghost_facial_hairstyle
var/ghost_facial_hair_color
var/mutable_appearance/ghost_facial_hair
var/random = TRUE //if you want random names for ghosts or not
@@ -52,13 +52,13 @@
/mob/living/simple_animal/hostile/retaliate/ghost/proc/give_hair()
- if(ghost_hair_style != null)
- ghost_hair = mutable_appearance('icons/mob/human_face.dmi', "hair_[ghost_hair_style]", -HAIR_LAYER)
+ if(ghost_hairstyle != null)
+ ghost_hair = mutable_appearance('icons/mob/human_face.dmi', "hair_[ghost_hairstyle]", -HAIR_LAYER)
ghost_hair.alpha = 200
ghost_hair.color = ghost_hair_color
add_overlay(ghost_hair)
- if(ghost_facial_hair_style != null)
- ghost_facial_hair = mutable_appearance('icons/mob/human_face.dmi', "facial_[ghost_facial_hair_style]", -HAIR_LAYER)
+ if(ghost_facial_hairstyle != null)
+ ghost_facial_hair = mutable_appearance('icons/mob/human_face.dmi', "facial_[ghost_facial_hairstyle]", -HAIR_LAYER)
ghost_facial_hair.alpha = 200
ghost_facial_hair.color = ghost_facial_hair_color
add_overlay(ghost_facial_hair)
diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm
index f2078863f11..aa31fcf7b8e 100644
--- a/code/modules/mob/living/simple_animal/hostile/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm
@@ -31,7 +31,7 @@
/mob/living/simple_animal/hostile/zombie/proc/setup_visuals()
var/datum/preferences/dummy_prefs = new
dummy_prefs.pref_species = new /datum/species/zombie
- dummy_prefs.be_random_body = TRUE
+ dummy_prefs.randomise[RANDOM_BODY] = TRUE
var/datum/job/J = SSjob.GetJob(zombiejob)
var/datum/outfit/O
if(J.outfit)
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 0bc02c9dcd1..eea31ffef35 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2011,7 +2011,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(N.age > 100)
N.become_nearsighted(type)
if(N.gender == MALE)
- N.facial_hair_style = "Beard (Very Long)"
+ N.facial_hairstyle = "Beard (Very Long)"
N.update_hair()
if(N.age > 969) //Best not let people get older than this or i might incur G-ds wrath
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 6c1b5716888..dc574f2bf4c 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -406,8 +406,8 @@
if(ishuman(M))
var/mob/living/carbon/human/N = M
- N.hair_style = "Spiky"
- N.facial_hair_style = "Shaved"
+ N.hairstyle = "Spiky"
+ N.facial_hairstyle = "Shaved"
N.facial_hair_color = "000"
N.hair_color = "000"
if(!(HAIR in N.dna.species.species_traits)) //No hair? No problem!
@@ -1450,10 +1450,10 @@
if(method == TOUCH || method == VAPOR)
if(M && ishuman(M))
var/mob/living/carbon/human/H = M
- var/datum/sprite_accessory/hair/picked_hair = pick(GLOB.hair_styles_list)
- var/datum/sprite_accessory/facial_hair/picked_beard = pick(GLOB.facial_hair_styles_list)
- H.hair_style = picked_hair
- H.facial_hair_style = picked_beard
+ var/datum/sprite_accessory/hair/picked_hair = pick(GLOB.hairstyles_list)
+ var/datum/sprite_accessory/facial_hair/picked_beard = pick(GLOB.facial_hairstyles_list)
+ H.hairstyle = picked_hair
+ H.facial_hairstyle = picked_beard
H.update_hair()
/datum/reagent/concentrated_barbers_aid
@@ -1467,8 +1467,8 @@
if(method == TOUCH || method == VAPOR)
if(M && ishuman(M))
var/mob/living/carbon/human/H = M
- H.hair_style = "Very Long Hair"
- H.facial_hair_style = "Beard (Very Long)"
+ H.hairstyle = "Very Long Hair"
+ H.facial_hairstyle = "Beard (Very Long)"
H.update_hair()
/datum/reagent/saltpetre
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 069cb8fa324..6e43486b3db 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -329,9 +329,9 @@
if(ishuman(C))
var/mob/living/carbon/human/H = C
H.hair_color = hair_color
- H.hair_style = hair_style
+ H.hairstyle = hairstyle
H.facial_hair_color = facial_hair_color
- H.facial_hair_style = facial_hair_style
+ H.facial_hairstyle = facial_hairstyle
H.lip_style = lip_style
H.lip_color = lip_color
if(real_name)
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 6659b41bf46..d252e985e5c 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -24,11 +24,11 @@
var/real_name = "" //Replacement name
//Hair colour and style
var/hair_color = "000"
- var/hair_style = "Bald"
+ var/hairstyle = "Bald"
var/hair_alpha = 255
//Facial hair colour and style
var/facial_hair_color = "000"
- var/facial_hair_style = "Shaved"
+ var/facial_hairstyle = "Shaved"
//Eye Colouring
var/lip_style = null
@@ -133,8 +133,8 @@
real_name = C.real_name
if(HAS_TRAIT(C, TRAIT_HUSK))
real_name = "Unknown"
- hair_style = "Bald"
- facial_hair_style = "Shaved"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
lip_style = null
else if(!animal_origin)
@@ -142,8 +142,8 @@
var/datum/species/S = H.dna.species
//Facial hair
- if(H.facial_hair_style && (FACEHAIR in S.species_traits))
- facial_hair_style = H.facial_hair_style
+ if(H.facial_hairstyle && (FACEHAIR in S.species_traits))
+ facial_hairstyle = H.facial_hairstyle
if(S.hair_color)
if(S.hair_color == "mutcolor")
facial_hair_color = H.dna.features["mcolor"]
@@ -153,12 +153,12 @@
facial_hair_color = H.facial_hair_color
hair_alpha = S.hair_alpha
else
- facial_hair_style = "Shaved"
+ facial_hairstyle = "Shaved"
facial_hair_color = "000"
hair_alpha = 255
//Hair
- if(H.hair_style && (HAIR in S.species_traits))
- hair_style = H.hair_style
+ if(H.hairstyle && (HAIR in S.species_traits))
+ hairstyle = H.hairstyle
if(S.hair_color)
if(S.hair_color == "mutcolor")
hair_color = H.dna.features["mcolor"]
@@ -168,7 +168,7 @@
hair_color = H.hair_color
hair_alpha = S.hair_alpha
else
- hair_style = "Bald"
+ hairstyle = "Bald"
hair_color = "000"
hair_alpha = initial(hair_alpha)
// lipstick
@@ -197,8 +197,8 @@
if(status != BODYPART_ROBOTIC) //having a robotic head hides certain features.
//facial hair
- if(facial_hair_style)
- var/datum/sprite_accessory/S = GLOB.facial_hair_styles_list[facial_hair_style]
+ if(facial_hairstyle)
+ var/datum/sprite_accessory/S = GLOB.facial_hairstyles_list[facial_hairstyle]
if(S)
var/image/facial_overlay = image(S.icon, "[S.icon_state]", -HAIR_LAYER, SOUTH)
facial_overlay.color = "#" + facial_hair_color
@@ -219,7 +219,7 @@
debrain_overlay.icon_state = "debrained"
. += debrain_overlay
else
- var/datum/sprite_accessory/S2 = GLOB.hair_styles_list[hair_style]
+ var/datum/sprite_accessory/S2 = GLOB.hairstyles_list[hairstyle]
if(S2)
var/image/hair_overlay = image(S2.icon, "[S2.icon_state]", -HAIR_LAYER, SOUTH)
hair_overlay.color = "#" + hair_color
|