From ab2b70ea7ccb826fe132c5a2ecb3f6869590eba7 Mon Sep 17 00:00:00 2001 From: Geeves Date: Thu, 18 Mar 2021 12:38:46 +0200 Subject: [PATCH] Clothing Hiding Gender (#11447) --- code/modules/mob/gender.dm | 5 +---- code/modules/mob/living/carbon/human/human.dm | 6 +++--- html/changelogs/geeves-cloth_mask_identity.yml | 7 +++++++ 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 html/changelogs/geeves-cloth_mask_identity.yml diff --git a/code/modules/mob/gender.dm b/code/modules/mob/gender.dm index 89ce795dc42..cd410ab8c93 100644 --- a/code/modules/mob/gender.dm +++ b/code/modules/mob/gender.dm @@ -75,7 +75,4 @@ var/list/datum/gender/gender_datums = list() /atom/proc/get_pronoun(var/wordtype) var/gender_to_use = get_gender() - return gender_datums[gender_to_use][wordtype] - -/mob/living/carbon/human/get_pronoun(var/wordtype) - return gender_datums[pronouns][wordtype] \ No newline at end of file + return gender_datums[gender_to_use][wordtype] \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8aed4c86bfa..e310a9c1dda 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1156,10 +1156,10 @@ /mob/living/carbon/human/get_gender() var/skipitems = get_covered_clothes() - var/skipbody = get_covered_body_parts() - . = ..() + var/skipbody = get_covered_body_parts(TRUE) if((skipbody & FACE || (skipitems & (HIDEMASK|HIDEFACE))) && ((skipbody & UPPER_TORSO && skipbody & LOWER_TORSO) || (skipitems & HIDEJUMPSUIT))) //big suits/masks/helmets make it hard to tell their gender - . = PLURAL + return PLURAL + return pronouns /mob/living/carbon/human/proc/increase_germ_level(n) if(gloves) diff --git a/html/changelogs/geeves-cloth_mask_identity.yml b/html/changelogs/geeves-cloth_mask_identity.yml new file mode 100644 index 00000000000..b1534fbfb9f --- /dev/null +++ b/html/changelogs/geeves-cloth_mask_identity.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Wearing thick clothing and gas masks now hide your gender again." + - tweak: "Clothing hiding gender is now restricted to thick clothing or clothing that explicitly obscures the face. This means cloth or surgical masks no longer does so." \ No newline at end of file