Merge pull request #20698 from ChangelingRain/imtransandthisisapresenttoyall

Adds some pronoun helpers

code/modules/mob/living/carbon/examine.dm

@@ -1,78 +1,85 @@
 /mob/living/carbon/examine(mob/user)
+	var/t_He = they_pronoun(TRUE)
+	var/t_His = their_pronoun(TRUE)
+	var/t_his = their_pronoun()
+	var/t_him = them_pronoun()
+	var/t_has = get_has()
+	var/t_is = get_is()
+
 	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"
 
 	if (handcuffed)
-		msg += "<span class='warning'>It is \icon[src.handcuffed] handcuffed!</span>\n"
+		msg += "<span class='warning'>[t_He] [t_is] \icon[src.handcuffed] handcuffed!</span>\n"
 	if (head)
-		msg += "It has \icon[src.head] \a [src.head] on its head. \n"
+		msg += "[t_He] [t_is] wearing \icon[src.head] \a [src.head] on [t_his] head. \n"
 	if (wear_mask)
-		msg += "It has \icon[src.wear_mask] \a [src.wear_mask] on its face.\n"
+		msg += "[t_He] [t_is] wearing \icon[src.wear_mask] \a [src.wear_mask] on [t_his] face.\n"
 
 	for(var/obj/item/I in held_items)
 		if(!(I.flags & ABSTRACT))
 			if(I.blood_DNA)
-				msg += "<span class='warning'>It has \icon[I] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
+				msg += "<span class='warning'>[t_He] [t_is] holding \icon[I] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in [t_his] [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
 			else
-				msg += "It has \icon[I] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
+				msg += "[t_He] [t_is] holding \icon[I] \a [I] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
 
 	if (back)
-		msg += "It has \icon[src.back] \a [src.back] on its back.\n"
+		msg += "[t_He] [t_has] \icon[src.back] \a [src.back] on [t_his] back.\n"
 	var/appears_dead = 0
 	if (stat == DEAD)
 		appears_dead = 1
 		if(getorgan(/obj/item/organ/brain))
-			msg += "<span class='deadsay'>It is limp and unresponsive, with no signs of life.</span>\n"
+			msg += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive, with no signs of life.</span>\n"
 		else if(get_bodypart("head"))
-			msg += "<span class='deadsay'>It appears that it's brain is missing...</span>\n"
+			msg += "<span class='deadsay'>[t_He] appears that [t_his] brain is missing...</span>\n"
 
 	var/list/missing = get_missing_limbs()
 	for(var/t in missing)
 		if(t=="head")
-			msg += "<span class='deadsay'><B>Its [parse_zone(t)] is missing!</B></span>\n"
+			msg += "<span class='deadsay'><B>[t_His] [parse_zone(t)] is missing!</B></span>\n"
 			continue
-		msg += "<<span class='warning'><B>Its [parse_zone(t)] is missing!</B></span>\n"
+		msg += "<<span class='warning'><B>[t_His] [parse_zone(t)] is missing!</B></span>\n"
 
 	msg += "<span class='warning'>"
 	var/temp = getBruteLoss()
 	if(temp)
 		if (temp < 30)
-			msg += "It has minor bruising.\n"
+			msg += "[t_He] [t_has] minor bruising.\n"
 		else
-			msg += "<B>It has severe bruising!</B>\n"
+			msg += "<B>[t_He] [t_has] severe bruising!</B>\n"
 
 	temp = getFireLoss()
 	if(temp)
 		if (temp < 30)
-			msg += "It has minor burns.\n"
+			msg += "[t_He] [t_has] minor burns.\n"
 		else
-			msg += "<B>It has severe burns!</B>\n"
+			msg += "<B>[t_He] [t_has] severe burns!</B>\n"
 
 	temp = getCloneLoss()
 	if(temp)
 		if(getCloneLoss() < 30)
-			msg += "It is slightly deformed.\n"
+			msg += "[t_He] [t_has] slightly deformed.\n"
 		else
-			msg += "<b>It is severely deformed.</b>\n"
+			msg += "<b>[t_He] [t_has] severely deformed.</b>\n"
 
 	if(getBrainLoss() > 60)
-		msg += "It seems to be clumsy and unable to think.\n"
+		msg += "[t_He] seems to be clumsy and unable to think.\n"
 
 	if(fire_stacks > 0)
-		msg += "It's covered in something flammable.\n"
+		msg += "[t_He] [t_is] covered in something flammable.\n"
 	if(fire_stacks < 0)
-		msg += "It's soaked in water.\n"
+		msg += "[t_He] [t_is] looks a little soaked.\n"
 
 	if(pulledby && pulledby.grab_state)
-		msg += "It's restrained by [pulledby]'s grip.\n"
+		msg += "[t_He] [t_is] restrained by [pulledby]'s grip.\n"
 
 	msg += "</span>"
 
 	if(!appears_dead)
 		if(stat == UNCONSCIOUS)
-			msg += "It isn't responding to anything around it; it seems to be asleep.\n"
+			msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n"
 
 		if(digitalcamo)
-			msg += "It is moving its body in an unnatural and blatantly unsimian manner.\n"
+			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly unsimian manner.\n"
 
 
 

code/modules/mob/living/carbon/human/examine.dm

@@ -1,36 +1,17 @@
 /mob/living/carbon/human/examine(mob/user)
+//this is very slightly better than it was because you can use it more places. still can't do \his[src] though.
+	var/t_He = they_pronoun(TRUE)
+	var/t_His = their_pronoun(TRUE)
+	var/t_his = their_pronoun()
+	var/t_him = them_pronoun()
+	var/t_has = get_has()
+	var/t_is = get_is()
+
+	var/msg = "<span class='info'>*---------*\nThis is <EM>[src.name]</EM>!\n"
 
 	var/list/obscured = check_obscured_slots()
 	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
 
-	// crappy hacks because you can't do \his[src] etc. I'm sorry this proc is so unreadable, blame the text macros :<
-	var/t_He = "It" //capitalised for use at the start of each line.
-	var/t_his = "its"
-	var/t_him = "it"
-	var/t_has = "has"
-	var/t_is = "is"
-
-	var/msg = "<span class='info'>*---------*\nThis is "
-
-	if( (slot_w_uniform in obscured) && skipface ) //big suits/masks/helmets make it hard to tell their gender
-		t_He = "They"
-		t_his = "their"
-		t_him = "them"
-		t_has = "have"
-		t_is = "are"
-	else
-		switch(gender)
-			if(MALE)
-				t_He = "He"
-				t_his = "his"
-				t_him = "him"
-			if(FEMALE)
-				t_He = "She"
-				t_his = "her"
-				t_him = "her"
-
-	msg += "<EM>[src.name]</EM>!\n"
-
 	//uniform
 	if(w_uniform && !(slot_w_uniform in obscured))
 		//Ties
@@ -163,7 +144,7 @@
 			if(suiciding)
 				msg += "<span class='warning'>[t_He] appears to have commited suicide... there is no hope of recovery.</span>\n"
 			if(hellbound)
-				msg += "<span class='warning'>[t_his] soul seems to have been ripped out of [t_his] body.  Revival is impossible.</span>\n"
+				msg += "<span class='warning'>[t_His] soul seems to have been ripped out of [t_his] body.  Revival is impossible.</span>\n"
 			msg += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life"
 			if(!key)
 				var/foundghost = 0
@@ -196,7 +177,7 @@
 	var/r_limbs_missing = 0
 	for(var/t in missing)
 		if(t=="head")
-			msg += "<span class='deadsay'><B>[capitalize(t_his)] [parse_zone(t)] is missing!</B><span class='warning'>\n"
+			msg += "<span class='deadsay'><B>[t_His] [parse_zone(t)] is missing!</B><span class='warning'>\n"
 			continue
 		if(t == "l_arm" || t == "l_leg")
 			l_limbs_missing++
@@ -267,9 +248,9 @@
 	if(islist(stun_absorption))
 		for(var/i in stun_absorption)
 			if(stun_absorption[i]["end_time"] > world.time && stun_absorption[i]["examine_message"])
-				msg += "[t_He][stun_absorption[i]["examine_message"]]\n"
+				msg += "[t_He] [t_is][stun_absorption[i]["examine_message"]]\n"
 
-	if(drunkenness && !skipface && stat != DEAD) //Drunkenness
+	if(drunkenness && !skipface && !appears_dead) //Drunkenness
 		switch(drunkenness)
 			if(11 to 21)
 				msg += "[t_He] [t_is] slightly flushed.\n"
@@ -305,7 +286,7 @@
 		if(digitalcamo)
 			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n"
 
-	if(istype(user, /mob/living/carbon/human))
+	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		var/obj/item/organ/cyberimp/eyes/hud/CIH = H.getorgan(/obj/item/organ/cyberimp/eyes/hud)
 		if(istype(H.glasses, /obj/item/clothing/glasses/hud) || CIH)

code/modules/mob/living/carbon/human/human.dm

@@ -496,7 +496,7 @@
 			. = 0
 	if(!. && error_msg && user)
 		// Might need re-wording.
-		user << "<span class='alert'>There is no exposed flesh or thin material [above_neck(target_zone) ? "on their head" : "on their body"].</span>"
+		user << "<span class='alert'>There is no exposed flesh or thin material [above_neck(target_zone) ? "on [their_pronoun()] head" : "on [their_pronoun()] body"].</span>"
 
 /mob/living/carbon/human/proc/check_obscured_slots()
 	var/list/obscured = list()
@@ -521,7 +521,7 @@
 		if(wear_mask.flags_inv & HIDEEYES)
 			obscured |= slot_glasses
 
-	if(obscured.len > 0)
+	if(obscured.len)
 		return obscured
 	else
 		return null
@@ -630,7 +630,7 @@
 		src << "<span class='warning'>Remove your mask first!</span>"
 		return 0
 	if(C.is_mouth_covered())
-		src << "<span class='warning'>Remove their mask first!</span>"
+		src << "<span class='warning'>Remove [their_pronoun()] mask first!</span>"
 		return 0
 
 	if(C.cpr_time < world.time + 30)
@@ -889,7 +889,7 @@
 	if(blood && (NOBLOOD in dna.species.specflags))
 		if(message)
 			visible_message("<span class='warning'>[src] dry heaves!</span>", \
-							"<span class='userdanger'>You try to throw up, but there's nothing your stomach!</span>")
+							"<span class='userdanger'>You try to throw up, but there's nothing in your stomach!</span>")
 		if(stun)
 			Weaken(10)
 		return 1

code/modules/mob/living/carbon/human/whisper.dm

@@ -59,13 +59,13 @@
 	watching  -= eavesdropping
 
 	var/rendered
-	whispers = critical ? "whispers something in their final breath." : "whispers something."
+	whispers = critical ? "whispers something in [their_pronoun()] final breath." : "whispers something."
 	rendered = "<span class='game say'><span class='name'>[src.name]</span> [whispers]</span>"
 	for(var/mob/M in watching)
 		M.show_message(rendered, 2)
 
 	var/spans = list(SPAN_ITALICS)
-	whispers = critical ? "whispers in their final breath" : "whispers"
+	whispers = critical ? "whispers in [their_pronoun()] final breath" : "whispers"
 	rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[attach_spans(message, spans)]\"</span></span>"
 
 	for(var/atom/movable/AM in listening)

code/modules/mob/living/simple_animal/constructs.dm

@@ -38,13 +38,16 @@
 		AddSpell(new spell(null))
 
 /mob/living/simple_animal/hostile/construct/examine(mob/user)
-	var/msg = "<span cass='info'>*---------*\nThis is \icon[src] \a <b>[src]</b>!\n"
-	if (src.health < src.maxHealth)
+	var/t_He = they_pronoun(TRUE)
+	var/plurality = (gender == PLURAL)
+	var/msg = "<span class='cult'>*---------*\nThis is \icon[src] \a <b>[src]</b>!\n"
+	msg += "[desc]\n"
+	if(health < maxHealth)
 		msg += "<span class='warning'>"
 		if (src.health >= src.maxHealth/2)
-			msg += "It looks slightly dented.\n"
+			msg += "[t_He] look[plurality ? "":"s"] slightly dented.\n"
 		else
-			msg += "<b>It looks severely dented!</b>\n"
+			msg += "<b>[t_He] look[plurality ? "":"s"] severely dented!</b>\n"
 		msg += "</span>"
 	msg += "*---------*</span>"
 
@@ -59,11 +62,11 @@
 				M.visible_message("<span class='danger'>[M] repairs some of \the <b>[src]'s</b> dents.</span>", \
 						   "<span class='cult'>You repair some of <b>[src]'s</b> dents, leaving <b>[src]</b> at <b>[health]/[maxHealth]</b> health.</span>")
 			else
-				M.visible_message("<span class='danger'>[M] repairs some of its own dents.</span>", \
+				M.visible_message("<span class='danger'>[M] repairs some of [their_pronoun()] own dents.</span>", \
 						   "<span class='cult'>You repair some of your own dents, leaving you at <b>[M.health]/[M.maxHealth]</b> health.</span>")
 		else
 			if(src != M)
-				M << "<span class='cult'>You cannot repair <b>[src]'s</b> dents, as it has none!</span>"
+				M << "<span class='cult'>You cannot repair <b>[src]'s</b> dents, as [they_pronoun()] [get_has()] none!</span>"
 			else
 				M << "<span class='cult'>You cannot repair your own dents, as you have none!</span>"
 	else if(src != M)

code/modules/mob/living/simple_animal/friendly/drone/interaction.dm

@@ -84,7 +84,7 @@
 			user << "<span class='notice'>You start to tighten loose screws on [src]...</span>"
 			if(do_after(user,80/I.toolspeed,target=user))
 				adjustBruteLoss(-getBruteLoss())
-				visible_message("<span class='notice'>[user] tightens [src == user ? "their" : "[src]'s"] loose screws!</span>", "<span class='notice'>You tighten [src == user ? "your" : "[src]'s"] loose screws.</span>")
+				visible_message("<span class='notice'>[user] tightens [src == user ? "[user.their_pronoun()]" : "[src]'s"] loose screws!</span>", "<span class='notice'>You tighten [src == user ? "your" : "[src]'s"] loose screws.</span>")
 			else
 				user << "<span class='warning'>You need to remain still to tighten [src]'s screws!</span>"
 		else

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -94,7 +94,7 @@
 		A.melee_damage_lower += 5
 		A.melee_damage_upper += 5
 		A.update_icons()
-		user << "<span class='info'>You strap the armor plating to [A] and sharpen their claws with the nail filer. This was a great idea.</span>"
+		user << "<span class='info'>You strap the armor plating to [A] and sharpen [A.their_pronoun()] claws with the nail filer. This was a great idea.</span>"
 		qdel(src)
 
 

code/modules/mob/living/simple_animal/shade.dm

@@ -2,7 +2,7 @@
 	name = "Shade"
 	real_name = "Shade"
 	desc = "A bound spirit"
-	gender = NEUTER
+	gender = PLURAL
 	icon = 'icons/mob/mob.dmi'
 	icon_state = "shade"
 	icon_living = "shade"
@@ -29,7 +29,10 @@
 	flying = 1
 	loot = list(/obj/item/weapon/ectoplasm)
 	del_on_death = 1
-	deathmessage = "lets out a contented sigh as their form unwinds."
+
+/mob/living/simple_animal/shade/death()
+	deathmessage = "lets out a contented sigh as [their_pronoun()] form unwinds."
+	..()
 
 /mob/living/simple_animal/shade/canSuicide()
 	if(istype(loc, /obj/item/device/soulstone)) //do not suicide inside the soulstone
@@ -47,7 +50,7 @@
 			M.visible_message("<span class='danger'>[M] heals \the <b>[src]</b>.</span>", \
 					   "<span class='cult'>You heal <b>[src]</b>, leaving <b>[src]</b> at <b>[health]/[maxHealth]</b> health.</span>")
 		else
-			M << "<span class='cult'>You cannot heal <b>[src]</b>, as it is unharmed!</span>"
+			M << "<span class='cult'>You cannot heal <b>[src]</b>, as [they_pronoun()] [get_is()] unharmed!</span>"
 	else if(src != M)
 		..()