diff --git a/code/game/gamemodes/changeling/powers/linglink.dm b/code/game/gamemodes/changeling/powers/linglink.dm
index 4b59c255128..52de921d7ec 100644
--- a/code/game/gamemodes/changeling/powers/linglink.dm
+++ b/code/game/gamemodes/changeling/powers/linglink.dm
@@ -47,7 +47,7 @@
to_chat(user, "We stealthily stab [target] with a minor proboscis...")
to_chat(target, "You experience a stabbing sensation and your ears begin to ring...")
if(3)
- to_chat(user, "You mold the [target]'s mind like clay, they can now speak in the hivemind!")
+ to_chat(user, "You mold the [target]'s mind like clay, [target.p_they()] can now speak in the hivemind!")
to_chat(target, "A migraine throbs behind your eyes, you hear yourself screaming - but your mouth has not opened!")
for(var/mob/M in mob_list)
if(all_languages["Changeling"] in M.languages)
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 5e98bcf1338..f2e8db26b40 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -203,7 +203,7 @@ var/global/list/all_cults = list()
update_cult_icons_removed(cult_mind)
if(show_message)
for(var/mob/M in viewers(cult_mind.current))
- to_chat(M, "[cult_mind.current] looks like they just reverted to [cult_mind.current.p_their()] old faith!")
+ to_chat(M, "[cult_mind.current] looks like [cult_mind.current.p_they()] just reverted to [cult_mind.current.p_their()] old faith!")
/datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind)
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 338013e425a..089cad71a3a 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -279,7 +279,7 @@
to_chat(M, "The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.")
else
- to_chat(M, "[rev_mind.current] looks like they just remembered [rev_mind.current.p_their()] real allegiance!")
+ to_chat(M, "[rev_mind.current] looks like [rev_mind.current.p_they()] just remembered [rev_mind.current.p_their()] real allegiance!")
/////////////////////////////////////
//Adds the rev hud to a new convert//
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index 15f6371bd05..499382cb447 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -346,7 +346,7 @@
ticker.mode.vampire_enthralled[H.mind] = user.mind
H.mind.special_role = SPECIAL_ROLE_VAMPIRE_THRALL
to_chat(H, "You have been Enthralled by [user]. Follow [user.p_their()] every command.")
- to_chat(user, "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp.")
+ to_chat(user, "You have successfully Enthralled [H]. If [H.p_they()] refuse to do as you say just adminhelp.")
add_attack_logs(user, H, "Vampire-thralled")
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index a6956d8749b..1e997cc6a59 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -497,7 +497,7 @@
return
for(var/mob/living/carbon/slime/M in range(1,L))
if(M.Victim == L)
- to_chat(usr, "[L.name] will not fit into the sleeper because they have a slime latched onto their head.")
+ to_chat(usr, "[L.name] will not fit into the sleeper because [L.p_they()] [L.p_have()] a slime latched onto their head.")
return
if(L == user)
visible_message("[user] starts climbing into the sleeper.")
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 1e207e3bdde..eebae34b9ea 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -814,7 +814,7 @@
if(ORION_TRAIL_SPACEPORT)
if(spaceport_raided)
- eventdat += "The Spaceport is on high alert! they wont let you dock since you tried to attack them!"
+ eventdat += "The Spaceport is on high alert! They wont let you dock since you tried to attack them!"
if(last_spaceport_action)
eventdat += "
Last Spaceport Action: [last_spaceport_action]"
eventdat += "Depart Spaceport
"
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 501f510348b..0d49cc1b0cd 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -647,7 +647,7 @@ About the new airlock wires panel:
if(affecting.receive_damage(10, 0))
H.UpdateDamageIcon()
else
- visible_message("[user] headbutts the airlock. Good thing they're wearing a helmet.")
+ visible_message("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.")
return
if(panel_open)
diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm
index f6ecd511b2b..6c10129c6ea 100644
--- a/code/game/machinery/poolcontroller.dm
+++ b/code/game/machinery/poolcontroller.dm
@@ -107,7 +107,7 @@
else
drownee.AdjustLoseBreath(2, bound_lower = 0, bound_upper = 20) //For every time you drown, you miss 2 breath attempts. Hope you catch on quick!
if(prob(35)) //35% chance to tell them what is going on. They should probably figure it out before then.
- drownee.visible_message("\The [drownee] flails, almost like they are drowning!","You're lacking air!") //*gasp* *gasp* *gasp* *gasp* *gasp*
+ drownee.visible_message("\The [drownee] flails, almost like [drownee.p_they()] [drownee.p_are()] drowning!","You're lacking air!") //*gasp* *gasp* *gasp* *gasp* *gasp*
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index b321721b639..4e7ef1b6570 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -229,8 +229,8 @@
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/toy/katana/suicide_act(mob/user)
- var/dmsg = pick("[user] tries to stab \the [src] into their abdomen, but it shatters! They look as if they might die from the shame.","[user] tries to stab \the [src] into their abdomen, but \the [src] bends and breaks in half! They look as if they might die from the shame.","[user] tries to slice their own throat, but the plastic blade has no sharpness, causing them to lose their balance, slip over, and break their neck with a loud snap!")
- user.visible_message("[dmsg] It looks like they are trying to commit suicide.")
+ var/dmsg = pick("[user] tries to stab \the [src] into [user.p_their()] abdomen, but it shatters! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.","[user] tries to stab \the [src] into [user.p_their()] abdomen, but \the [src] bends and breaks in half! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.","[user] tries to slice [user.p_their()] own throat, but the plastic blade has no sharpness, causing [user.p_them()] to lose [user.p_their()] balance, slip over, and break [user.p_their()] neck with a loud snap!")
+ user.visible_message("[dmsg] It looks like [user.p_theyre()] trying to commit suicide.")
return (BRUTELOSS)
@@ -1367,7 +1367,7 @@ obj/item/toy/cards/deck/syndicate/black
var/bullet_position = 1
/obj/item/toy/russian_revolver/suicide_act(mob/user)
- user.visible_message("[user] quickly loads six bullets into [src]'s cylinder and points it at \his head before pulling the trigger! It looks like they are trying to commit suicide.")
+ user.visible_message("[user] quickly loads six bullets into [src]'s cylinder and points it at \his head before pulling the trigger! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/weapons/Gunshot.ogg', 50, 1)
return (BRUTELOSS)
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 9a55bb8e562..deea4572f93 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -54,7 +54,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(istype(M) && M.on_fire)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(M)
- light("[user] coldly lights the [name] with the burning body of [M]. Clearly, they offer the warmest of regards...")
+ light("[user] coldly lights the [name] with the burning body of [M]. Clearly, [user.p_they()] offer the warmest of regards...")
return 1
else
return ..()
@@ -73,31 +73,31 @@ LIGHTERS ARE IN LIGHTERS.DM
else if(istype(W, /obj/item/lighter/zippo))
var/obj/item/lighter/zippo/Z = W
if(Z.lit)
- light("With a single flick of their wrist, [user] smoothly lights their [name] with their [W]. Damn they're cool.")
+ light("With a single flick of [user.p_their()] wrist, [user] smoothly lights [user.p_their()] [name] with [user.p_their()] [W]. Damn [user.p_theyre()] cool.")
else if(istype(W, /obj/item/lighter))
var/obj/item/lighter/L = W
if(L.lit)
- light("After some fiddling, [user] manages to light their [name] with [W].")
+ light("After some fiddling, [user] manages to light [user.p_their()] [name] with [W].")
else if(istype(W, /obj/item/match))
var/obj/item/match/M = W
if(M.lit == 1)
- light("[user] lights their [name] with their [W].")
+ light("[user] lights [user.p_their()] [name] with [user.p_their()] [W].")
else if(istype(W, /obj/item/melee/energy/sword/saber))
var/obj/item/melee/energy/sword/saber/S = W
if(S.active)
- light("[user] swings their [W], barely missing their nose. They light their [name] in the process.")
+ light("[user] swings their [W], barely missing their nose. [user.p_they(TRUE)] light [user.p_their()] [name] in the process.")
else if(istype(W, /obj/item/assembly/igniter))
- light("[user] fiddles with [W], and manages to light their [name].")
+ light("[user] fiddles with [W], and manages to light [user.p_their()] [name].")
else if(istype(W, /obj/item/gun/magic/wand/fireball))
var/obj/item/gun/magic/wand/fireball/F = W
if(F.charges)
if(prob(50) || user.mind.assigned_role == "Wizard")
- light("Holy shit, did [user] just manage to light their [name] with [W], with only moderate eyebrow singing?")
+ light("Holy shit, did [user] just manage to light [user.p_their()] [name] with [W], with only moderate eyebrow singing?")
else
to_chat(user, "Unsure which end of the wand is which, [user] fails to light [name] with [W].")
explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index cd1d79ae683..2ec73794e9b 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -25,7 +25,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(NO_DNA in H.species.species_traits)
- to_chat(user, "You failed to inject [M], as they have no DNA to scramble, nor flesh to inject.")
+ to_chat(user, "You failed to inject [M], as [M.p_they()] [M.p_have()] no DNA to scramble, nor flesh to inject.")
return
if(M == user)
diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm
index 7893a7898b8..264cb9c7507 100644
--- a/code/game/objects/items/weapons/garrote.dm
+++ b/code/game/objects/items/weapons/garrote.dm
@@ -75,7 +75,7 @@
return
if(improvised && ((M.head && (M.head.flags_cover & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags_cover & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items.
- to_chat(user, "[M]'s neck is blocked by something they're wearing!")
+ to_chat(user, "[M]'s neck is blocked by something [M.p_theyre()] wearing!")
if(strangling)
to_chat(user, "You cannot use [src] on two people at once!")
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index a1878ae79d5..6701fa87755 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -575,7 +575,7 @@
if(missionary in viewers(target)) //missionary must maintain line of sight to target, but the target doesn't necessary need to be able to see the missionary
do_convert(target, missionary)
else
- to_chat(missionary, "You lost sight of the target before they could be converted!")
+ to_chat(missionary, "You lost sight of the target before [target.p_they()] could be converted!")
faith -= 25 //they escaped, so you only lost a little faith (to prevent spamming)
else //the do_after failed, probably because you moved or dropped the staff
to_chat(missionary, "Your concentration was broken!")
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index a620f3fdb5c..50cb9226dcf 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -57,7 +57,7 @@
if(affecting.receive_damage( 0, 5 )) //INFERNO
H.UpdateDamageIcon()
H.updatehealth()
- user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.")
+ user.visible_message("After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.")
set_light(2)
processing_objects.Add(src)
@@ -70,7 +70,7 @@
force = 0
attack_verb = null //human_defense.dm takes care of it
if(istype(src, /obj/item/lighter/zippo) )
- user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.")
+ user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.")
playsound(src.loc, 'sound/items/ZippoClose.ogg', 25, 1)
else
user.visible_message("[user] quietly shuts off the [src].")
@@ -95,7 +95,7 @@
cig.attackby(src, user)
else
if(istype(src, /obj/item/lighter/zippo))
- cig.light("[user] whips the [name] out and holds it for [M]. Their arm is as steady as the unflickering flame they light \the [cig] with.")
+ cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their()] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.")
else
cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
M.update_inv_wear_mask()
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 44cfc648757..eabaf6950b7 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -28,7 +28,7 @@
toolspeed = 1
/obj/item/wrench/suicide_act(mob/user)
- user.visible_message("[user] is beating themselves to death with [src]! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is beating themselves to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
return (BRUTELOSS)
@@ -73,7 +73,7 @@
user.put_in_active_hand(s_drill)
/obj/item/wrench/power/suicide_act(mob/user)
- user.visible_message("[user] is pressing [src] against their head! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is pressing [src] against their head! It looks like [user.p_theyre()] trying to commit suicide!")
return (BRUTELOSS)
/obj/item/wrench/medical
@@ -86,7 +86,7 @@
attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")
/obj/item/wrench/medical/suicide_act(mob/user)
- user.visible_message("[user] is praying to the medical wrench to take their soul. It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is praying to the medical wrench to take their soul. It looks like [user.p_theyre()] trying to commit suicide!")
// TODO Make them glow with the power of the M E D I C A L W R E N C H
// during their ascension
@@ -139,7 +139,7 @@
toolspeed = 0.5
/obj/item/screwdriver/suicide_act(mob/user)
- user.visible_message("[user] is stabbing [src] into their [pick("temple", "heart")]! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is stabbing [src] into their [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!")
return(BRUTELOSS)
/obj/item/screwdriver/New(loc, var/param_color = null)
@@ -192,7 +192,7 @@
toolspeed = 0.25
/obj/item/screwdriver/power/suicide_act(mob/user)
- user.visible_message("[user] is putting [src] to their temple. It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is putting [src] to their temple. It looks like [user.p_theyre()] trying to commit suicide!")
return(BRUTELOSS)
/obj/item/screwdriver/power/attack_self(mob/user)
@@ -247,7 +247,7 @@
..()
/obj/item/wirecutters/suicide_act(mob/user)
- user.visible_message("[user] is cutting at their arteries with [src]! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is cutting at their arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, usesound, 50, 1, -1)
return (BRUTELOSS)
@@ -338,7 +338,7 @@
to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
/obj/item/weldingtool/suicide_act(mob/user)
- user.visible_message("[user] welds their every orifice closed! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] welds their every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!")
return (FIRELOSS)
/obj/item/weldingtool/proc/update_torch()
@@ -699,7 +699,7 @@ obj/item/weldingtool/experimental/process()
var/airlock_open_time = 100 // Time required to open powered airlocks
/obj/item/crowbar/power/suicide_act(mob/user)
- user.visible_message("[user] is putting their head in [src], it looks like they're trying to commit suicide!")
+ user.visible_message("[user] is putting their head in [src]. It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1)
return (BRUTELOSS)
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 0de1a09a74c..3c4875978a2 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -203,7 +203,7 @@
return FALSE
if(!ishuman(M))
- to_chat(usr, "It doesn't look like they can fit into this properly!")
+ to_chat(usr, "It doesn't look like [M.p_they()] can fit into this properly!")
return FALSE // Can't decapitate non-humans
if(blade_status != GUILLOTINE_BLADE_RAISED)
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index b9a51a661d1..0f9783d949a 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -84,7 +84,7 @@
do_suicide(damagetype, held_item)
return
- to_chat(viewers(src), "[src] [pick(species.suicide_messages)] It looks like they're trying to commit suicide.")
+ to_chat(viewers(src), "[src] [pick(species.suicide_messages)] It looks like [src.p_theyre()] trying to commit suicide.")
do_suicide(0)
updatehealth()
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index eceb97044c0..1bd231ba5a9 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1622,14 +1622,14 @@
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand )
if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
- message_admins("[key_name_admin(H)] has their hands full, so they did not receive their cookie, spawned by [key_name_admin(src.owner)].")
+ message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].")
return
else
H.update_inv_r_hand()//To ensure the icon appears in the HUD
else
H.update_inv_l_hand()
log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]")
- message_admins("[key_name_admin(H)] got their cookie, spawned by [key_name_admin(src.owner)]")
+ message_admins("[key_name_admin(H)] got [H.p_their()] cookie, spawned by [key_name_admin(src.owner)]")
feedback_inc("admin_cookies_spawned",1)
to_chat(H, "Your prayers have been answered!! You received the best cookie!")
@@ -1683,7 +1683,7 @@
to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcomm", "")
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from Centcomm", "")
if(!input) return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -2045,7 +2045,7 @@
if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from The Syndicate", "")
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from The Syndicate", "")
if(!input)
return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -2061,7 +2061,7 @@
to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from HONKplanet", "")
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from HONKplanet", "")
if(!input) return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -3425,7 +3425,7 @@
to_chat(hunter_mob, "ATTENTION: You are now on a mission!")
to_chat(hunter_mob, "Goal: [killthem ? "MURDER" : "PROTECT"] [H.real_name], currently in [get_area(H.loc)]. ");
if(killthem)
- to_chat(hunter_mob, "If you kill them, they cannot be revived.");
+ to_chat(hunter_mob, "If you kill [H.p_them()], [H.p_they()] cannot be revived.");
hunter_mob.mind.special_role = SPECIAL_ROLE_TRAITOR
var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR]
tatorhud.join_hud(hunter_mob)
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 36065efa298..902fd16aa99 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -34,7 +34,7 @@
sleep(25)
if(!user)
return (OXYLOSS)
- user.visible_message("[user] laughs so hard they begin to suffocate!")
+ user.visible_message("[user] laughs so hard [user.p_they()] begin[user.p_s()] to suffocate!")
return (OXYLOSS)
/obj/item/grown/bananapeel
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index df1753e1dd7..106c6e23667 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -210,7 +210,7 @@
return ..()
var/mob/living/carbon/C = target
if(C.stat)
- to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.")
+ to_chat(user, "It would be dishonorable to attack a foe while [C.p_they()] cannot retaliate.")
return
switch(user.a_intent)
if(INTENT_DISARM)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a1e4b555412..508dffd16a0 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -256,8 +256,8 @@
H.play_xylophone()
else
if(player_logged)
- M.visible_message("[M] shakes [src], but they do not respond. Probably suffering from SSD.", \
- "You shake [src], but they are unresponsive. Probably suffering from SSD.")
+ M.visible_message("[M] shakes [src], but [src.p_they()] [src.p_do()] not respond. Probably suffering from SSD.", \
+ "You shake [src], but [src.p_theyre()] unresponsive. Probably suffering from SSD.")
if(lying) // /vg/: For hugs. This is how update_icon figgers it out, anyway. - N3X15
var/t_him = "it"
if(gender == MALE)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 6b76c5675f5..1da73d02c23 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -306,7 +306,7 @@
if(!prob(martial_art.deflection_chance))
return ..()
if(!src.lying && !(HULK in mutations)) //But only if they're not lying down, and hulks can't do it
- visible_message("[src] deflects the projectile; they can't be hit with ranged weapons!", "You deflect the projectile!")
+ visible_message("[src] deflects the projectile; [src.p_they()] can't be hit with ranged weapons!", "You deflect the projectile!")
return 0
..()
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 428fafeb71e..0c75457638a 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -90,7 +90,7 @@
continue
var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
- custom_emote(1, "[(NO_PAIN in species.species_traits) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
+ custom_emote(1, "[(NO_PAIN in species.species_traits) ? "" : emote_scream ]drops what [p_they()] [p_were()] holding in [p_their()] [E.name]!")
else if(E.is_malfunctioning())
@@ -105,7 +105,7 @@
if(!unEquip(r_hand))
continue
- custom_emote(1, "drops what they were holding, their [E.name] malfunctioning!")
+ custom_emote(1, "drops what [p_they()] [p_were()] holding, their [E.name] malfunctioning!")
var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm
index eae754b5283..8399a280dfc 100644
--- a/code/modules/mob/living/carbon/human/interactive/functions.dm
+++ b/code/modules/mob/living/carbon/human/interactive/functions.dm
@@ -631,7 +631,7 @@
TARGET = newSnack
newSnack.reagents.remove_any((newSnack.reagents.total_volume/2)-1)
newSnack.name = "Synthetic [newSnack.name]"
- custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as they vomit [newSnack] from their mouth!")
+ custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as [p_they()] vomit[p_s()] [newSnack] from [p_their] mouth!")
catch(var/exception/e)
log_runtime(e, src, "Caught in SNPC cooking module")
doing &= ~SNPC_SPECIAL
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
index 06b28c6400e..43c0e7b0be5 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
@@ -33,7 +33,7 @@
if(W)
melee_damage_lower = initial(melee_damage_lower) * 2
melee_damage_upper = initial(melee_damage_upper) * 2
- visible_message("[src] savagely mauls [target] while they are stuck in the web!")
+ visible_message("[src] savagely mauls [target] while [L.p_theyre()] stuck in the web!")
else
melee_damage_lower = initial(melee_damage_lower)
melee_damage_upper = initial(melee_damage_upper)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index ee884bc20a4..f7976645bc4 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -190,7 +190,7 @@
if(cameranet.checkTurfVis(remote_eye.loc))
for(var/mob/living/carbon/human/M in remote_eye.loc)
if(issmall(M) && M.stat)
- M.visible_message("[M] vanishes as they are reclaimed for recycling!")
+ M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!")
X.monkeys = round(X.monkeys + 0.2,0.1)
qdel(M)
else