From 63560e191ecf0193afb506ef70fb9a98b5a3a9ee Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 30 Jan 2020 18:03:58 +0100 Subject: [PATCH 1/2] A little load_character() fix: re-re-removing gender restrictions for underwear/hair styles. --- code/modules/client/preferences_savefile.dm | 22 +++++---------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 75daaabb99..fe63561d65 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -460,7 +460,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(!real_name) real_name = random_unique_name(gender) custom_species = reject_bad_name(custom_species) - for(var/custom_name_id in GLOB.preferences_custom_names) + for(var/custom_name_id in GLOB.preferences_custom_names), var/namedata = GLOB.preferences_custom_names[custom_name_id] custom_names[custom_name_id] = reject_bad_name(custom_names[custom_name_id],namedata["allow_numbers"]) if(!custom_names[custom_name_id]) @@ -479,22 +479,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car 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)) - 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) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_m) - underwear = sanitize_inlist(underwear, GLOB.underwear_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) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_f) - underwear = sanitize_inlist(underwear, GLOB.underwear_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) - underwear = sanitize_inlist(underwear, GLOB.underwear_list) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list) - + hair_style = sanitize_inlist(hair_style, GLOB.hair_styles_list) + facial_hair_style = sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_list) + underwear = sanitize_inlist(underwear, GLOB.underwear_list) + undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list) undie_color = sanitize_hexcolor(undie_color, 3, FALSE, initial(undie_color)) shirt_color = sanitize_hexcolor(shirt_color, 3, FALSE, initial(shirt_color)) socks = sanitize_inlist(socks, GLOB.socks_list) From d92a67f5820424794ce553a33b4c99e5bc692db0 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 30 Jan 2020 18:08:43 +0100 Subject: [PATCH 2/2] I'm sorry what? --- code/modules/client/preferences_savefile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index fe63561d65..a69b0c10b8 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -460,7 +460,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(!real_name) real_name = random_unique_name(gender) custom_species = reject_bad_name(custom_species) - for(var/custom_name_id in GLOB.preferences_custom_names), + for(var/custom_name_id in GLOB.preferences_custom_names) var/namedata = GLOB.preferences_custom_names[custom_name_id] custom_names[custom_name_id] = reject_bad_name(custom_names[custom_name_id],namedata["allow_numbers"]) if(!custom_names[custom_name_id])