diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index c4674c64f90..d709aaad93c 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1549,7 +1549,7 @@
ticker.mode.implanter[ref] = implanters
ticker.mode.traitors += src
special_role = "traitor"
- to_chat(current, "You're now a loyal zealot of [missionary.name]! You now must lay down your life to protect them and assist in their goals at any cost.")
+ to_chat(current, "You're now a loyal zealot of [missionary.name]! You now must lay down your life to protect [missionary.p_them()] and assist in [missionary.p_their()] goals at any cost.")
var/datum/objective/protect/mindslave/MS = new
MS.owner = src
MS.target = missionary.mind
diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm
index 2a8408dfe4a..43ca8590af3 100644
--- a/code/datums/spells/mind_transfer.dm
+++ b/code/datums/spells/mind_transfer.dm
@@ -32,7 +32,7 @@ Also, you never added distance checking after target is selected. I've went ahea
return
if(!target.key || !target.mind)
- to_chat(user, "They appear to be catatonic. Not even magic can affect their vacant mind.")
+ to_chat(user, "[target.p_they(TRUE)] appear to be catatonic. Not even magic can affect [target.p_their()] vacant mind.")
return
if(user.suiciding)
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 99355320491..d119a94fac1 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -192,7 +192,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 [src] because they have a slime latched onto their head.")
+ to_chat(usr, "[L.name] will not fit into the [src] because [L.p_they()] have a slime latched onto [L.p_their()] head.")
return
if(L == user)
visible_message("[user] climbs into the [src].")
diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm
index 6fbc30883ca..8517016e1a9 100644
--- a/code/game/dna/genes/goon_powers.dm
+++ b/code/game/dna/genes/goon_powers.dm
@@ -318,14 +318,6 @@
var/atom/movable/the_item = targets[1]
if(ishuman(the_item))
- //My gender
- var/m_his = "his"
- if(user.gender == FEMALE)
- m_his = "her"
- // Their gender
- var/t_his = "his"
- if(the_item.gender == FEMALE)
- t_his = "her"
var/mob/living/carbon/human/H = the_item
var/obj/item/organ/external/limb = H.get_organ(user.zone_sel.selecting)
if(!istype(limb))
@@ -334,15 +326,15 @@
return 0
if(istype(limb,/obj/item/organ/external/head))
// Bullshit, but prevents being unable to clone someone.
- to_chat(user, "You try to put \the [limb] in your mouth, but [t_his] ears tickle your throat!")
+ to_chat(user, "You try to put \the [limb] in your mouth, but [the_item.p_their()] ears tickle your throat!")
revert_cast()
return 0
if(istype(limb,/obj/item/organ/external/chest))
// Bullshit, but prevents being able to instagib someone.
- to_chat(user, "You try to put their [limb] in your mouth, but it's too big to fit!")
+ to_chat(user, "You try to put [the_item.p_their()] [limb] in your mouth, but it's too big to fit!")
revert_cast()
return 0
- user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [m_his] gaping maw!")
+ user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [user.p_their()] gaping maw!")
var/oldloc = H.loc
if(!do_mob(user,H,EAT_MOB_DELAY))
to_chat(user, "You were interrupted before you could eat [the_item]!")
@@ -434,7 +426,7 @@
user.flying = prevFlying
if(FAT in user.mutations && prob(66))
- user.visible_message("[user.name] crashes due to their heavy weight!")
+ user.visible_message("[user.name] crashes due to [user.p_their()] heavy weight!")
//playsound(user.loc, 'zhit.wav', 50, 1)
user.AdjustWeakened(10)
user.AdjustStunned(5)
@@ -559,10 +551,10 @@
return
if(M.stat == 2)
- to_chat(user, "[M.name] is dead and cannot have their mind read.")
+ to_chat(user, "[M.name] is dead and cannot have [M.p_their()] mind read.")
return
if(M.health < 0)
- to_chat(user, "[M.name] is dying, and their thoughts are too scrambled to read.")
+ to_chat(user, "[M.name] is dying, and [M.p_their()] thoughts are too scrambled to read.")
return
to_chat(user, "Mind Reading of [M.name]:")
@@ -570,8 +562,8 @@
var/pain_condition = M.health / M.maxHealth
// lower health means more pain
var/list/randomthoughts = list("what to have for lunch","the future","the past","money",
- "their hair","what to do next","their job","space","amusing things","sad things",
- "annoying things","happy things","something incoherent","something they did wrong")
+ "[M.p_their()] hair","what to do next","[M.p_their()] job","space","amusing things","sad things",
+ "annoying things","happy things","something incoherent","something [M.p_they()] did wrong")
var/thoughts = "thinking about [pick(randomthoughts)]"
if(M.fire_stacks)
@@ -592,7 +584,7 @@
to_chat(user, "Condition: [M.name] is suffering severe pain.")
else
to_chat(user, "Condition: [M.name] is suffering excruciating pain.")
- thoughts = "haunted by their own mortality"
+ thoughts = "haunted by [M.p_their()] own mortality"
switch(M.a_intent)
if(INTENT_HELP)
@@ -655,7 +647,7 @@
action_icon_state = "superfart"
/obj/effect/proc_holder/spell/aoe_turf/superfart/invocation(mob/user = usr)
- invocation = "[user] hunches down and grits their teeth!"
+ invocation = "[user] hunches down and grits [user.p_their()] teeth!"
invocation_emote_self = "You hunch down and grit your teeth!"
..(user)
diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm
index 99eb634a2ff..9015677c70e 100644
--- a/code/game/gamemodes/changeling/powers/swap_form.dm
+++ b/code/game/gamemodes/changeling/powers/swap_form.dm
@@ -36,7 +36,7 @@
to_chat(user, "The body swap has been interrupted!")
return
- to_chat(target, "[user] tightens their grip as a painful sensation invades your body.")
+ to_chat(target, "[user] tightens [user.p_their()] grip as a painful sensation invades your body.")
changeling.absorbed_dna -= changeling.find_dna(user.dna)
changeling.protected_dna -= changeling.find_dna(user.dna)
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index b12a50bce13..5e98bcf1338 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 their old faith!")
+ to_chat(M, "[cult_mind.current] looks like 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/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index 00bf335c576..11ec158db84 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -325,7 +325,7 @@
to_chat(src, "You cannot infest someone who is already infested!")
return
- to_chat(src, "You slither up [M] and begin probing at their ear canal...")
+ to_chat(src, "You slither up [M] and begin probing at [M.p_their()] ear canal...")
if(!do_after(src, 50, target = M))
to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.")
@@ -500,7 +500,7 @@
to_chat(src, "You cannot dominate someone who is already infested!")
return
- to_chat(src, "You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.")
+ to_chat(src, "You focus your psychic lance on [M] and freeze [M.p_their()] limbs with a wave of terrible dread.")
to_chat(M, "You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.")
M.Weaken(3)
@@ -531,7 +531,7 @@
to_chat(src, "You decide against leaving your host.")
return
- to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal.")
+ to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at [host.p_their()] internal ear canal.")
leaving = TRUE
@@ -623,7 +623,7 @@
to_chat(src,"You are feeling far too docile to do that.")
return
else
- to_chat(src, "You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.")
+ to_chat(src, "You plunge your probosci deep into the cortex of the host brain, interfacing directly with [host.p_their()] nervous system.")
to_chat(host, "You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.")
var/borer_key = src.key
add_attack_logs(src, host, "Assumed control of (borer)")
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index aeb26f58822..6b5705cfa7f 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -149,7 +149,7 @@
if(!A)
to_chat(usr, "You could not locate any sapient heretics for the Slaughter.")
return 0
- to_chat(usr, "You sense a terrified soul at [A]. Show them the error of their ways.")
+ to_chat(usr, "You sense a terrified soul at [A]. Show [A.p_them()] the error of [A.p_their()] ways.")
/mob/living/simple_animal/slaughter/cult/New()
..()
@@ -241,7 +241,7 @@
return // Just so people don't accidentally waste it
/obj/item/organ/internal/heart/demon/attack_self(mob/living/user)
- user.visible_message("[user] raises [src] to their mouth and tears into it with their teeth!", \
+ user.visible_message("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!", \
"An unnatural hunger consumes you. You raise [src] to your mouth and devour it!")
playsound(user, 'sound/misc/Demon_consume.ogg', 50, 1)
for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 4f500825065..338013e425a 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 their real allegiance!")
+ to_chat(M, "[rev_mind.current] looks like they just remembered [rev_mind.current.p_their()] real allegiance!")
/////////////////////////////////////
//Adds the rev hud to a new convert//
diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm
index 06f7bc9440c..f9950dcbac9 100644
--- a/code/game/gamemodes/shadowling/shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm
@@ -40,9 +40,9 @@
return
var/mob/living/carbon/human/M = target
user.visible_message("[user]'s eyes flash a blinding red!")
- target.visible_message("[target] freezes in place, their eyes glazing over...")
+ target.visible_message("[target] freezes in place, [target.p_their()] eyes glazing over...")
if(in_range(target, user))
- to_chat(target, "Your gaze is forcibly drawn into [user]'s eyes, and you are mesmerized by their heavenly beauty...")
+ to_chat(target, "Your gaze is forcibly drawn into [user]'s eyes, and you are mesmerized by [user.p_their()] heavenly beauty...")
else //Only alludes to the shadowling if the target is close by
to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights...")
target.Stun(10)
@@ -306,7 +306,7 @@
switch(progress)
if(1)
to_chat(user, "You place your hands to [target]'s head...")
- user.visible_message("[user] places their hands onto the sides of [target]'s head!")
+ user.visible_message("[user] places [user.p_their()] hands onto the sides of [target]'s head!")
if(2)
to_chat(user, "You begin preparing [target]'s mind as a blank slate...")
user.visible_message("[user]'s palms flare a bright red against [target]'s temples!")
@@ -315,7 +315,7 @@
sleep(20)
if(ismindshielded(target))
to_chat(user, "They have a mindshield implant. You begin to deactivate it - this will take some time.")
- user.visible_message("[user] pauses, then dips their head in concentration!")
+ user.visible_message("[user] pauses, then dips [user.p_their()] head in concentration!")
to_chat(target, "Your mindshield implant becomes hot as it comes under attack!")
sleep(100) //10 seconds - not spawn() so the enthralling takes longer
to_chat(user, "The nanobots composing the mindshield implant have been rendered inert. Now to continue.")
@@ -361,7 +361,7 @@
if(!istype(target) || !ishuman(target))
return
var/mob/living/carbon/human/H = target
- H.visible_message("[H]'s skin suddenly bubbles and shifts around their body!", \
+ H.visible_message("[H]'s skin suddenly bubbles and shifts around [H.p_their()] body!", \
"You regenerate your protective armor and cleanse your form of defects.")
H.adjustCloneLoss(-target.getCloneLoss())
H.equip_to_slot_or_del(new /obj/item/clothing/under/shadowling(H), slot_w_uniform)
@@ -493,7 +493,7 @@
to_chat(M, "You breathe in the black smoke, and your eyes burn horribly!")
M.EyeBlind(5)
if(prob(25))
- M.visible_message("[M] claws at their eyes!")
+ M.visible_message("[M] claws at [M.p_their()] eyes!")
M.Stun(3)
else
to_chat(M, "You breathe in the black smoke, and you feel revitalized!")
@@ -627,9 +627,9 @@
to_chat(user, "You cannot spare this much energy. There are too many empowered thralls.")
charge_counter = charge_max
return
- user.visible_message("[user] places their hands over [thrallToRevive]'s face, red light shining from beneath.", \
+ user.visible_message("[user] places [user.p_their()] hands over [thrallToRevive]'s face, red light shining from beneath.", \
"You place your hands on [thrallToRevive]'s face and begin gathering energy...")
- to_chat(thrallToRevive, "[user] places their hands over your face. You feel energy gathering. Stand still...")
+ to_chat(thrallToRevive, "[user] places [user.p_their()] hands over your face. You feel energy gathering. Stand still...")
if(!do_mob(user, thrallToRevive, 80))
to_chat(user, "Your concentration snaps. The flow of energy ebbs.")
charge_counter = charge_max
@@ -640,7 +640,7 @@
playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1)
user.Beam(thrallToRevive,icon_state="red_lightning",icon='icons/effects/effects.dmi',time=1)
thrallToRevive.Weaken(5)
- thrallToRevive.visible_message("[thrallToRevive] collapses, their skin and face distorting!", \
+ thrallToRevive.visible_message("[thrallToRevive] collapses, [thrallToRevive.p_their()] skin and face distorting!", \
"AAAAAAAAAAAAAAAAAAAGH-")
sleep(20)
thrallToRevive.visible_message("[thrallToRevive] slowly rises, no longer recognizable as human.", \
@@ -659,7 +659,7 @@
to_chat(user, "[thrallToRevive] is not dead.")
charge_counter = charge_max
return
- user.visible_message("[user] kneels over [thrallToRevive], placing their hands on \his chest.", \
+ user.visible_message("[user] kneels over [thrallToRevive], placing [user.p_their()] hands on \his chest.", \
"You crouch over the body of your thrall and begin gathering energy...")
thrallToRevive.notify_ghost_cloning("Your masters are resuscitating you! Re-enter your corpse if you wish to be brought to life.", source = thrallToRevive)
if(!do_mob(user, thrallToRevive, 30))
@@ -673,7 +673,7 @@
user.Beam(thrallToRevive,icon_state="red_lightning",icon='icons/effects/effects.dmi',time=1)
sleep(10)
if(thrallToRevive.revive())
- thrallToRevive.visible_message("[thrallToRevive] heaves in breath, dim red light shining in their eyes.", \
+ thrallToRevive.visible_message("[thrallToRevive] heaves in breath, dim red light shining in [thrallToRevive.p_their()] eyes.", \
"You have returned. One of your masters has brought you from the darkness beyond.")
thrallToRevive.Weaken(4)
thrallToRevive.emote("gasp")
@@ -710,7 +710,7 @@
var/mob/living/carbon/human/M = target
user.visible_message("[user]'s eyes flash a bright red!", \
"You begin to draw [M]'s life force.")
- M.visible_message("[M]'s face falls slack, their jaw slightly distending.", \
+ M.visible_message("[M]'s face falls slack, [M.p_their()] jaw slightly distending.", \
"You are suddenly transported... far, far away...")
if(!do_after(user, 50, target = M))
to_chat(M, "You are snapped back to reality, your haze dissipating!")
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index e9a249d8412..15f6371bd05 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -345,7 +345,7 @@
ticker.mode.vampire_enthralled.Add(H.mind)
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 their every command.")
+ 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.")
add_attack_logs(user, H, "Vampire-thralled")
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 2e99f0238c5..7a51b03ae80 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -56,7 +56,7 @@
new /obj/effect/particle_effect/smoke(H.loc)
var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc)
M.key = C.key
- to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.")
+ to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow [H.p_their()] orders and help [H.p_them()] in accomplishing their goals.")
switch(href_list["school"])
if("destruction")
M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null))
@@ -213,7 +213,7 @@
/obj/item/scrying/attack_self(mob/user as mob)
to_chat(user, " You can see...everything!")
- visible_message("[user] stares into [src], their eyes glazing over.")
+ visible_message("[user] stares into [src], [user.p_their()] eyes glazing over.")
user.ghostize(1)
/////////////////////Multiverse Blade////////////////////
@@ -277,7 +277,7 @@ var/global/list/multiverse = list()
var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone
hijack_objective.owner = usr.mind
usr.mind.objectives += hijack_objective
- hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!"
+ hijack_objective.explanation_text = "Ensure only [usr.real_name] and [usr.p_their()] copies are on the shuttle!"
to_chat(usr, "Objective #[1]: [hijack_objective.explanation_text]")
ticker.mode.traitors += usr.mind
usr.mind.special_role = "[usr.real_name] Prime"
@@ -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, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.")
+ to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish [user.p_their()] goals at all costs.")
M.faction = list("[user.real_name]")
if(duplicate_self)
M.set_species(user.get_species()) //duplicate the sword user's species.
@@ -342,7 +342,7 @@ var/global/list/multiverse = list()
var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone
hijack_objective.owner = M.mind
M.mind.objectives += hijack_objective
- hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!"
+ hijack_objective.explanation_text = "Ensure only [usr.real_name] and [usr.p_their()] copies are on the shuttle!"
to_chat(M, "Objective #[1]: [hijack_objective.explanation_text]")
M.mind.special_role = SPECIAL_ROLE_MULTIVERSE
log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] hijack.")
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index cb303a90932..4c8cbc3439f 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -167,9 +167,9 @@
icon_state = "soulstone"
name = initial(name)
if(iswizard(usr) || usability)
- to_chat(A, "You have been released from your prison, but you are still bound to [usr.real_name]'s will. Help them succeed in their goals at all costs.")
+ to_chat(A, "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.")
else if(iscultist(usr))
- to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.")
+ to_chat(A, "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.")
was_used()
attack_self(U)
@@ -280,7 +280,7 @@
ticker.mode.update_cult_icons_added(Z.mind)
qdel(T)
to_chat(Z, "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike.")
- to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(Z, "You are still bound to serve your creator, follow [U.p_their()] orders and help [U.p_them()] complete [U.p_their()] goals at all costs.")
Z.cancel_camera()
qdel(C)
@@ -296,7 +296,7 @@
ticker.mode.update_cult_icons_added(Z.mind)
qdel(T)
to_chat(Z, "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls.")
- to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(Z, "You are still bound to serve your creator, follow [U.p_their()] orders and help [U.p_them()] complete [U.p_their()] goals at all costs.")
Z.cancel_camera()
qdel(C)
@@ -312,7 +312,7 @@
ticker.mode.update_cult_icons_added(Z.mind)
qdel(T)
to_chat(Z, "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone).")
- to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(Z, "You are still bound to serve your creator, follow [U.p_their()] orders and help [U.p_them()] complete [U.p_their()] goals at all costs.")
Z.cancel_camera()
qdel(C)
else
@@ -332,11 +332,11 @@
ticker.mode.cult+=newstruct.mind
ticker.mode.update_cult_icons_added(newstruct.mind)
if(stoner && iswizard(stoner))
- to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(newstruct, "You are still bound to serve your creator, follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
else if(stoner && iscultist(stoner))
- to_chat(newstruct, "You are still bound to serve the cult, follow their orders and help them complete their goals at all costs.")
+ to_chat(newstruct, "You are still bound to serve the cult, follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
else
- to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(newstruct, "You are still bound to serve your creator, follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
newstruct.cancel_camera()
/obj/item/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0)
@@ -362,11 +362,11 @@
name = "soulstone: Shade of [T.real_name]"
icon_state = "soulstone2"
if(U && iswizard(U))
- to_chat(S, "Your soul has been captured! You are now bound to [U.real_name]'s will. Help them succeed in their goals at all costs.")
+ to_chat(S, "Your soul has been captured! You are now bound to [U.real_name]'s will. Help [U.p_them()] succeed in their goals at all costs.")
else if(U && iscultist(U))
- to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help them succeed in their goals at all costs.")
+ to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help [U.p_them()] succeed in their goals at all costs.")
if(vic && U)
- to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone.")
+ to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from [U.p_their()] body and stored within the soul stone.")
/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U)
var/mob/dead/observer/chosen_ghost
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 7d386ddfb1a..a6956d8749b 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -327,34 +327,35 @@
return
if(istype(G, /obj/item/grab))
+ var/obj/item/grab/GG = G
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
- if(!ismob(G:affecting))
+ if(!ismob(GG.affecting))
return
if(src.occupant)
to_chat(user, "The sleeper is already occupied!")
return
- for(var/mob/living/carbon/slime/M in range(1,G:affecting))
- if(M.Victim == G:affecting)
- to_chat(usr, "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head.")
+ for(var/mob/living/carbon/slime/M in range(1,GG.affecting))
+ if(M.Victim == GG.affecting)
+ to_chat(usr, "[GG.affecting.name] will not fit into the sleeper because [GG.affecting.p_they()] have a slime latched onto [GG.affecting.p_their()] head.")
return
- visible_message("[user] starts putting [G:affecting:name] into the sleeper.")
+ visible_message("[user] starts putting [GG.affecting.name] into the sleeper.")
- if(do_after(user, 20, target = G:affecting))
+ if(do_after(user, 20, target = GG.affecting))
if(src.occupant)
to_chat(user, "The sleeper is already occupied!")
return
- if(!G || !G:affecting) return
- var/mob/M = G:affecting
+ if(!GG || !GG.affecting) return
+ var/mob/M = GG.affecting
M.forceMove(src)
src.occupant = M
src.icon_state = "[base_icon]"
to_chat(M, "You feel cool air surround you. You go numb as your senses turn inward.")
src.add_fingerprint(user)
- qdel(G)
+ qdel(GG)
return
return
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 63d5c9811b4..77ae7f56a5b 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -108,7 +108,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 cryo cell because they have a slime latched onto their head.")
+ to_chat(usr, "[L.name] will not fit into the cryo cell because [L.p_they()] have a slime latched onto [L.p_their()] head.")
return
if(put_mob(L))
if(L == user)
@@ -293,18 +293,19 @@
default_deconstruction_crowbar(G)
if(istype(G, /obj/item/grab))
+ var/obj/item/grab/GG = G
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
- if(!ismob(G:affecting))
+ if(!ismob(GG.affecting))
return
- for(var/mob/living/carbon/slime/M in range(1,G:affecting))
- if(M.Victim == G:affecting)
- to_chat(usr, "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head.")
+ for(var/mob/living/carbon/slime/M in range(1,GG.affecting))
+ if(M.Victim == GG.affecting)
+ to_chat(usr, "[GG.affecting.name] will not fit into the cryo because [GG.affecting.p_they()] have a slime latched onto [GG.affecting.p_their()] head.")
return
- var/mob/M = G:affecting
+ var/mob/M = GG.affecting
if(put_mob(M))
- qdel(G)
+ qdel(GG)
return
/obj/machinery/atmospherics/unary/cryo_cell/update_icon()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 88827a6ab05..1c9352eccab 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -551,7 +551,7 @@
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 cryo pod because they have a slime latched onto their head.")
+ to_chat(usr, "[L.name] will not fit into the cryo pod because [L.p_they()] have a slime latched onto [L.p_their()] head.")
return
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 02c04fbfbea..fbcfefba259 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -219,7 +219,7 @@
if(C)
S.key = C.key
if(S.master_commander)
- to_chat(S, "You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist them in completing their goals at any cost.")
+ to_chat(S, "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.")
qdel(src)
/obj/effect/decal/cleanable/spiderling_remains
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 2d0865faa36..a1878ae79d5 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -585,12 +585,12 @@
if(!target || !ishuman(target) || !missionary || !ishuman(missionary))
return
if(ismindslave(target) || target.mind.zealot_master) //mindslaves and zealots override the staff because the staff is just a temporary mindslave
- to_chat(missionary, "Your faith is strong, but their mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...")
+ to_chat(missionary, "Your faith is strong, but [target.p_their()] mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...")
faith -= 25 //same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor?
return
if(ismindshielded(target))
faith -= 75
- to_chat(missionary, "Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.")
+ to_chat(missionary, "Your faith is strong, but [target.p_their()] mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.")
return
else if(target.mind.assigned_role == "Psychiatrist" || target.mind.assigned_role == "Librarian") //fancy book lernin helps counter religion (day 0 job love, what madness!)
if(prob(35)) //35% chance to fail
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index da6e3b95968..703054795f2 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -79,7 +79,7 @@
return
var/mob/M = G.affecting
if(M.buckled_mob)
- to_chat(usr, "[M] will not fit into [src] because they have a slime latched onto their head.")
+ to_chat(usr, "[M] will not fit into [src] because [M.p_they()] have a slime latched onto [M.p_their()] head.")
return
if(put_mob(M))
qdel(G)
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index 38a16be40ce..c160ed7e5c2 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -14,11 +14,11 @@
/obj/item/stack/tape_roll/attack(mob/living/carbon/human/M as mob, mob/living/user as mob)
if(M.wear_mask)
- to_chat(user, "Remove their mask first!")
+ to_chat(user, "Remove [M.p_their()] mask first!")
else if(amount < 2)
to_chat(user, "You'll need more tape for this!")
else if(!M.check_has_mouth())
- to_chat(user, "They have no mouth to tape over!")
+ to_chat(user, "[M.p_they()] have no mouth to tape over!")
else
if(M == user)
to_chat(user, "You try to tape your own mouth shut.")
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 282603a8879..67a382a01ec 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -411,7 +411,7 @@ BLIND // can't see anything
desc = "[desc] They have had their toes opened up."
update_icon()
else
- to_chat(user, "[src] have already had their toes cut open!")
+ to_chat(user, "[src] have already had [src.p_their()] toes cut open!")
return
else
..()
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 7a2d9e5e495..eab5aa0c5bb 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -366,7 +366,7 @@
correct_piece.icon_state = "[initial(icon_state)]"
switch(msg_type)
if("boots")
- to_chat(wearer, "\The [correct_piece] relax their grip on your legs.")
+ to_chat(wearer, "\The [correct_piece] relax [correct_piece.p_their()] grip on your legs.")
if(user != wearer)
to_chat(user, "\The [correct_piece] has been unsealed.")
wearer.update_inv_shoes()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index e0f90aacdd0..6b76c5675f5 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1746,7 +1746,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
to_chat(src, "Remove your mask first!")
return 0
if((H.head && (H.head.flags_cover & HEADCOVERSMOUTH)) || (H.wear_mask && (H.wear_mask.flags_cover & MASKCOVERSMOUTH) && !H.wear_mask.mask_adjusted))
- to_chat(src, "Remove their mask first!")
+ to_chat(src, "Remove [H.p_their()] mask first!")
return 0
visible_message("[src] is trying to perform CPR on [H.name]!", \
"You try to perform CPR on [H.name]!")
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index d850caf658f..5c16ec58e5f 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -196,7 +196,7 @@
target.Weaken(12)
sleep(20)
if(ismindshielded(target))
- to_chat(user, "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.")
+ to_chat(user, "[target.p_they(TRUE)] are enslaved by Nanotrasen. You feel [target.p_their()] interest in your cause wane and disappear.")
user.visible_message("[user] stops talking for a moment, then moves back away from [target].")
to_chat(target, "Your mindshield implant activates, protecting you from conversion.")
return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 444c4c23949..899948725a7 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -794,7 +794,7 @@ var/list/robot_verbs_default = list(
laws = new /datum/ai_laws/syndicate_override
var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] : [M.name]([M.key]) emagged [name]([key])")
- set_zeroth_law("Only [M.real_name] and people he designates as being such are Syndicate Agents.")
+ set_zeroth_law("Only [M.real_name] and people [M.p_they()] designate[M.p_s()] as being such are Syndicate Agents.")
to_chat(src, "ALERT: Foreign software detected.")
sleep(5)
to_chat(src, "Initiating diagnostics...")
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 70a64d2dbcb..b98d4181475 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -35,7 +35,7 @@
var/emagged = 0 //is it getting ready to explode?
var/obj/item/mmi/mmi = null
- var/emagged_master = null //for administrative purposes, to see who emagged the spiderbot; also for a holder for if someone emags an empty frame first then inserts an MMI.
+ var/mob/emagged_master = null //for administrative purposes, to see who emagged the spiderbot; also for a holder for if someone emags an empty frame first then inserts an MMI.
/mob/living/simple_animal/spiderbot/Destroy()
if(emagged)
@@ -135,8 +135,8 @@
else
emagged = 1
to_chat(user, "You short out the security protocols and rewrite [src]'s internal memory.")
- to_chat(src, "You have been emagged; you are now completely loyal to [user] and their every order!")
- emagged_master = user.name
+ to_chat(src, "You have been emagged; you are now completely loyal to [user] and [user.p_their()] every order!")
+ emagged_master = user
add_attack_logs(user, src, "Emagged")
maxHealth = 60
health = 60
@@ -150,7 +150,7 @@
ckey = M.brainmob.ckey
name = "Spider-bot ([M.brainmob.name])"
if(emagged)
- to_chat(src, "You have been emagged; you are now completely loyal to [emagged_master] and their every order!")
+ to_chat(src, "You have been emagged; you are now completely loyal to [emagged_master] and [emagged_master.p_their()] every order!")
/mob/living/simple_animal/spiderbot/proc/update_icon()
if(mmi)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index d8058efbb53..35bdb18caae 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -205,7 +205,7 @@
SM.master_commander = user
SM.sentience_act()
to_chat(SM, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!")
- to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.")
+ to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
if(SM.flags_2 & HOLOGRAM_2) //Check to see if it's a holodeck creature
to_chat(SM, "You also become depressingly aware that you are not a real creature, but instead a holoform. Your existence is limited to the parameters of the holodeck.")
to_chat(user, "[M] accepts the potion and suddenly becomes attentive and aware. It worked!")
@@ -426,7 +426,7 @@
G.loc = src.loc
G.key = ghost.key
add_attack_logs(user, G, "Summoned as a golem")
- to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.")
+ to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
qdel(src)
/obj/effect/golemrune/Topic(href,href_list)
diff --git a/paradise.dme b/paradise.dme
index 6cf47e457f5..62908577586 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -77,6 +77,7 @@
#include "code\__HELPERS\matrices.dm"
#include "code\__HELPERS\mobs.dm"
#include "code\__HELPERS\names.dm"
+#include "code\__HELPERS\pronouns.dm"
#include "code\__HELPERS\qdel.dm"
#include "code\__HELPERS\sanitize_values.dm"
#include "code\__HELPERS\text.dm"