From 28e742659762bf1c6e542f6db01cf01a32bcf01f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 1 Nov 2017 23:00:05 -0700 Subject: [PATCH] Hug gender (#4195) * Revert "Update #3? 4?" * Revert "Revert "Update #3? 4?"" * Hug doesn't reveal gender * Wrong logic --- .../mob/living/carbon/human/species/species.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index e31b7cfe6e..40d9d7402e 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -277,11 +277,14 @@ var/t_him = "them" if(ishuman(target)) var/mob/living/carbon/human/T = target - switch(T.identifying_gender) - if(MALE) - t_him = "him" - if(FEMALE) - t_him = "her" + if(!T.species.ambiguous_genders || (T.species.ambiguous_genders && H.species == T.species)) + switch(T.identifying_gender) + if(MALE) + t_him = "him" + if(FEMALE) + t_him = "her" + else + t_him = "them" else switch(target.gender) if(MALE)