From 15c1dc743e55f96d1040846f5f93043d25c47bb5 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 28 Jan 2021 14:41:58 -0300 Subject: [PATCH] Fixes hair style choices not checking for gender restrictions (#11068) --- code/modules/client/preference_setup/general/03_body.dm | 6 +++++- code/modules/nano/modules/human_appearance.dm | 2 +- html/changelogs/alberyk-hairfix.yml | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/alberyk-hairfix.yml diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 34f6b679158..2e176a842d1 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -444,6 +444,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/list/valid_hairstyles = list() for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] + if(pref.gender == MALE && S.gender == FEMALE) + continue + if(pref.gender == FEMALE && S.gender == MALE) + continue if(!(mob_species.type in S.species_allowed)) continue @@ -555,7 +559,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.body_markings[new_marking] = "#000000" //New markings start black return TOPIC_REFRESH_UPDATE_PREVIEW - + else if(href_list["marking_up"]) var/M = href_list["marking_up"] var/start = pref.body_markings.Find(M) diff --git a/code/modules/nano/modules/human_appearance.dm b/code/modules/nano/modules/human_appearance.dm index a00c80e17cc..9482f943397 100644 --- a/code/modules/nano/modules/human_appearance.dm +++ b/code/modules/nano/modules/human_appearance.dm @@ -209,7 +209,7 @@ if(!length(valid_species)) valid_species = owner.generate_valid_species(check_whitelist, whitelist, blacklist) if(!length(valid_hairstyles) || !length(valid_facial_hairstyles)) - valid_hairstyles = owner.generate_valid_hairstyles(check_gender = 0) + valid_hairstyles = owner.generate_valid_hairstyles(check_gender = 1) valid_facial_hairstyles = owner.generate_valid_facial_hairstyles() if(!length(valid_accents)) valid_accents = owner.generate_valid_accent() diff --git a/html/changelogs/alberyk-hairfix.yml b/html/changelogs/alberyk-hairfix.yml new file mode 100644 index 00000000000..3a69c3cadd3 --- /dev/null +++ b/html/changelogs/alberyk-hairfix.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed hair style choices not checking for gender restrictions."