Them

code/datums/spells/mime.dm

@@ -21,7 +21,7 @@
 		if(!usr.mind.miming)
 			to_chat(usr, "<span class='notice'>You must dedicate yourself to silence first.</span>")
 			return
-		invocation = "<B>[usr.real_name]</B> looks as if a wall is in front of them."
+		invocation = "<B>[usr.real_name]</B> looks as if a wall is in front of [usr.p_them()]."
 	else
 		invocation_type ="none"
 	..()

code/game/gamemodes/changeling/powers/absorb.dm

@@ -73,8 +73,8 @@
 			recent_speech = target.say_log.Copy()
 
 		if(recent_speech.len)
-			user.mind.store_memory("<B>Some of [target]'s speech patterns, we should study these to better impersonate them!</B>")
-			to_chat(user, "<span class='boldnotice'>Some of [target]'s speech patterns, we should study these to better impersonate them!</span>")
+			user.mind.store_memory("<B>Some of [target]'s speech patterns. We should study these to better impersonate [target.p_them()]!</B>")
+			to_chat(user, "<span class='boldnotice'>Some of [target]'s speech patterns. We should study these to better impersonate [target.p_them()]!</span>")
 			for(var/spoken_memory in recent_speech)
 				user.mind.store_memory("\"[spoken_memory]\"")
 				to_chat(user, "<span class='notice'>\"[spoken_memory]\"</span>")

code/game/gamemodes/cult/runes.dm

@@ -787,11 +787,11 @@ var/list/teleport_runes = list()
 			return
 		affecting.apply_damage(1, BRUTE)
 		if(!(user in T.contents))
-			user.visible_message("<span class='warning'>A spectral tendril wraps around [user] and pulls them back to the rune!</span>")
+			user.visible_message("<span class='warning'>A spectral tendril wraps around [user] and pulls [user.p_them()] back to the rune!</span>")
 			Beam(user,icon_state="drainbeam",time=2)
 			user.forceMove(get_turf(src)) //NO ESCAPE :^)
 		if(user.key)
-			user.visible_message("<span class='warning'>[user] slowly relaxes, the glow around them dimming.</span>", \
+			user.visible_message("<span class='warning'>[user] slowly relaxes, the glow around [user.p_them()] dimming.</span>", \
 								 "<span class='danger'>You are re-united with your physical form. [src] releases its hold over you.</span>")
 			user.color = initial(user.color)
 			user.Weaken(3)

code/game/gamemodes/miniantags/abduction/abduction_gear.dm

@@ -176,7 +176,7 @@
 	if(ishuman(target))
 		if(console!=null)
 			console.AddSnapshot(target)
-			to_chat(user, "<span class='notice'>You scan [target] and add them to the database.</span>")
+			to_chat(user, "<span class='notice'>You scan [target] and add [target.p_them()] to the database.</span>")
 
 /obj/item/abductor/gizmo/proc/mark(atom/target, mob/living/user)
 	if(marked == target)

code/game/gamemodes/miniantags/abduction/machinery/experiment.dm

@@ -29,7 +29,7 @@
 		return
 	for(var/mob/living/carbon/slime/M in range(1, target))
 		if(M.Victim == target)
-			to_chat(user, "<span class='danger'>[target] has a slime attached to them, deal with that first.</span>")
+			to_chat(user, "<span class='danger'>[target] has a slime attached to [target.p_them()], deal with that first.</span>")
 			return
 	visible_message("[user] puts [target] into the [src].")
 

code/game/gamemodes/objective.dm

@@ -528,7 +528,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu
 		target = pick(possible_targets)
 
 	if(target && target.current)
-		explanation_text = "The Shoal has a need for [target.current.real_name], the [target.assigned_role]. Take them alive."
+		explanation_text = "The Shoal has a need for [target.current.real_name], the [target.assigned_role]. Take [target.p_them()] alive."
 	else
 		explanation_text = "Free Objective"
 	return target

code/game/gamemodes/shadowling/shadowling_abilities.dm

@@ -798,7 +798,7 @@
 			charge_counter = charge_max
 			return
 
-		to_chat(user, "<span class='shadowling'>You instantly rearrange <b>[target]</b>'s memories, hyptonitizing them into a thrall.</span>")
+		to_chat(user, "<span class='shadowling'>You instantly rearrange <b>[target]</b>'s memories, hyptonitizing [target.p_them()] into a thrall.</span>")
 		to_chat(target, "<span class='userdanger'><font size=3>An agonizing spike of pain drives into your mind, and--</font></span>")
 		ticker.mode.add_thrall(target.mind)
 		target.mind.special_role = SPECIAL_ROLE_SHADOWLING_THRALL

code/game/gamemodes/shadowling/special_shadowling_abilities.dm

@@ -43,7 +43,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
 				var/temp_flags = H.status_flags
 				H.status_flags |= GODMODE //Can't die while hatching
 
-				H.visible_message("<span class='warning'>A chrysalis forms around [H], sealing them inside.</span>", \
+				H.visible_message("<span class='warning'>A chrysalis forms around [H], sealing [H.p_them()] inside.</span>", \
 									"<span class='shadowling'>You create your chrysalis and begin to contort within.</span>")
 
 				sleep(100)
@@ -51,7 +51,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
 									"<span class='shadowling'>Spines pierce your back. Your claws break apart your fingers. You feel excruciating pain as your true form begins its exit.</span>")
 
 				sleep(90)
-				H.visible_message("<span class='warning'><b>[H], skin shifting, begins tearing at the walls around them.</b></span>", \
+				H.visible_message("<span class='warning'><b>[H], skin shifting, begins tearing at the walls around [H.p_them()].</b></span>", \
 								"<span class='shadowling'>Your false skin slips away. You begin tearing at the fragile membrane protecting you.</span>")
 
 				sleep(80)

code/game/gamemodes/traitor/traitor.dm

@@ -346,7 +346,7 @@
 	// Tell them about people they might want to contact.
 	var/mob/living/carbon/human/M = get_nt_opposed()
 	if(M && M != traitor_mob)
-		to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.")
+		to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting [M.p_them()].")
 		traitor_mob.mind.store_memory("<b>Potential Collaborator</b>: [M.real_name]")
 		//let's also inform their contact that they might be called upon, but leave it vague.
 		inform_collab(M)

code/game/gamemodes/wizard/artefact.dm

@@ -318,7 +318,7 @@ var/global/list/multiverse = list()
 		C.prefs.copy_to(M)
 	M.key = C.key
 	M.mind.name = user.real_name
-	to_chat(M, "<B>You are an alternate version of [user.real_name] from another universe! Help them accomplish [user.p_their()] goals at all costs.</B>")
+	to_chat(M, "<B>You are an alternate version of [user.real_name] from another universe! Help [user.p_them()] accomplish [user.p_their()] goals at all costs.</B>")
 	M.faction = list("[user.real_name]")
 	if(duplicate_self)
 		M.set_species(user.get_species()) //duplicate the sword user's species.
@@ -350,7 +350,7 @@ var/global/list/multiverse = list()
 		var/datum/objective/protect/new_objective = new /datum/objective/protect
 		new_objective.owner = M.mind
 		new_objective.target = usr.mind
-		new_objective.explanation_text = "Protect [usr.real_name], your copy, and help them defend the innocent from the mobs of multiverse clones."
+		new_objective.explanation_text = "Protect [usr.real_name], your copy, and help [usr.p_them()] defend the innocent from the mobs of multiverse clones."
 		M.mind.objectives += new_objective
 		to_chat(M, "<B>Objective #[1]</B>: [new_objective.explanation_text]")
 		M.mind.special_role = SPECIAL_ROLE_MULTIVERSE
@@ -652,7 +652,7 @@ var/global/list/multiverse = list()
 		equip_skeleton(M)
 	spooky_scaries |= M
 	to_chat(M, "<span class='userdanger'>You have been revived by </span><B>[user.real_name]!</B>")
-	to_chat(M, "<span class='userdanger'>They are your master now, assist them even if it costs you your new life!</span>")
+	to_chat(M, "<span class='userdanger'>[user.p_theyre(TRUE)] your master now, assist them even if it costs you your new life!</span>")
 	desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]"
 
 /obj/item/necromantic_stone/proc/check_spooky()

code/game/gamemodes/wizard/soulstone.dm

@@ -167,7 +167,7 @@
 				icon_state = "soulstone"
 				name = initial(name)
 				if(iswizard(usr) || usability)
-					to_chat(A, "<b>You have been released from your prison, but you are still bound to [usr.real_name]'s will. Help them succeed in [usr.p_their()] goals at all costs.</b>")
+					to_chat(A, "<b>You have been released from your prison, but you are still bound to [usr.real_name]'s will. Help [usr.p_them()] succeed in [usr.p_their()] goals at all costs.</b>")
 				else if(iscultist(usr))
 					to_chat(A, "<b>You have been released from your prison, but you are still bound to the cult's will. Help [usr.p_them()] succeed in [usr.p_their()] goals at all costs.</b>")
 				was_used()

code/game/machinery/Sleeper.dm

@@ -257,7 +257,7 @@
 		if(href_list["chemical"])
 			if(occupant)
 				if(occupant.stat == DEAD)
-					to_chat(usr, "<span class='danger'>This person has no life for to preserve anymore. Take them to a department capable of reanimating them.</span>")
+					to_chat(usr, "<span class='danger'>This person has no life for to preserve anymore. Take [occupant.p_them()] to a department capable of reanimating them.</span>")
 				else if(occupant.health > min_health || (href_list["chemical"] in emergency_chems))
 					inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"]))
 				else

code/game/machinery/adv_med.dm

@@ -95,7 +95,7 @@
 			return
 		for(var/mob/living/carbon/slime/M in range(1, TYPECAST_YOUR_SHIT.affecting))
 			if(M.Victim == TYPECAST_YOUR_SHIT.affecting)
-				to_chat(user, "<span class='danger'>[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to them, deal with that first.</span>")
+				to_chat(user, "<span class='danger'>[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to [TYPECAST_YOUR_SHIT.affecting.p_them()], deal with that first.</span>")
 				return
 		var/mob/M = TYPECAST_YOUR_SHIT.affecting
 		if(M.abiotic())
@@ -133,7 +133,7 @@
 		return 0
 	for(var/mob/living/carbon/slime/M in range(1, O))
 		if(M.Victim == O)
-			to_chat(user, "<span class='danger'>[O] has a fucking slime attached to them, deal with that first.</span>")
+			to_chat(user, "<span class='danger'>[O] has a fucking slime attached to [O.p_them()], deal with that first.</span>")
 			return 0
 
 	if(O == user)

code/game/machinery/doors/door.dm

@@ -325,7 +325,7 @@
 
 /obj/machinery/door/proc/crush()
 	for(var/mob/living/L in get_turf(src))
-		L.visible_message("<span class='warning'>[src] closes on [L], crushing them!</span>", "<span class='userdanger'>[src] closes on you and crushes you!</span>")
+		L.visible_message("<span class='warning'>[src] closes on [L], crushing [L.p_them()]!</span>", "<span class='userdanger'>[src] closes on you and crushes you!</span>")
 		if(isalien(L))  //For xenos
 			L.adjustBruteLoss(DOOR_CRUSH_DAMAGE * 1.5) //Xenos go into crit after aproximately the same amount of crushes as humans.
 			L.emote("roar")

code/game/objects/effects/spiders.dm

@@ -219,7 +219,7 @@
 						if(C)
 							S.key = C.key
 							if(S.master_commander)
-								to_chat(S, "<span class='biggerdanger'>You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist them in completing [S.master_commander.p_their()] goals at any cost.</span>")
+								to_chat(S, "<span class='biggerdanger'>You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist [S.master_commander.p_them()] in completing [S.master_commander.p_their()] goals at any cost.</span>")
 			qdel(src)
 
 /obj/effect/decal/cleanable/spiderling_remains

code/game/objects/items.dm

@@ -450,7 +450,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 							"<span class='userdanger'>[user] stabs you in the eye with [src]!</span>")
 	else
 		user.visible_message( \
-			"<span class='danger'>[user] has stabbed themself in the eyes with [src]!</span>", \
+			"<span class='danger'>[user] has stabbed [user.p_them()]self in the eyes with [src]!</span>", \
 			"<span class='userdanger'>You stab yourself in the eyes with [src]!</span>" \
 		)
 

code/game/objects/items/devices/flash.dm

@@ -168,9 +168,9 @@
 						resisted = 1
 
 					if(resisted)
-						to_chat(user, "<span class='warning'>This mind seems resistant to the [src.name]!</span>")
+						to_chat(user, "<span class='warning'>This mind seems resistant to the [name]!</span>")
 				else
-					to_chat(user, "<span class='warning'>They must be conscious before you can convert them!</span>")
+					to_chat(user, "<span class='warning'>They must be conscious before you can convert [M.p_them()]!</span>")
 			else
 				to_chat(user, "<span class='warning'>This mind is so vacant that it is not susceptible to influence!</span>")
 

code/game/objects/items/weapons/holy_weapons.dm

@@ -602,7 +602,7 @@
 			faith -= 100
 	else if(target.mind.assigned_role == "Civilian")
 		if(prob(55))	//55% chance to take LESS faith than normal, because civies are stupid and easily manipulated
-			to_chat(missionary, "<span class='notice'>Your message seems to resound well with [target]; converting them was much easier than expected.</span>")
+			to_chat(missionary, "<span class='notice'>Your message seems to resound well with [target]; converting [target.p_them()] was much easier than expected.</span>")
 			faith -= 50
 		else		//45% chance to take the normal 100 faith cost
 			to_chat(missionary, "<span class='notice'>You successfully convert [target] to your cause. The following grows because of your faith!</span>")

code/game/objects/items/weapons/implants/implant_traitor.dm

@@ -55,7 +55,7 @@
 			ticker.mode.implanter[ref] = implanters
 			ticker.mode.traitors += H.mind
 			H.mind.special_role = SPECIAL_ROLE_TRAITOR
-			to_chat(H, "<span class='warning'><B>You're now completely loyal to [user.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost.</span>")
+			to_chat(H, "<span class='warning'><B>You're now completely loyal to [user.name]!</B> You now must lay down your life to protect [user.p_them()] and assist in [user.p_their()] goals at any cost.</span>")
 			var/datum/objective/protect/mindslave/MS = new
 			MS.owner = H.mind
 			MS.target = user.mind

code/game/objects/items/weapons/stunbaton.dm

@@ -104,7 +104,7 @@
 
 /obj/item/melee/baton/attack(mob/M, mob/living/user)
 	if(status && (CLUMSY in user.mutations) && prob(50))
-		user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
+		user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \
 							"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
 		user.Weaken(stunforce*3)
 		deductcharge(hitcost)
@@ -175,7 +175,7 @@
 			user.Weaken(stunforce)
 			user.stuttering = stunforce
 			deductcharge(hitcost)
-			user.visible_message("<span class='warning'>[user] shocks themself while attempting to wash the active [src]!</span>", \
+			user.visible_message("<span class='warning'>[user] shocks [user.p_them()]self while attempting to wash the active [src]!</span>", \
 								"<span class='userdanger'>You unwisely attempt to wash [src] while it's still on.</span>")
 			playsound(src, "sparks", 50, 1)
 			return 1

code/game/objects/items/weapons/tape.dm

@@ -29,7 +29,7 @@
 			if(M == user)
 				to_chat(user, "You cover your own mouth with a piece of duct tape.")
 			else
-				to_chat(user, "You cover [M]'s mouth with a piece of duct tape. That will shut them up!")
+				to_chat(user, "You cover [M]'s mouth with a piece of duct tape. That will shut [M.p_them()] up!")
 				M.visible_message("<span class='warning'>[user] tapes [M]'s mouth shut!</span>")
 			var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag
 			M.equip_to_slot(G, slot_wear_mask)

code/game/objects/items/weapons/teleprod.dm

@@ -10,7 +10,7 @@
 	..()
 	if(status)
 		if((CLUMSY in user.mutations) && prob(50))
-			user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
+			user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \
 								"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
 			user.Weaken(stunforce*3)
 			deductcharge(hitcost)

code/game/objects/items/weapons/tools.dm

@@ -28,7 +28,7 @@
 	toolspeed = 1
 
 /obj/item/wrench/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is beating themselves to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.visible_message("<span class='suicide'>[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
 	return (BRUTELOSS)
 

code/game/objects/items/weapons/weaponry.dm

@@ -28,7 +28,7 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 /obj/item/sord/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is trying to impale themself with [src]! It might be a suicide attempt if it weren't so shitty.</span>", \
+	user.visible_message("<span class='suicide'>[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.</span>", \
 	"<span class='suicide'>You try to impale yourself with [src], but it's USELESS...</span>")
 	return SHAME
 

code/modules/customitems/item_defines.dm

@@ -46,7 +46,7 @@
 	var/mob/living/carbon/human/target = M
 
 	if(istype(target.species, /datum/species/machine))
-		to_chat(user, "<span class= 'notice'>[target] has no skin, how do you expect to tattoo them?</span>")
+		to_chat(user, "<span class= 'notice'>[target] has no skin, how do you expect to tattoo [target.p_them()]?</span>")
 		return
 
 	if(target.m_styles["body"] != "None")

code/modules/food_and_drinks/drinks/drinks/shotglass.dm

@@ -38,7 +38,7 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
 	if(burn_state != ON_FIRE)
 		return
-	user.visible_message("<span class = 'warning'>[user] pours [src] all over themself!</span>", "<span class = 'danger'>You pour [src] all over yourself!</span>", "<span class = 'warning'>You hear a 'whoompf' and a sizzle.</span>")
+	user.visible_message("<span class = 'warning'>[user] pours [src] all over [user.p_them()]self!</span>", "<span class = 'danger'>You pour [src] all over yourself!</span>", "<span class = 'warning'>You hear a 'whoompf' and a sizzle.</span>")
 	extinguish(TRUE)
 	reagents.reaction(user, TOUCH)
 	reagents.clear_reagents()

code/modules/hydroponics/grown/banana.dm

@@ -25,7 +25,7 @@
 	bitesize = 5
 
 /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is aiming the [src.name] at themself! It looks like \he's trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is aiming the [name] at [user.p_them()]self! It looks like \he's trying to commit suicide.</span>")
 	playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
 	sleep(25)
 	if(!user)

code/modules/martial_arts/martial.dm

@@ -236,7 +236,7 @@
 			if(H.staminaloss && !H.sleeping)
 				var/total_health = (H.health - H.staminaloss)
 				if(total_health <= config.health_threshold_crit && !H.stat)
-					H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking them out cold!</span>", \
+					H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!</span>", \
 										   "<span class='userdanger'>[user] knocks you unconscious!</span>")
 					H.SetSleeping(30)
 					H.adjustBrainLoss(25)

code/modules/mining/lavaland/loot/bubblegum_loot.dm

@@ -75,7 +75,7 @@
 		for(var/mob/living/carbon/human/H in player_list)
 			if(H == L)
 				continue
-			to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. They have been marked red! Go kill them!</span>")
+			to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. [L.p_they()] [L.p_have()] been marked red! Go kill [L.p_them()]!</span>")
 			H.put_in_hands(new /obj/item/kitchen/knife/butcher(H))
 
 	qdel(src)

code/modules/mining/lavaland/loot/hierophant_loot.dm

@@ -57,7 +57,7 @@
 		return
 	if(!rune)
 		if(isturf(user.loc))
-			user.visible_message("<span class='hierophant_warning'>[user] holds [src] carefully in front of them, moving it in a strange pattern...</span>", \
+			user.visible_message("<span class='hierophant_warning'>[user] holds [src] carefully in front of [user.p_them()], moving it in a strange pattern...</span>", \
 			"<span class='notice'>You start creating a hierophant rune to teleport to...</span>")
 			timer = world.time + 51
 			if(do_after(user, 50, target = user))
@@ -67,7 +67,7 @@
 				var/obj/effect/hierophant/H = new/obj/effect/hierophant(T)
 				rune = H
 				user.update_action_buttons_icon()
-				user.visible_message("<span class='hierophant_warning'>[user] creates a strange rune beneath them!</span>", \
+				user.visible_message("<span class='hierophant_warning'>[user] creates a strange rune beneath [user.p_them()]!</span>", \
 				"<span class='hierophant'>You create a hierophant rune, which you can teleport yourself and any allies to at any time!</span>\n\
 				<span class='notice'>You can remove the rune to place a new one by striking it with the staff.</span>")
 			else

code/modules/mob/hear_say.dm

@@ -70,7 +70,7 @@
 			if(speaker == src)
 				to_chat(src, "<span class='warning'>You cannot hear yourself speak!</span>")
 			else
-				to_chat(src, "<span class='name'>[speaker_name]</span>[alt_name] talks but you cannot hear them.")
+				to_chat(src, "<span class='name'>[speaker_name]</span>[alt_name] talks but you cannot hear [speaker.p_them()].")
 	else
 		if(language)
 			to_chat(src, "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][language.format_message(message, verb)]</span>")

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

@@ -745,7 +745,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	if(restrained())
 		changeNext_move(CLICK_CD_BREAKOUT)
 		last_special = world.time + CLICK_CD_BREAKOUT
-		visible_message("<span class='warning'>[src] attempts to unbuckle themself!</span>", \
+		visible_message("<span class='warning'>[src] attempts to unbuckle [p_them()]self!</span>", \
 					"<span class='notice'>You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)</span>")
 		if(do_after(src, 600, 0, target = src))
 			if(!buckled)
@@ -762,11 +762,11 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 	Weaken(3, 1, 1) //We dont check for CANWEAKEN, I don't care how immune to weakening you are, if you're rolling on the ground, you're busy.
 	update_canmove()
 	spin(32,2)
-	visible_message("<span class='danger'>[src] rolls on the floor, trying to put themselves out!</span>", \
+	visible_message("<span class='danger'>[src] rolls on the floor, trying to put [p_them()]self out!</span>", \
 		"<span class='notice'>You stop, drop, and roll!</span>")
 	sleep(30)
 	if(fire_stacks <= 0)
-		visible_message("<span class='danger'>[src] has successfully extinguished themselves!</span>", \
+		visible_message("<span class='danger'>[src] has successfully extinguished [p_them()]self!</span>", \
 			"<span class='notice'>You extinguish yourself.</span>")
 		ExtinguishMob()
 

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

@@ -469,7 +469,7 @@
 				if(!Adjacent(SF))
 					tryWalk(get_turf(SF))
 				else
-					custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")], grabbing various foodstuffs from [SF] and sticking them in it's mouth!")
+					custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")], grabbing various foodstuffs from [SF] and sticking them in its mouth!")
 					for(var/obj/item/A in SF.contents)
 						if(prob(smartness/2))
 							var/count = SF.item_quants[A.name]

code/modules/mob/living/silicon/pai/pai.dm

@@ -599,7 +599,7 @@
 	var/mob/living/carbon/human/H = over_object //changed to human to avoid stupid issues like xenos holding pAIs.
 	if(!istype(H) || !Adjacent(H))  return ..()
 	if(usr == src)
-		switch(alert(H, "[src] wants you to pick them up. Do it?",,"Yes","No"))
+		switch(alert(H, "[src] wants you to pick [p_them()] up. Do it?",,"Yes","No"))
 			if("Yes")
 				if(Adjacent(H))
 					get_scooped(H)

code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm

@@ -229,7 +229,7 @@ Difficulty: Medium
 	playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1)
 	for(var/mob/living/L in orange(1, src))
 		if(L.stat)
-			visible_message("<span class='warning'>[src] slams down on [L], crushing them!</span>")
+			visible_message("<span class='warning'>[src] slams down on [L], crushing [L.p_them()]!</span>")
 			L.gib()
 		else
 			L.adjustBruteLoss(75)

code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm

@@ -43,7 +43,7 @@
 
 /mob/living/simple_animal/hostile/poison/terror_spider/prince/spider_specialattack(mob/living/carbon/human/L)
 	if(prob(15))
-		visible_message("<span class='danger'>[src] rams into [L], knocking them to the floor!</span>")
+		visible_message("<span class='danger'>[src] rams into [L], knocking [L.p_them()] to the floor!</span>")
 		L.Weaken(5)
 		L.Stun(5)
 	else

code/modules/paperwork/paper.dm

@@ -379,7 +379,7 @@
 
 	if(is_hot(P))
 		if((CLUMSY in user.mutations) && prob(10))
-			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
+			user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
 								"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
 			user.unEquip(P)
 			user.adjust_fire_stacks(1)

code/modules/paperwork/paperplane.dm

@@ -73,7 +73,7 @@
 
 	else if(is_hot(P))
 		if(user.disabilities & CLUMSY && prob(10))
-			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
+			user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
 				"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
 			user.unEquip(P)
 			user.adjust_fire_stacks(1)

code/modules/projectiles/projectile/magic.dm

@@ -32,7 +32,7 @@
 		else
 			G.death()
 
-		visible_message("<span class='danger'>[G] topples backwards as the death bolt impacts them!</span>")
+		visible_message("<span class='danger'>[G] topples backwards as the death bolt impacts [G.p_them()]!</span>")
 
 /obj/item/projectile/magic/fireball/Range()
 	var/turf/T1 = get_step(src,turn(dir, -45))

code/modules/reagents/chemistry/reagents/toxins.dm

@@ -557,7 +557,7 @@
 		M.adjustBruteLoss(5)
 		M.Weaken(5)
 		M.AdjustJitter(6)
-		M.visible_message("<span class='danger'>[M] falls to the floor, scratching themselves violently!</span>")
+		M.visible_message("<span class='danger'>[M] falls to the floor, scratching [M.p_them()]self violently!</span>")
 		M.emote("scream")
 	..()