cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-27 15:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

human/get_visible_gender applies user perspective

Browse Source 
Changed the signature of atom/get_visible_gender to support human* mob use
human/get_visible_gender accepts a user and a force var
force can be used to force PLURAL, the examinee's id gender, or bio gender
human/get_visible_gender takes the examinee's clothing into account
human/get_visible_gender handles ambiguous_gender when there is a user:
- if also human*, same species gets id gender, otherwise plural
- if observer / silicon, id gender

fixes #7207
This commit is contained in:
spookerton
2022-04-09 11:22:06 +01:00
parent eafc8fabb6
commit 5bea34d56a
4 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
+6 -16
View File
@@ -76,22 +76,12 @@
BP_L_LEG = skip_body & EXAMINE_SKIPLEGS,
BP_R_LEG = skip_body & EXAMINE_SKIPLEGS)
var/datum/gender/T = gender_datums[get_visible_gender()]
if((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)) //big suits/masks/helmets make it hard to tell their gender
T = gender_datums[PLURAL]
else if(species && species.ambiguous_genders)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.species && !istype(species, H.species))
T = gender_datums[PLURAL]// Species with ambiguous_genders will not show their true gender upon examine if the examiner is not also the same species.
if(!(issilicon(user) || isobserver(user))) // Ghosts and borgs are all knowing
T = gender_datums[PLURAL]
if(!T)
// Just in case someone VVs the gender to something strange. It'll runtime anyway when it hits usages, better to CRASH() now with a helpful message.
CRASH("Gender datum was null; key was '[((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)) ? PLURAL : gender]'")
var/gender_hidden = (skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)
var/gender_key = get_visible_gender(user, gender_hidden)
var/datum/gender/T = gender_datums[gender_key]
if (!T)
CRASH({"Null gender datum on examine: mob="[src]",hidden="[gender_hidden]",key="[gender_key]",bio="[gender]",id="[identifying_gender]""})
var/name_ender = ""
if(!((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)))
code/modules/mob/living/carbon/human/human.dm
+21 -7
View File
@@ -849,13 +849,27 @@
remoteview_target = null
reset_view(0)
/mob/living/carbon/human/get_visible_gender()
if(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask))
return PLURAL //plural is the gender-neutral default
if(species)
if(species.ambiguous_genders)
return PLURAL // regardless of what you're wearing, your gender can't be figured out
return get_gender()
/mob/living/carbon/human/get_visible_gender(mob/user, force)
switch (force)
if (VISIBLE_GENDER_FORCE_PLURAL)
return PLURAL
if (VISIBLE_GENDER_FORCE_IDENTIFYING)
return get_gender()
if (VISIBLE_GENDER_FORCE_BIOLOGICAL)
return gender
else
if ((wear_mask || (head?.flags_inv & HIDEMASK)) && (wear_suit?.flags_inv & HIDEJUMPSUIT))
return PLURAL
if (species?.ambiguous_genders && user)
if (ishuman(user))
var/mob/living/carbon/human/human = user
if (!istype(human.species, species))
return PLURAL
else if (!isobserver(user) && !issilicon(user))
return PLURAL
return get_gender()
/mob/living/carbon/human/proc/increase_germ_level(n)
if(gloves)