diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm
index d419e925759..12095e171e7 100644
--- a/code/__HELPERS/pronouns.dm
+++ b/code/__HELPERS/pronouns.dm
@@ -33,6 +33,9 @@
/datum/proc/p_theyre(capitalized, temp_gender)
. = p_they(capitalized, temp_gender) + "'" + copytext(p_are(temp_gender), 2)
+/datum/proc/p_themselves(capitalized, temp_gender)
+ . = "itself"
+
// For help conjugating verbs, eg they look, but she looks
/datum/proc/p_s(temp_gender)
. = "s"
@@ -79,6 +82,18 @@
if(capitalized)
. = capitalize(.)
+/client/p_themselves(capitalized, temp_gender)
+ if(!temp_gender)
+ temp_gender = gender
+ . = p_them(capitalized, temp_gender)
+ switch(temp_gender)
+ if(MALE, FEMALE)
+ . += "self"
+ if(NEUTER, PLURAL)
+ . += "selves"
+ if(capitalized)
+ . = capitalize(.)
+
/client/p_have(temp_gender)
if(!temp_gender)
temp_gender = gender
@@ -156,6 +171,18 @@
if(capitalized)
. = capitalize(.)
+/mob/p_themselves(capitalized, temp_gender)
+ if(!temp_gender)
+ temp_gender = gender
+ . = p_them(capitalized, temp_gender)
+ switch(temp_gender)
+ if(MALE, FEMALE, NEUTER)
+ . += "self"
+ if(PLURAL)
+ . += "selves"
+ if(capitalized)
+ . = capitalize(.)
+
/mob/p_have(temp_gender)
if(!temp_gender)
temp_gender = gender
@@ -203,6 +230,10 @@
temp_gender = get_visible_gender()
return ..()
+/mob/living/carbon/human/p_themselves(capitalized, temp_gender)
+ temp_gender = get_visible_gender()
+ return ..()
+
/mob/living/carbon/human/p_have(temp_gender)
temp_gender = get_visible_gender()
return ..()
diff --git a/code/datums/emote.dm b/code/datums/emote.dm
index 9d6b7a7e175..d2d443954e2 100644
--- a/code/datums/emote.dm
+++ b/code/datums/emote.dm
@@ -368,6 +368,8 @@
msg = replacetext(msg, "them", user.p_them())
if(findtext(msg, "they"))
msg = replacetext(msg, "they", user.p_they())
+ if(findtext(msg, "themselves"))
+ msg = replacetext(msg, "themselves", user.p_themselves())
if(findtext(msg, "%s"))
msg = replacetext(msg, "%s", user.p_s())
return msg
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 829b4b4e77f..b941ece9d16 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -78,7 +78,7 @@
M.set_body_position(STANDING_UP)
else
M.set_body_position(LYING_DOWN)
-
+
if(M.pulling && M.pulling == src)
M.stop_pulling()
@@ -143,7 +143,7 @@
. = buckle_mob(M, check_loc = check_loc)
if(.)
if(M == user)
- M.visible_message("[M] buckles [M.p_them()]self to [src].",\
+ M.visible_message("[M] buckles [M.p_themselves()] to [src].",\
"You buckle yourself to [src].",\
"You hear metal clanking.")
else
@@ -159,7 +159,7 @@
"[user] unbuckles you from [src].",\
"You hear metal clanking.")
else
- M.visible_message("[M] unbuckles [M.p_them()]self from [src].",\
+ M.visible_message("[M] unbuckles [M.p_themselves()] from [src].",\
"You unbuckle yourself from [src].",\
"You hear metal clanking.")
add_fingerprint(user)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index d746c74242f..cf6bf2c4329 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -587,7 +587,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
"[user] stabs you in the eye with [src]!")
else
user.visible_message( \
- "[user] has stabbed [user.p_them()]self in the eyes with [src]!", \
+ "[user] has stabbed [user.p_themselves()] in the eyes with [src]!", \
"You stab yourself in the eyes with [src]!" \
)
diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm
index a06458b1bcd..6dd3162d9b8 100644
--- a/code/game/objects/items/theft_items.dm
+++ b/code/game/objects/items/theft_items.dm
@@ -36,7 +36,7 @@
radiation_pulse(src, 400, 2)
/obj/item/nuke_core/suicide_act(mob/user)
- user.visible_message("[user] is rubbing [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!")
+ user.visible_message("[user] is rubbing [src] against [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide!")
return TOXLOSS
/obj/item/nuke_core/plutonium //The steal objective, so it doesnt mess with the SM sliver on pinpointers and objectives
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 576522fb350..c3013e70039 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -21,7 +21,7 @@
tool_behaviour = TOOL_WRENCH
/obj/item/wrench/suicide_act(mob/user)
- user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ user.visible_message("[user] is beating [user.p_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
diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm
index aea23d5bec0..3d5f225ebd4 100644
--- a/code/game/objects/items/weapons/batons.dm
+++ b/code/game/objects/items/weapons/batons.dm
@@ -40,8 +40,8 @@
add_fingerprint(user)
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- user.visible_message("[user] accidentally clubs [user.p_them()]self with [src]!", \
- "You accidentally club yourself with [src]!")
+ user.visible_message("[user] accidentally clubs [user.p_themselves()] with [src]!", \
+ "You accidentally club yourself with [src]!")
user.KnockDown(knockdown_duration)
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm
index 07bdaddbc52..f4f50f6e54d 100644
--- a/code/game/objects/items/weapons/courtroom.dm
+++ b/code/game/objects/items/weapons/courtroom.dm
@@ -14,7 +14,7 @@
resistance_flags = FLAMMABLE
/obj/item/gavelhammer/suicide_act(mob/user)
- user.visible_message("[user] has sentenced [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
+ user.visible_message("[user] has sentenced [user.p_themselves()] to death with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
return BRUTELOSS
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index c726f40e10c..c977da3fda7 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -27,7 +27,7 @@
return
if(M == user)
- user.visible_message("[user] injects [user.p_them()]self with [src]!")
+ user.visible_message("[user] injects [user.p_themselves()] with [src]!")
injected(user, user)
else
user.visible_message("[user] is trying to inject [M] with [src]!")
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 33a2d6fa421..5e08dda135d 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -31,7 +31,7 @@
variant_icons += list(initial(rod.name) = image(icon = initial(rod.icon), icon_state = initial(rod.icon_state)))
/obj/item/nullrod/suicide_act(mob/user)
- user.visible_message("[user] is killing [user.p_them()]self with \the [src.name]! It looks like [user.p_theyre()] trying to get closer to god!")
+ user.visible_message("[user] is killing [user.p_themselves()] with \the [src.name]! It looks like [user.p_theyre()] trying to get closer to god!")
return BRUTELOSS|FIRELOSS
/obj/item/nullrod/attack(mob/M, mob/living/carbon/user)
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index f248ebf81d8..3ca35667c1a 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -17,7 +17,7 @@
/obj/item/melee/chainofcommand/suicide_act(mob/user)
- to_chat(viewers(user), "[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
+ to_chat(viewers(user), "[user] is strangling [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
return OXYLOSS
/obj/item/melee/rapier
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 7adc935a48b..fd5798d2508 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -93,13 +93,13 @@
var/mob/living/carbon/human/H = M
if(prob(60))
bless(H)
- H.visible_message("[user] heals [H == user ? "[user.p_themselves()]" : "[H]"] with the power of [deity_name]!",
"May the power of [deity_name] compel you to be healed!")
playsound(loc, "punch", 25, 1, -1)
else
M.adjustBrainLoss(10)
to_chat(M, "You feel dumber.")
- H.visible_message("[user] beats [H == user ? "[user.p_them()]self" : "[H]"] over the head with [src]!")
+ H.visible_message("[user] beats [H == user ? "[user.p_themselves()]" : "[H]"] over the head with [src]!")
playsound(src.loc, "punch", 25, 1, -1)
else
M.visible_message("[user] smacks [M]'s lifeless corpse with [src].")
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 4b6b1657b84..c30e109f939 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -152,7 +152,7 @@
/obj/item/melee/baton/attack(mob/M, mob/living/user)
if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
if(baton_stun(user, user, skip_cooldown = TRUE)) // for those super edge cases where you clumsy baton yourself in quick succession
- user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!",
+ user.visible_message("[user] accidentally hits [user.p_themselves()] with [src]!",
"You accidentally hit yourself with [src]!")
return
@@ -224,7 +224,7 @@
if(turned_on && cell?.charge)
flick("baton_active", source)
baton_stun(user, user, skip_cooldown = TRUE)
- user.visible_message("[user] shocks [user.p_them()]self while attempting to wash the active [src]!",
+ user.visible_message("[user] shocks [user.p_themselves()] while attempting to wash the active [src]!",
"You unwisely attempt to wash [src] while it's still on.")
return TRUE
..()
diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm
index 0760c52dc68..1ed1a6a7d92 100644
--- a/code/game/objects/items/weapons/teleprod.dm
+++ b/code/game/objects/items/weapons/teleprod.dm
@@ -10,7 +10,7 @@
if(!turned_on)
return
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!",
+ user.visible_message("[user] accidentally hits [user.p_themselves()] with [src]!",
"You accidentally hit yourself with [src]!")
deductcharge(hitcost)
do_teleport(user, get_turf(user), 50)//honk honk
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index e2efee73f4f..a5dc65d1a71 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -17,7 +17,7 @@
resistance_flags = FIRE_PROOF
/obj/item/banhammer/suicide_act(mob/user)
- visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.")
+ visible_message("[user] is hitting [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to ban [user.p_themselves()] from life.")
return BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS
/obj/item/banhammer/attack(mob/M, mob/user)
@@ -38,7 +38,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/sord/suicide_act(mob/user)
- user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \
+ user.visible_message("[user] is trying to impale [user.p_themselves()] with [src]! It might be a suicide attempt if it weren't so shitty.", \
"You try to impale yourself with [src], but it's USELESS...")
return SHAME
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 5189f67486f..aed8d691eb4 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -52,7 +52,7 @@
attack_verb = list("scrubbed", "brushed", "scraped")
/obj/item/tank_brush/suicide_act(mob/user)
- visible_message("[user] is vigorously scrubbing [user.p_them()]self raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
+ visible_message("[user] is vigorously scrubbing [user.p_themselves()] raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
return BRUTELOSS|FIRELOSS
/obj/item/storage/bag/fish
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index a983d85c14b..b618c902a40 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -107,8 +107,8 @@
target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [name]!", \
"[user] has hit [target][head_attack_message] with a bottle of [name]!")
else
- user.visible_message("[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!", \
- "[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!")
+ user.visible_message("[target] hits [target.p_themselves()] with a bottle of [name][head_attack_message]!", \
+ "[target] hits [target.p_themselves()] with a bottle of [name][head_attack_message]!")
//Attack logs
add_attack_logs(user, target, "Hit with [src]")
diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
index 412b0344fa5..17d60feab4b 100644
--- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
@@ -43,7 +43,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
if(!(resistance_flags & ON_FIRE))
return
- user.visible_message("[user] pours [src] all over [user.p_them()]self!", "You pour [src] all over yourself!", "You hear a 'whoompf' and a sizzle.")
+ user.visible_message("[user] pours [src] all over [user.p_themselves()]!", "You pour [src] all over yourself!", "You hear a 'whoompf' and a sizzle.")
extinguish(TRUE)
reagents.reaction(user, REAGENT_TOUCH)
reagents.clear_reagents()
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 1523912b4d4..b24bc0215f8 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -230,7 +230,7 @@
H.concealed = TRUE
H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
if(user == target)
- user.visible_message("[user] deals [dcard] card(s) to \himself.")
+ user.visible_message("[user] deals [dcard] card(s) to [user.p_themselves()].")
else
user.visible_message("[user] deals [dcard] card(s) to [target].")
H.throw_at(get_step(target,target.dir),3,1,H)
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 73ca95ccdbb..4b5ac043646 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -27,7 +27,7 @@
tastes = list("banana" = 1)
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
- user.visible_message("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.")
+ user.visible_message("[user] is aiming [src] at [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
sleep(25)
if(!user)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index d182517f5c6..0962dff8e66 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -98,7 +98,7 @@
sharp = TRUE
/obj/item/hatchet/suicide_act(mob/user)
- user.visible_message("[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
+ user.visible_message("[user] is chopping at [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return BRUTELOSS
@@ -142,7 +142,7 @@
origin_tech = "materials=1;combat=2"
/obj/item/scythe/suicide_act(mob/user)
- user.visible_message("[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
+ user.visible_message("[user] is beheading [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/affecting = H.get_organ("head")
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index c84c12ff772..33e2918ef58 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -298,7 +298,7 @@
/mob/living/carbon/proc/check_self_for_injuries()
var/mob/living/carbon/human/H = src
- visible_message("[src] examines [H.p_them()]self.", \
+ visible_message("[src] examines [H.p_themselves()].", \
"You check yourself for injuries." \
)
var/list/status_list = list()
@@ -871,7 +871,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return
var/time = I.breakouttime
- visible_message("[src] attempts to unbuckle [p_them()]self!",
+ visible_message("[src] attempts to unbuckle [p_themselves()]!",
"You attempt to unbuckle yourself... (This will take around [time / 10] seconds and you need to stay still.)")
if(!do_after(src, time, FALSE, src, extra_checks = list(CALLBACK(src, PROC_REF(buckle_check)))))
if(src && buckled)
@@ -895,11 +895,11 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
fire_stacks -= 5
Weaken(6 SECONDS, TRUE) //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.
spin(32, 2)
- visible_message("[src] rolls on the floor, trying to put [p_them()]self out!",
+ visible_message("[src] rolls on the floor, trying to put [p_themselves()] out!",
"You stop, drop, and roll!")
sleep(3 SECONDS)
if(fire_stacks <= 0)
- visible_message("[src] has successfully extinguished [p_them()]self!",
+ visible_message("[src] has successfully extinguished [p_themselves()]!",
"You extinguish yourself.")
ExtinguishMob()
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index 65ef17b0997..c71fdbe47b5 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -189,7 +189,7 @@
switch(progress)
if(1)
to_chat(user, "You begin by introducing yourself and explaining what you're about.")
- user.visible_message("[user] introduces [user.p_them()]self and explains [user.p_their()] plans.")
+ user.visible_message("[user] introduces [user.p_themselves()] and explains [user.p_their()] plans.")
if(2)
to_chat(user, "You begin the recruitment of [target].")
user.visible_message("[user] leans over towards [target], whispering excitedly as [user.p_they()] give[user.p_s()] a speech.")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a18de862013..8ad31a6cce9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1225,7 +1225,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
location.add_vomit_floor(FALSE, TRUE)
else
if(!no_text)
- visible_message("[src] pukes all over [p_them()]self!","You puke all over yourself!")
+ visible_message("[src] pukes all over [p_themselves()]!","You puke all over yourself!")
location.add_vomit_floor(TRUE)
/mob/proc/AddSpell(obj/effect/proc_holder/spell/S)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 3baaf76ab28..cb5700f759e 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -438,7 +438,7 @@
if(is_hot(P))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
- user.visible_message("[user] accidentally ignites [user.p_them()]self!", \
+ user.visible_message("[user] accidentally ignites [user.p_themselves()]!", \
"You miss the paper and accidentally light yourself on fire!")
user.unEquip(P)
user.adjust_fire_stacks(1)
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 0c709051eea..45ec3a50214 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -72,7 +72,7 @@
else if(is_hot(P))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
- user.visible_message("[user] accidentally ignites [user.p_them()]self!", \
+ user.visible_message("[user] accidentally ignites [user.p_themselves()]!", \
"You miss [src] and accidentally light yourself on fire!")
user.unEquip(P)
user.adjust_fire_stacks(1)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 2de447fe0b0..809f539149b 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -25,7 +25,7 @@
pressure_resistance = 2
/obj/item/pen/suicide_act(mob/user)
- to_chat(viewers(user), "[user] starts scribbling numbers over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku.")
+ to_chat(viewers(user), "[user] starts scribbling numbers over [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit sudoku.")
return BRUTELOSS
/obj/item/pen/blue
diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm
index 6791981a870..75e999732af 100644
--- a/code/modules/paperwork/ticketmachine.dm
+++ b/code/modules/paperwork/ticketmachine.dm
@@ -216,7 +216,7 @@
..()
if(is_hot(P))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
- user.visible_message("[user] accidentally ignites [user.p_them()]self!", \
+ user.visible_message("[user] accidentally ignites [user.p_themselves()]!", \
"You miss the paper and accidentally light yourself on fire!")
user.drop_item()
user.adjust_fire_stacks(1)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 3eaeb2155d8..2052c748354 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -510,7 +510,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
if(locate(/obj/structure/chair/stool) in user.loc)
user.visible_message("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
else
- user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
+ user.visible_message("[user] is strangling [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide.")
return OXYLOSS
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, paramcolor = null)
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 1754b7a1146..f6bafc0fa47 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -49,10 +49,10 @@
update_icon()
/obj/item/gun/magic/wand/proc/zap_self(mob/living/user)
- user.visible_message("[user] zaps [user.p_them()]self with [src].")
+ user.visible_message("[user] zaps [user.p_themselves()] with [src].")
playsound(user, fire_sound, 50, 1)
- user.create_attack_log("[key_name(user)] zapped [user.p_them()]self with a [src]")
- add_attack_logs(user, user, "zapped [user.p_them()]self with a [src]", ATKLOG_ALL)
+ user.create_attack_log("[key_name(user)] zapped [user.p_themselves()] with a [src]")
+ add_attack_logs(user, user, "zapped [user.p_themselves()] with a [src]", ATKLOG_ALL)
/////////////////////////////////////
//WAND OF DEATH
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 40c6eb97134..9c041a81986 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -717,7 +717,7 @@
update_flags |= M.adjustBruteLoss(5, FALSE)
M.Weaken(10 SECONDS)
M.AdjustJitter(12 SECONDS)
- M.visible_message("[M] falls to the floor, scratching [M.p_them()]self violently!")
+ M.visible_message("[M] falls to the floor, scratching [M.p_themselves()] violently!")
M.emote("scream")
return ..() | update_flags
diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm
index 2f863c8302d..d17b4fea4b8 100644
--- a/code/modules/reagents/reagent_containers/applicator.dm
+++ b/code/modules/reagents/reagent_containers/applicator.dm
@@ -74,7 +74,7 @@
if(ignore_flags || M.can_inject(user, TRUE))
if(M == user)
- M.visible_message("[user] begins mending [user.p_them()]self with [src].", "You begin mending yourself with [src].")
+ M.visible_message("[user] begins mending [user.p_themselves()] with [src].", "You begin mending yourself with [src].")
else
user.visible_message("[user] begins mending [M] with [src].", "You begin mending [M] with [src].")
if(M.reagents)