diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm index 5d9aba0e3df..bf9c479d3e8 100644 --- a/code/__DEFINES/mob.dm +++ b/code/__DEFINES/mob.dm @@ -50,6 +50,10 @@ #define SHOES_SLOWDOWN -1.0 // How much shoes slow you down by default. Negative values speed you up +//Mob attribute defaults. +#define DEFAULT_MARKING_STYLES list("head" = "None", "body" = "None", "tail" = "None") //Marking styles. Use instead of initial() for m_styles. +#define DEFAULT_MARKING_COLOURS list("head" = "#000000", "body" = "#000000", "tail" = "#000000") //Marking colours. Use instead of initial() for m_colours. + ////////REAGENT STUFF//////// // How many units of reagent are consumed per tick, by default. #define REAGENTS_METABOLISM 0.4 diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 8aa368eedcb..51531c81340 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -163,7 +163,7 @@ var/global/list/bad_blocks[0] // Markings if(!character.m_styles) - character.m_styles = initial(character.m_styles) + character.m_styles = DEFAULT_MARKING_STYLES var/head_marks = marking_styles_list.Find(character.m_styles["head"]) var/body_marks = marking_styles_list.Find(character.m_styles["body"]) diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index 796bbdb2b24..f6757998532 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -46,7 +46,7 @@ var/new_eyes = input("Please select eye color.", "Character Generation", rgb(M.r_eyes, M.g_eyes, M.b_eyes)) as null|color if(new_eyes) - M.change_eye_color(M.r_eyes, M.g_eyes, M.b_eyes) + M.change_eye_color(color2R(new_eyes), color2G(new_eyes), color2B(new_eyes)) //Alt heads. if(head_organ.species.bodyflags & HAS_ALT_HEADS) diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index 6b99f2d101d..bcf0146d90e 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -313,8 +313,8 @@ if(!player_alt_titles) player_alt_titles = new() if(!organ_data) src.organ_data = list() if(!rlimb_data) src.rlimb_data = list() - if(!m_colours) m_colours = initial(m_colours) - if(!m_styles) m_styles = initial(m_styles) + if(!m_colours) m_colours = DEFAULT_MARKING_COLOURS + if(!m_styles) m_styles = DEFAULT_MARKING_STYLES if(!gear) gear = list() return 1 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d42c48bff13..8934ba3bb49 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1486,7 +1486,6 @@ to_chat(usr, "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].") /mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/delay_icon_update = 0) - var/datum/species/oldspecies = species if(!dna) if(!new_species) @@ -1556,10 +1555,16 @@ var/obj/item/organ/external/head/H = get_organ("head") if(species.default_hair) H.h_style = species.default_hair + else + H.h_style = "Bald" if(species.default_fhair) H.f_style = species.default_fhair + else + H.f_style = "Shaved" if(species.default_headacc) H.ha_style = species.default_headacc + else + H.ha_style = "None" if(species.default_hair_colour) //Apply colour. @@ -1587,10 +1592,8 @@ H.g_headacc = 0 H.b_headacc = 0 - m_styles = initial(m_styles) //Wipes out markings, setting them all to "None". - m_colours = initial(m_styles) //Defaults colour to #00000 for all markings. - H.alt_head = "None" - H.ha_style = "None" + m_styles = DEFAULT_MARKING_STYLES //Wipes out markings, setting them all to "None". + m_colours = DEFAULT_MARKING_COLOURS //Defaults colour to #00000 for all markings. body_accessory = null if(!dna) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index adf951fad03..ebe05ead74f 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -4,17 +4,8 @@ var/global/default_martial_art = new/datum/martial_art hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,NATIONS_HUD) //Marking colour and style - var/list/m_colours = list( - "head" = "#000000", - "body" = "#000000", - "tail" = "#000000" - ) - - var/list/m_styles = list( - "head" = "None", - "body" = "None", - "tail" = "None" - ) + var/list/m_colours = DEFAULT_MARKING_COLOURS //All colours set to #000000. + var/list/m_styles = DEFAULT_MARKING_STYLES //All markings set to None. //Eye colour var/r_eyes = 0 diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index bdb64ba0a98..1c5760a322f 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -119,11 +119,11 @@ var/female_scream_sound = 'sound/goonstation/voice/female_scream.ogg' //Default hair/headacc style vars. - var/default_hair = "Bald" //Default hair style for newly created humans unless otherwise set. + var/default_hair //Default hair style for newly created humans unless otherwise set. var/default_hair_colour - var/default_fhair = "Shaved" //Default facial hair style for newly created humans unless otherwise set. + var/default_fhair //Default facial hair style for newly created humans unless otherwise set. var/default_fhair_colour - var/default_headacc = "None" //Default head accessory style for newly created humans unless otherwise set. + var/default_headacc //Default head accessory style for newly created humans unless otherwise set. var/default_headacc_colour //Defining lists of icon skin tones for species that have them.