Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

[MIRROR] Makes more messages pronoun sensitive

code/__HELPERS/pronouns.dm

@@ -36,6 +36,9 @@
 /datum/proc/p_s(temp_gender) //is this a descriptive proc name, or what?
 	. = "s"
 
+/datum/proc/p_es(temp_gender)
+	. = "es"
+
 //like clients, which do have gender.
 /client/p_they(capitalized, temp_gender)
 	if(!temp_gender)
@@ -107,6 +110,12 @@
 	if(temp_gender != PLURAL && temp_gender != NEUTER)
 		. = "s"
 
+/client/p_es(temp_gender)
+	if(!temp_gender)
+		temp_gender = gender
+	if(temp_gender != PLURAL && temp_gender != NEUTER)
+		. = "es"
+
 //mobs(and atoms but atoms don't really matter write your own proc overrides) also have gender!
 /mob/p_they(capitalized, temp_gender)
 	if(!temp_gender)
@@ -184,6 +193,12 @@
 	if(temp_gender != PLURAL)
 		. = "s"
 
+/mob/p_es(temp_gender)
+	if(!temp_gender)
+		temp_gender = gender
+	if(temp_gender != PLURAL)
+		. = "es"
+
 //humans need special handling, because they can have their gender hidden
 /mob/living/carbon/human/p_they(capitalized, temp_gender)
 	var/list/obscured = check_obscured_slots()
@@ -240,3 +255,10 @@
 	if((SLOT_W_UNIFORM in obscured) && skipface)
 		temp_gender = PLURAL
 	return ..()
+
+/mob/living/carbon/human/p_es(temp_gender)
+	var/list/obscured = check_obscured_slots()
+	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
+	if((SLOT_W_UNIFORM in obscured) && skipface)
+		temp_gender = PLURAL
+	return ..()