Makes the pronoun helper proc names less horrifyingly long (#20780)

* why were these so LONG, what the fuck

* gosh

* pronoun agenda
the true agenda is killing coiax's squished lines

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

@@ -14,10 +14,6 @@
 	//var/m_type = 1
 
 	switch(act)//Even carbon organisms want it alphabetically ordered..
-		if ("aflap")
-			if (!src.restrained())
-				message = "<B>[src]</B> flaps \his wings ANGRILY!"
-				m_type = 2
 
 		if ("airguitar")
 			if (!src.restrained())
@@ -32,10 +28,6 @@
 			message = "<B>[src]</B> blinks rapidly."
 			m_type = 1
 
-		if ("blush","blushes")
-			message = "<B>[src]</B> blushes."
-			m_type = 1
-
 		if ("bow","bows")
 			if (!src.buckled)
 				var/M = null
@@ -82,15 +74,6 @@
 				message = "<B>[src]</B> makes a strong noise."
 				m_type = 2
 
-		if ("deathgasp","deathgasps")
-			message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
-			m_type = 1
-
-		if ("flap","flaps")
-			if (!src.restrained())
-				message = "<B>[src]</B> flaps \his wings."
-				m_type = 2
-
 		if ("gasp","gasps")
 			if (!muzzled)
 				..(act)
@@ -116,10 +99,6 @@
 				..()
 			return
 
-		if ("nod","nods")
-			message = "<B>[src]</B> nods."
-			m_type = 1
-
 		if ("scream","screams")
 			if (!muzzled)
 				..(act)
@@ -127,10 +106,6 @@
 				message = "<B>[src]</B> makes a very loud noise."
 				m_type = 2
 
-		if ("shake","shakes")
-			message = "<B>[src]</B> shakes \his head."
-			m_type = 1
-
 		if ("sneeze","sneezes")
 			if (!muzzled)
 				..(act)
@@ -145,10 +120,6 @@
 				message = "<B>[src]</B> sighs."
 				m_type = 2
 
-		if ("sniff","sniffs")
-			message = "<B>[src]</B> sniffs."
-			m_type = 2
-
 		if ("snore","snores")
 			if (!muzzled)
 				..(act)

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

@@ -1,10 +1,10 @@
 /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/t_He = p_they(TRUE)
+	var/t_His = p_their(TRUE)
+	var/t_his = p_their()
+	var/t_him = p_them()
+	var/t_has = p_have()
+	var/t_is = p_are()
 
 	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"
 

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

@@ -24,12 +24,12 @@
 	switch(act) //Please keep this alphabetically ordered when adding or changing emotes.
 		if ("aflap") //Any emote on human that uses miming must be left in, oh well.
 			if (!src.restrained())
-				message = "<B>[src]</B> flaps \his wings ANGRILY!"
+				message = "<B>[src]</B> flaps [p_their()] wings ANGRILY!"
 				m_type = 2
 
 		if ("choke","chokes")
 			if (miming)
-				message = "<B>[src]</B> clutches \his throat desperately!"
+				message = "<B>[src]</B> clutches [p_their()] throat desperately!"
 			else
 				..(act)
 
@@ -70,7 +70,7 @@
 					message = "<B>[src]</B> cries."
 					m_type = 2
 				else
-					message = "<B>[src]</B> makes a weak noise. \He frowns."
+					message = "<B>[src]</B> makes a weak noise. [p_they(TRUE)] frown[p_s()]."
 					m_type = 2
 
 		if ("custom")
@@ -121,7 +121,7 @@
 				if (M)
 					message = "<B>[src]</B> gives daps to [M]."
 				else
-					message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps \himself. Shameful."
+					message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps [p_them()]self. Shameful."
 
 		if ("eyebrow")
 			message = "<B>[src]</B> raises an eyebrow."
@@ -129,7 +129,7 @@
 
 		if ("flap","flaps")
 			if (!src.restrained())
-				message = "<B>[src]</B> flaps \his wings."
+				message = "<B>[src]</B> flaps [p_their()] wings."
 				m_type = 2
 				if(((dna.features["wings"] != "None") && !("wings" in dna.species.mutant_bodyparts)))
 					OpenWings()
@@ -138,10 +138,10 @@
 		if ("wings")
 			if (!src.restrained())
 				if(dna && dna.species &&((dna.features["wings"] != "None") && ("wings" in dna.species.mutant_bodyparts)))
-					message = "<B>[src]</B> opens \his wings."
+					message = "<B>[src]</B> opens [p_their()] wings."
 					OpenWings()
 				else if(dna && dna.species &&((dna.features["wings"] != "None") && ("wingsopen" in dna.species.mutant_bodyparts)))
-					message = "<B>[src]</B> closes \his wings."
+					message = "<B>[src]</B> closes [p_their()] wings."
 					CloseWings()
 				else
 					src << "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>"
@@ -191,7 +191,7 @@
 					if (M.canmove && M.get_empty_held_indexes() && !M.restrained())
 						message = "<B>[src]</B> shakes hands with [M]."
 					else
-						message = "<B>[src]</B> holds out \his hand to [M]."
+						message = "<B>[src]</B> holds out [p_their()] hand to [M]."
 
 		if ("hug","hugs")
 			m_type = 1
@@ -207,7 +207,7 @@
 				if (M)
 					message = "<B>[src]</B> hugs [M]."
 				else
-					message = "<B>[src]</B> hugs \himself."
+					message = "<B>[src]</B> hugs [p_them()]self."
 
 		if ("me")
 			if(silent)
@@ -339,7 +339,7 @@
 
 		if("wag","wags")
 			if(dna && dna.species && (("tail_lizard" in dna.species.mutant_bodyparts) || ((dna.features["tail_human"] != "None") && !("waggingtail_human" in dna.species.mutant_bodyparts))))
-				message = "<B>[src]</B> wags \his tail."
+				message = "<B>[src]</B> wags [p_their()] tail."
 				startTailWag()
 			else if(dna && dna.species && (("waggingtail_lizard" in dna.species.mutant_bodyparts) || ("waggingtail_human" in dna.species.mutant_bodyparts)))
 				endTailWag()

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

@@ -1,11 +1,11 @@
 /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/t_He = p_they(TRUE)
+	var/t_His = p_their(TRUE)
+	var/t_his = p_their()
+	var/t_him = p_them()
+	var/t_has = p_have()
+	var/t_is = p_are()
 
 	var/msg = "<span class='info'>*---------*\nThis is <EM>[src.name]</EM>!\n"
 
@@ -142,7 +142,7 @@
 		appears_dead = 1
 		if(getorgan(/obj/item/organ/brain))//Only perform these checks if there is no brain
 			if(suiciding)
-				msg += "<span class='warning'>[t_He] appears to have commited suicide... there is no hope of recovery.</span>\n"
+				msg += "<span class='warning'>[t_He] appear[p_s()] 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='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life"
@@ -263,7 +263,7 @@
 			if(61.01 to 91)
 				msg += "[t_He] looks like a drunken mess.\n"
 			if(91.01 to INFINITY)
-				msg += "[t_He] is a shitfaced, slobbering wreck.\n"
+				msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n"
 
 	msg += "</span>"
 

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_pronoun()] head" : "on [their_pronoun()] body"].</span>"
+		user << "<span class='alert'>There is no exposed flesh or thin material [above_neck(target_zone) ? "on [p_their()] head" : "on [p_their()] body"].</span>"
 
 /mob/living/carbon/human/proc/check_obscured_slots()
 	var/list/obscured = list()
@@ -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_pronoun()] mask first!</span>"
+		src << "<span class='warning'>Remove [p_their()] mask first!</span>"
 		return 0
 
 	if(C.cpr_time < world.time + 30)

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

@@ -59,13 +59,13 @@
 	watching  -= eavesdropping
 
 	var/rendered
-	whispers = critical ? "whispers something in [their_pronoun()] final breath." : "whispers something."
+	whispers = critical ? "whispers something in [p_their()] 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_pronoun()] final breath" : "whispers"
+	whispers = critical ? "whispers in [p_their()] 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/emote.dm

@@ -19,7 +19,7 @@
 	switch(act)//Hello, how would you like to order? Alphabetically!
 		if ("aflap")
 			if (!src.restrained())
-				message = "<B>[src]</B> flaps its wings ANGRILY!"
+				message = "<B>[src]</B> flaps [p_their()] wings ANGRILY!"
 				m_type = 2
 
 		if ("blush","blushes")
@@ -51,7 +51,7 @@
 			m_type = 2
 
 		if ("cross","crosses")
-			message = "<B>[src]</B> crosses their arms."
+			message = "<B>[src]</B> crosses [p_their()] arms."
 			m_type = 2
 
 		if ("chuckle","chuckles")
@@ -73,7 +73,7 @@
 				m_type = 1
 
 		if ("deathgasp","deathgasps")
-			message = "<B>[src]</B> seizes up and falls limp, its eyes dead and lifeless..."
+			message = "<B>[src]</B> seizes up and falls limp, [p_their()] eyes dead and lifeless..."
 			m_type = 1
 
 		if ("drool","drools")
@@ -89,7 +89,7 @@
 
 		if ("flap","flaps")
 			if (!src.restrained())
-				message = "<B>[src]</B> flaps its wings."
+				message = "<B>[src]</B> flaps [p_their()] wings."
 				m_type = 2
 
 		if ("flip","flips")
@@ -222,7 +222,7 @@
 			m_type = 1
 
 		if ("shake","shakes")
-			message = "<B>[src]</B> shakes its head."
+			message = "<B>[src]</B> shakes [p_their()] head."
 			m_type = 1
 
 		if ("sigh","sighs")
@@ -268,7 +268,7 @@
 				message = "<B>[src]</B> stares."
 
 		if ("stretch","stretches")
-			message = "<B>[src]</B> stretches their arms."
+			message = "<B>[src]</B> stretches [p_their()] arms."
 			m_type = 2
 
 		if ("sulk","sulks")
@@ -276,20 +276,12 @@
 			m_type = 1
 
 		if ("surrender","surrenders")
-			message = "<B>[src]</B> puts their hands on their head and falls to the ground, they surrender!"
+			message = "<B>[src]</B> puts [p_their()] hands on [p_their()] head and falls to the ground, [p_they()] surrender[p_s()]!"
 			if(sleeping)
 				return //Can't surrender while asleep.
 			Weaken(20) //So you can't resist.
 			m_type = 1
 
-		if ("faint","faints")
-			message = "<B>[src]</B> faints."
-			if(sleeping)
-				return //Can't faint while asleep
-			SetSleeping(10) //Short-short nap
-			m_type = 1
-
-
 		if ("sway","sways")
 			message = "<B>[src]</B> sways around dizzily."
 			m_type = 1

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

@@ -38,16 +38,16 @@
 		AddSpell(new spell(null))
 
 /mob/living/simple_animal/hostile/construct/examine(mob/user)
-	var/t_He = they_pronoun(TRUE)
-	var/plurality = (gender == PLURAL)
+	var/t_He = p_they(TRUE)
+	var/t_s = p_s()
 	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 += "[t_He] look[plurality ? "":"s"] slightly dented.\n"
+		if(health >= maxHealth/2)
+			msg += "[t_He] look[t_s] slightly dented.\n"
 		else
-			msg += "<b>[t_He] look[plurality ? "":"s"] severely dented!</b>\n"
+			msg += "<b>[t_He] look[t_s] severely dented!</b>\n"
 		msg += "</span>"
 	msg += "*---------*</span>"
 
@@ -62,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 [their_pronoun()] own dents.</span>", \
+				M.visible_message("<span class='danger'>[M] repairs some of [p_their()] 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 [they_pronoun()] [get_has()] none!</span>"
+				M << "<span class='cult'>You cannot repair <b>[src]'s</b> dents, as [p_they()] [p_have()] 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 ? "[user.their_pronoun()]" : "[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.p_their()]" : "[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

@@ -95,7 +95,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 [A.their_pronoun()] 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.p_their()] claws with the nail filer. This was a great idea.</span>"
 		qdel(src)
 
 

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

@@ -294,7 +294,7 @@
 				user << "<span class='notice'>[src] are useless on the dead.</span>"
 				return
 			if(H != user)
-				H.visible_message("[user] forces [H] to apply [src]... they quickly regenerate all injuries!")
+				H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!")
 				feedback_add_details("hivelord_core","[src.type]|used|other")
 			else
 				user << "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>"

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

@@ -31,7 +31,7 @@
 	del_on_death = 1
 
 /mob/living/simple_animal/shade/death()
-	deathmessage = "lets out a contented sigh as [their_pronoun()] form unwinds."
+	deathmessage = "lets out a contented sigh as [p_their()] form unwinds."
 	..()
 
 /mob/living/simple_animal/shade/canSuicide()
@@ -50,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 [they_pronoun()] [get_is()] unharmed!</span>"
+			M << "<span class='cult'>You cannot heal <b>[src]</b>, as [p_they()] [p_are()] unharmed!</span>"
 	else if(src != M)
 		..()