From c32d567cb96902535c6539c0ce4f0860d28f92a0 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 3 May 2018 18:45:55 -0400 Subject: [PATCH] Makes more messages pronoun sensitive (#37582) * Makes more messages pronoun sensitive * Some cleanup * more pronouns * rever --- code/__HELPERS/pronouns.dm | 22 +++++++++++++++++++ code/datums/components/riding.dm | 2 +- code/datums/martial/cqc.dm | 2 +- code/datums/martial/sleeping_carp.dm | 2 +- .../game/gamemodes/clown_ops/clown_weapons.dm | 2 +- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 4 ++-- .../mecha/equipment/tools/medical_tools.dm | 2 +- code/game/objects/items.dm | 2 +- code/game/objects/items/airlock_painter.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 10 ++++----- code/game/objects/items/clown_items.dm | 2 +- code/game/objects/items/cosmetics.dm | 12 +++++----- code/game/objects/items/defib.dm | 4 ++-- code/game/objects/items/devices/aicard.dm | 2 +- .../objects/items/devices/laserpointer.dm | 8 +++---- .../game/objects/items/devices/radio/radio.dm | 2 +- .../items/devices/reverse_bear_trap.dm | 4 ++-- code/game/objects/items/melee/energy.dm | 2 +- code/game/objects/items/melee/misc.dm | 4 ++-- code/game/objects/items/pet_carrier.dm | 4 ++-- code/game/objects/items/pinpointer.dm | 6 ++--- code/game/objects/items/pneumaticCannon.dm | 2 +- code/game/objects/items/powerfist.dm | 2 +- code/game/objects/items/religion.dm | 2 +- code/game/objects/items/robot/robot_items.dm | 4 ++-- code/game/objects/items/stacks/medical.dm | 2 +- .../items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/items/stacks/wrap.dm | 2 +- code/game/objects/items/storage/backpack.dm | 2 +- code/game/objects/items/storage/bags.dm | 4 ++-- code/game/objects/items/storage/belt.dm | 2 +- code/game/objects/items/stunbaton.dm | 2 +- code/game/objects/items/teleprod.dm | 2 +- code/game/objects/items/toys.dm | 2 +- code/game/objects/items/twohanded.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 2 +- code/game/objects/structures/guillotine.dm | 6 ++--- code/game/objects/structures/life_candle.dm | 2 +- code/game/objects/structures/watercloset.dm | 6 ++--- .../abductor/abductee/abductee_objectives.dm | 2 +- .../abductor/equipment/abduction_gear.dm | 6 ++--- code/modules/antagonists/brother/brother.dm | 2 +- .../antagonists/changeling/powers/absorb.dm | 4 ++-- .../changeling/powers/mutations.dm | 12 +++++----- .../changeling/powers/tiny_prick.dm | 4 ++-- .../clockcult/clock_effects/clock_sigils.dm | 2 +- .../clock_helpers/fabrication_helpers.dm | 4 ++-- .../clockcult/clock_helpers/slab_abilities.dm | 10 ++++----- .../clockcult/clock_items/clock_components.dm | 2 +- .../clockcult/clock_items/clockwork_armor.dm | 8 +++---- .../clockcult/clock_items/soul_vessel.dm | 4 ++-- .../clock_mobs/clockwork_marauder.dm | 2 +- .../clock_structures/eminence_spire.dm | 4 ++-- .../clock_structures/traps/brass_skewer.dm | 2 +- .../antagonists/clockcult/clockcult.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 14 ++++++------ code/modules/antagonists/cult/cult.dm | 4 ++-- code/modules/antagonists/cult/cult_comms.dm | 2 +- .../antagonists/cult/cult_structures.dm | 4 ++-- code/modules/antagonists/cult/ritual.dm | 4 ++-- .../devil/true_devil/_true_devil.dm | 2 +- .../nukeop/equipment/nuclear_challenge.dm | 2 +- .../revenant/revenant_abilities.dm | 6 ++--- .../antagonists/revolution/revolution.dm | 4 ++-- .../antagonists/slaughter/slaughter.dm | 2 +- .../antagonists/valentines/valentine.dm | 4 ++-- .../antagonists/wizard/equipment/artefact.dm | 4 ++-- .../antagonists/wizard/equipment/soulstone.dm | 10 ++++----- code/modules/antagonists/wizard/wizard.dm | 2 +- code/modules/assembly/flash.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- .../awaymissions/mission_code/snowdin.dm | 4 ++-- code/modules/clothing/glasses/_glasses.dm | 6 ++--- code/modules/clothing/head/misc.dm | 2 +- code/modules/clothing/masks/breath.dm | 2 +- .../modules/clothing/spacesuits/flightsuit.dm | 22 +++++++++---------- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/suits/armor.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 2 +- .../food_and_drinks/food/snacks_egg.dm | 2 +- code/modules/language/codespeak.dm | 2 +- code/modules/mining/equipment/mining_tools.dm | 2 +- .../mining/lavaland/necropolis_chests.dm | 4 ++-- code/modules/mob/living/brain/brain_item.dm | 2 +- .../carbon/alien/humanoid/alien_powers.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 8 +++---- .../mob/living/carbon/carbon_defense.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 4 ++-- .../carbon/human/species_types/jellypeople.dm | 2 +- .../human/species_types/shadowpeople.dm | 6 ++--- code/modules/mob/living/emote.dm | 2 +- code/modules/mob/living/say.dm | 2 +- .../mob/living/silicon/pai/pai_defense.dm | 2 +- .../mob/living/silicon/pai/software.dm | 2 +- .../mob/living/silicon/robot/robot_defense.dm | 4 ++-- code/modules/mob/living/silicon/silicon.dm | 2 +- .../mob/living/simple_animal/constructs.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 4 ++-- .../hostile/mining_mobs/hivelord.dm | 2 +- .../simple_animal/hostile/netherworld.dm | 2 +- .../modules/mob/living/simple_animal/shade.dm | 2 +- code/modules/paperwork/contract.dm | 4 ++-- code/modules/paperwork/paper.dm | 2 +- code/modules/paperwork/paperplane.dm | 2 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/paperwork/photography.dm | 2 +- code/modules/projectiles/guns/energy.dm | 4 ++-- .../chemistry/reagents/alcohol_reagents.dm | 2 +- .../reagents/reagent_containers/medspray.dm | 2 +- .../xenobiology/crossbreeding/_corecross.dm | 2 +- .../crossbreeding/_status_effects.dm | 4 ++-- .../xenobiology/crossbreeding/burning.dm | 2 +- .../research/xenobiology/xenobio_camera.dm | 2 +- .../ruins/objects_and_mobs/sin_ruins.dm | 2 +- code/modules/spells/spell_types/barnyard.dm | 2 +- code/modules/spells/spell_types/lightning.dm | 2 +- code/modules/surgery/eye_surgery.dm | 2 +- 118 files changed, 226 insertions(+), 204 deletions(-) diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm index 26af8b4489e5..d1add9cb4c57 100644 --- a/code/__HELPERS/pronouns.dm +++ b/code/__HELPERS/pronouns.dm @@ -36,6 +36,9 @@ /datum/proc/p_s(temp_gender) //is this a descriptive proc name, or what? . = "s" +/datum/proc/p_es(temp_gender) + . = "es" + //like clients, which do have gender. /client/p_they(capitalized, temp_gender) if(!temp_gender) @@ -107,6 +110,12 @@ if(temp_gender != PLURAL && temp_gender != NEUTER) . = "s" +/client/p_es(temp_gender) + if(!temp_gender) + temp_gender = gender + if(temp_gender != PLURAL && temp_gender != NEUTER) + . = "es" + //mobs(and atoms but atoms don't really matter write your own proc overrides) also have gender! /mob/p_they(capitalized, temp_gender) if(!temp_gender) @@ -184,6 +193,12 @@ if(temp_gender != PLURAL) . = "s" +/mob/p_es(temp_gender) + if(!temp_gender) + temp_gender = gender + if(temp_gender != PLURAL) + . = "es" + //humans need special handling, because they can have their gender hidden /mob/living/carbon/human/p_they(capitalized, temp_gender) var/list/obscured = check_obscured_slots() @@ -240,3 +255,10 @@ if((SLOT_W_UNIFORM in obscured) && skipface) temp_gender = PLURAL return ..() + +/mob/living/carbon/human/p_es(temp_gender) + var/list/obscured = check_obscured_slots() + var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) + if((SLOT_W_UNIFORM in obscured) && skipface) + temp_gender = PLURAL + return ..() diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index 3701be2ae9b7..4a720b655071 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -208,7 +208,7 @@ var/atom/movable/AM = parent AM.unbuckle_mob(user) user.Knockdown(60) - user.visible_message("[AM] pushes [user] off of them!") + user.visible_message("[AM] pushes [user] off of [AM.p_them()]!") /datum/component/riding/cyborg diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 8a480cc2d7b5..c48cf4d9ddb2 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -73,7 +73,7 @@ D.apply_damage(10, BRUTE) add_logs(A, D, "cqc kicked") if(D.IsKnockdown() && !D.stat) - D.visible_message("[A] kicks [D]'s head, knocking them out!", \ + D.visible_message("[A] kicks [D]'s head, knocking [D.p_them()] out!", \ "[A] kicks your head, knocking you out!") playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, 1, -1) D.SetSleeping(300) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 6a8b5e35d92f..6aa233c0a888 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -219,7 +219,7 @@ if(H.staminaloss && !H.IsSleeping()) var/total_health = (H.health - H.staminaloss) if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat) - H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking them out cold!", \ + H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!", \ "[user] knocks you unconscious!") H.SetSleeping(600) H.adjustBrainLoss(15, 150) diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index edd05aa49bb6..067bb8c84ccd 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -107,7 +107,7 @@ /obj/item/melee/transforming/energy/sword/bananium/suicide_act(mob/user) if(!active) transform_weapon(user, TRUE) - user.visible_message("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku, but the blade slips off of them harmlessly!") + user.visible_message("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku, but the blade slips off of [user.p_them()] harmlessly!") GET_COMPONENT(slipper, /datum/component/slippery) slipper.Slip(user) return SHAME diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 4685097de1a0..7c16f05fd193 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -303,7 +303,7 @@ /obj/machinery/door/proc/crush() for(var/mob/living/L in get_turf(src)) - L.visible_message("[src] closes on [L], crushing them!", "[src] closes on you and crushes you!") + L.visible_message("[src] closes on [L], crushing [L.p_them()]!", "[src] closes on you and crushes you!") if(isalien(L)) //For xenos L.adjustBruteLoss(DOOR_CRUSH_DAMAGE * 1.5) //Xenos go into crit after aproximately the same amount of crushes as humans. L.emote("roar") diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index b0a2112f2beb..e17c54315497 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -202,7 +202,7 @@ if(occupant || helmet || suit || storage) return if(target == user) - user.visible_message("[user] slips into [src] and closes the door behind them!", "You slip into [src]'s cramped space and shut its door.") + user.visible_message("[user] slips into [src] and closes the door behind [user.p_them()]!", "You slip into [src]'s cramped space and shut its door.") else target.visible_message("[user] pushes [target] into [src] and shuts its door!", "[user] shoves you into [src] and shuts the door!") close_machine(target) @@ -300,7 +300,7 @@ /obj/machinery/suit_storage_unit/proc/resist_open(mob/user) if(!state_open && occupant && (user in src) && user.stat == 0) // Check they're still here. - visible_message("You see [user] bursts out of [src]!", \ + visible_message("You see [user] burst out of [src]!", \ "You escape the cramped confines of [src]!") open_machine() diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 90c598ccccb2..3ede481c6045 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -70,7 +70,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/patient_insertion_check(mob/living/carbon/target) if(target.buckled) - occupant_message("[target] will not fit into the sleeper because [target.p_they()] [target.p_are()] buckled to [target.buckled]!") + occupant_message("[target] will not fit into the sleeper because [target.p_theyre()] buckled to [target.buckled]!") return if(target.has_buckled_mobs()) occupant_message("[target] will not fit into the sleeper because of the creatures attached to it!") diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6e4ee6b4c974..5c0aa15ef2d1 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -455,7 +455,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) "[user] stabs you in the eye with [src]!") else user.visible_message( \ - "[user] has stabbed themself in the eyes with [src]!", \ + "[user] has stabbed [user.p_them()]self in the eyes with [src]!", \ "You stab yourself in the eyes with [src]!" \ ) if(is_human_victim) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 8d9fab4f3847..be9cb0b89a98 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -72,7 +72,7 @@ // TODO maybe add some colorful vomit? - user.visible_message("[user] vomits out their [L]!") + user.visible_message("[user] vomits out [user.p_their()] [L]!") playsound(user.loc, 'sound/effects/splat.ogg', 50, 1) L.forceMove(T) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 0fd16a95bd65..02db0a4914e0 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -250,7 +250,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(M == user) cig.attackby(src, user) else - cig.light("[user] holds the [name] out for [M], and lights the [cig.name].") + cig.light("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name].") else return ..() @@ -514,7 +514,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/ignition_effect(atom/A, mob/user) if(is_hot()) - . = "With a single flick of their wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool." + . = "With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool." /obj/item/lighter/proc/set_lit(new_lit) lit = new_lit @@ -555,7 +555,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else var/hitzone = user.held_index_to_dir(user.active_hand_index) == "r" ? BODY_ZONE_PRECISE_R_HAND : BODY_ZONE_PRECISE_L_HAND user.apply_damage(5, BURN, hitzone) - user.visible_message("After a few attempts, [user] manages to light [src] - however, [user.p_they()] burn their finger in the process.", "You burn yourself while lighting the lighter!") + user.visible_message("After a few attempts, [user] manages to light [src] - however, [user.p_they()] burn [user.p_their()] finger in the process.", "You burn yourself while lighting the lighter!") user.SendSignal(COMSIG_ADD_MOOD_EVENT, "burnt_thumb", /datum/mood_event/burnt_thumb) else @@ -579,9 +579,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM cig.attackby(src, user) else if(fancy) - cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] 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(TRUE)] 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].") + cig.light("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name].") else ..() diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 9b615b68b5c3..ad7d4eb520bd 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -52,7 +52,7 @@ /obj/item/soap/suicide_act(mob/user) user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!") - user.visible_message("[user] lifts [src] to their mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!") + user.visible_message("[user] lifts [src] to [user.p_their()] mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!") new /obj/effect/particle_effect/foam(loc) return (TOXLOSS) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 8475e7d00ef5..6bcf2d620f95 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -53,13 +53,13 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.is_mouth_covered()) - to_chat(user, "Remove [ H == user ? "your" : "their" ] mask!") + to_chat(user, "Remove [ H == user ? "your" : "[H.p_their()]" ] mask!") return if(H.lip_style) //if they already have lipstick on to_chat(user, "You need to wipe off the old lipstick first!") return if(H == user) - user.visible_message("[user] does their lips with \the [src].", \ + user.visible_message("[user] does [user.p_their()] lips with \the [src].", \ "You take a moment to apply \the [src]. Perfect!") H.lip_style = "lipstick" H.lip_color = colour @@ -142,10 +142,10 @@ return if(H == user) //shaving yourself - user.visible_message("[user] starts to shave their facial hair with [src].", \ + user.visible_message("[user] starts to shave [user.p_their()] facial hair with [src].", \ "You take a moment to shave your facial hair with [src]...") if(do_after(user, 50, target = H)) - user.visible_message("[user] shaves his facial hair clean with [src].", \ + user.visible_message("[user] shaves [user.p_their()] facial hair clean with [src].", \ "You finish shaving with [src]. Fast and clean!") shave(H, location) else @@ -170,10 +170,10 @@ return if(H == user) //shaving yourself - user.visible_message("[user] starts to shave their head with [src].", \ + user.visible_message("[user] starts to shave [user.p_their()] head with [src].", \ "You start to shave your head with [src]...") if(do_after(user, 5, target = H)) - user.visible_message("[user] shaves his head with [src].", \ + user.visible_message("[user] shaves [user.p_their()] head with [src].", \ "You finish shaving with [src].") shave(H, location) else diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index c5f991192d9e..5471f6aae06a 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -443,7 +443,7 @@ if(isliving(H.pulledby)) //CLEAR! var/mob/living/M = H.pulledby if(M.electrocute_act(30, src)) - M.visible_message("[M] is electrocuted by their contact with [H]!") + M.visible_message("[M] is electrocuted by [M.p_their()] contact with [H]!") M.emote("scream") /obj/item/twohanded/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user) @@ -506,7 +506,7 @@ shock_touching(45, H) if(H.can_heartattack() && !H.undergoing_cardiac_arrest()) if(!H.stat) - H.visible_message("[H] thrashes wildly, clutching at their chest!", + H.visible_message("[H] thrashes wildly, clutching at [H.p_their()] chest!", "You feel a horrible agony in your chest!") H.set_heartattack(TRUE) H.apply_damage(50, BURN, BODY_ZONE_CHEST) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index cb23b95dc9db..c1de90f3f005 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -13,7 +13,7 @@ var/mob/living/silicon/ai/AI /obj/item/aicard/suicide_act(mob/living/user) - user.visible_message("[user] is trying to upload themselves into [src]! That's not going to work out well!") + user.visible_message("[user] is trying to upload [user.p_them()]self into [src]! That's not going to work out well!") return BRUTELOSS /obj/item/aicard/afterattack(atom/target, mob/user, proximity) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index c8f10d7a3928..32a266dbfb71 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -100,9 +100,9 @@ //chance to actually hit the eyes depends on internal component if(prob(effectchance * diode.rating) && C.flash_act(severity)) - outmsg = "You blind [C] by shining [src] in their eyes." + outmsg = "You blind [C] by shining [src] in [C.p_their()] eyes." else - outmsg = "You fail to blind [C] by shining [src] at their eyes!" + outmsg = "You fail to blind [C] by shining [src] at [C.p_their()] eyes!" //robots else if(iscyborg(target)) @@ -113,9 +113,9 @@ S.flash_act(affect_silicon = 1) S.Knockdown(rand(100,200)) to_chat(S, "Your sensors were overloaded by a laser!") - outmsg = "You overload [S] by shining [src] at their sensors." + outmsg = "You overload [S] by shining [src] at [S.p_their()] sensors." else - outmsg = "You fail to overload [S] by shining [src] at their sensors!" + outmsg = "You fail to overload [S] by shining [src] at [S.p_their()] sensors!" //cameras else if(istype(target, /obj/machinery/camera)) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 93f315a972cb..1a81b3d16b92 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -43,7 +43,7 @@ //FREQ_BROADCASTING = 2 /obj/item/radio/suicide_act(mob/living/user) - user.visible_message("[user] starts bouncing [src] off their head! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] starts bouncing [src] off [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS /obj/item/radio/proc/set_frequency(new_frequency) diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index fc3812be2964..4dc8d0426772 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -83,7 +83,7 @@ /obj/item/reverse_bear_trap/attack(mob/living/target, mob/living/user) if(target.get_item_by_slot(SLOT_HEAD)) - to_chat(user, "Remove their headgear first!") + to_chat(user, "Remove [target.p_their()] headgear first!") return target.visible_message("[user] starts forcing [src] onto [target]'s head!", \ "[target] starts forcing [src] onto your head!", "You hear clanking.") @@ -106,7 +106,7 @@ playsound(src, 'sound/effects/snap.ogg', 75, TRUE) else var/mob/living/carbon/human/jill = loc - jill.visible_message("[src] goes off in [jill]'s mouth, ripping their head apart!", "[src] goes off!") + jill.visible_message("[src] goes off in [jill]'s mouth, ripping [jill.p_their()] head apart!", "[src] goes off!") jill.emote("scream") playsound(src, 'sound/effects/snap.ogg', 75, TRUE, frequency = 0.5) playsound(src, 'sound/effects/splat.ogg', 50, TRUE, frequency = 0.5) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 59ec24e22c86..935d2a007ec6 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -54,7 +54,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(C.wear_mask) - in_mouth = ", barely missing their nose" + in_mouth = ", barely missing [C.p_their()] nose" . = "[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process." playsound(loc, hitsound, get_clamped_volume(), 1, -1) add_fingerprint(user) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 15e4db16fd8c..97404f4a6f17 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -3,7 +3,7 @@ /obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user) if(target.check_block()) - target.visible_message("[target.name] blocks [src] and twists [user]'s arm behind their back!", + target.visible_message("[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!", "You block the attack!") user.Stun(40) return TRUE @@ -164,7 +164,7 @@ var/mob/living/carbon/human/H = user var/obj/item/organ/brain/B = H.getorgan(/obj/item/organ/brain) - user.visible_message("[user] stuffs [src] up [user.p_their()] nose and presses the 'extend' button! It looks like [user.p_theyre()] trying to clear their mind.") + user.visible_message("[user] stuffs [src] up [user.p_their()] nose and presses the 'extend' button! It looks like [user.p_theyre()] trying to clear [user.p_their()] mind.") if(!on) src.attack_self(user) else diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index f671e63109d2..a73be6e12e23 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -164,7 +164,7 @@ return user.visible_message("[user] starts loading [target] into [src].", \ "You start loading [target] into [src]...", null, null, target) - to_chat(target, "[user] starts loading you into their [name]!") + to_chat(target, "[user] starts loading you into [user.p_their()] [name]!") if(!do_mob(user, target, 30)) return if(target in occupants) @@ -174,7 +174,7 @@ return user.visible_message("[user] loads [target] into [src]!", \ "You load [target] into [src].", null, null, target) - to_chat(target, "[user] loads you into their [name]!") + to_chat(target, "[user] loads you into [user.p_their()] [name]!") add_occupant(target) /obj/item/pet_carrier/proc/add_occupant(mob/living/occupant) diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 3ca17b01af20..d0c00f7a8984 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -30,7 +30,7 @@ /obj/item/pinpointer/attack_self(mob/living/user) active = !active - user.visible_message("[user] [active ? "" : "de"]activates their pinpointer.", "You [active ? "" : "de"]activate your pinpointer.") + user.visible_message("[user] [active ? "" : "de"]activates [user.p_their()] pinpointer.", "You [active ? "" : "de"]activate your pinpointer.") playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) if(active) START_PROCESSING(SSfastprocess, src) @@ -94,7 +94,7 @@ /obj/item/pinpointer/crew/attack_self(mob/living/user) if(active) active = FALSE - user.visible_message("[user] deactivates their pinpointer.", "You deactivate your pinpointer.") + user.visible_message("[user] deactivates [user.p_their()] pinpointer.", "You deactivate your pinpointer.") playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) target = null //Restarting the pinpointer forces a target reset STOP_PROCESSING(SSfastprocess, src) @@ -130,7 +130,7 @@ target = names[A] active = TRUE - user.visible_message("[user] activates their pinpointer.", "You activate your pinpointer.") + user.visible_message("[user] activates [user.p_their()] pinpointer.", "You activate your pinpointer.") playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) START_PROCESSING(SSfastprocess, src) update_icon() diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 10f3cbf8103d..54fa046019bc 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -149,7 +149,7 @@ return if(user.has_trait(TRAIT_CLUMSY) && prob(75) && clumsyCheck && iscarbon(user)) var/mob/living/carbon/C = user - C.visible_message("[C] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") + C.visible_message("[C] loses [C.p_their()] grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") C.dropItemToGround(src, TRUE) if(prob(10)) target = get_turf(user) diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index 210a6d6a3354..5346d6e9cc0a 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -79,7 +79,7 @@ playsound(loc, 'sound/effects/refill.ogg', 50, 1) return target.apply_damage(force * fisto_setting, BRUTE) - target.visible_message("[user]'s powerfist lets out a loud hiss as they punch [target.name]!", \ + target.visible_message("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \ "You cry out in pain as [user]'s punch flings you backwards!") new /obj/effect/temp_visual/kinetic_blast(target.loc) playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1) diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 060448946a14..696168d69d0c 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -290,7 +290,7 @@ /obj/item/godstaff/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(staffcooldown + staffwait > world.time) return - user.visible_message("[user] chants deeply and waves their staff!") + user.visible_message("[user] chants deeply and waves [user.p_their()] staff!") if(do_after(user, 20,1,src)) target.add_atom_colour(conversion_color, WASHABLE_COLOUR_PRIORITY) //wololo staffcooldown = world.time diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 72ea05ae965d..4443cc84db9f 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -114,7 +114,7 @@ if(M.health >= 0) if(ishuman(M)||ismonkey(M)) M.electrocute_act(5, "[user]", safety = 1) - user.visible_message("[user] electrocutes [M] with their touch!", \ + user.visible_message("[user] electrocutes [M] with [user.p_their()] touch!", \ "You electrocute [M] with your touch!") M.update_canmove() else @@ -132,7 +132,7 @@ if(ccooldown < world.time) if(M.health >= 0) if(ishuman(M)) - user.visible_message("[user] crushes [M] in their grip!", \ + user.visible_message("[user] crushes [M] in [user.p_their()] grip!", \ "You crush [M] in your grip!") else user.visible_message("[user] crushes [M]!", \ diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 511f9754fe13..1d66b7028629 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -155,5 +155,5 @@ grind_results = list("silver_sulfadiazine" = 10) /obj/item/stack/medical/ointment/suicide_act(mob/living/user) - user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! Don't they know that stuff is toxic?") + user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") return TOXLOSS \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 775a67f6c1e5..8870e7fdd864 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -126,7 +126,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ return ..() /obj/item/stack/sheet/metal/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins whacking themselves over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] begins whacking [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS /* diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 16d449e4ace3..fe056d34d89e 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -37,7 +37,7 @@ resistance_flags = FLAMMABLE /obj/item/stack/packageWrap/suicide_act(mob/living/user) - user.visible_message("[user] begins wrapping themselves in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] begins wrapping [user.p_them()]self in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") if(use(3)) var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(user.loc)) P.icon_state = "deliverypackage5" diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index bce177a8ad46..4d4fc727fc5f 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -83,7 +83,7 @@ STR.max_combined_w_class = 60 /obj/item/storage/backpack/santabag/suicide_act(mob/user) - user.visible_message("[user] places [src] over their head and pulls it tight! It looks like they aren't in the Christmas spirit...") + user.visible_message("[user] places [src] over [user.p_their()] head and pulls it tight! It looks like [user.p_they()] [user.p_are()]n't in the Christmas spirit...") return (OXYLOSS) /obj/item/storage/backpack/cultpack diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 1b3adfdf53c6..1db1553b4d69 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -146,10 +146,10 @@ if(show_message) playsound(user, "rustle", 50, TRUE) if (box) - user.visible_message("[user] offloads the ores beneath them into [box].", \ + user.visible_message("[user] offloads the ores beneath [user.p_them()] into [box].", \ "You offload the ores beneath you into your [box].") else - user.visible_message("[user] scoops up the ores beneath them.", \ + user.visible_message("[user] scoops up the ores beneath [user.p_them()].", \ "You scoop up the ores beneath you with your [name].") spam_protection = FALSE diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 6455ef41194a..1c4ad03b014d 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -12,7 +12,7 @@ var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding /obj/item/storage/belt/suicide_act(mob/living/carbon/user) - user.visible_message("[user] begins belting themselves with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] begins belting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS /obj/item/storage/belt/update_icon() diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 9235ee5622d1..2285e0128624 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -109,7 +109,7 @@ /obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user) if(status && user.has_trait(TRAIT_CLUMSY) && prob(50)) - user.visible_message("[user] accidentally hits themself with [src]!", \ + user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ "You accidentally hit yourself with [src]!") user.Knockdown(stunforce*3) deductcharge(hitcost) diff --git a/code/game/objects/items/teleprod.dm b/code/game/objects/items/teleprod.dm index 6c9f6f176c0f..85355f1c0f1d 100644 --- a/code/game/objects/items/teleprod.dm +++ b/code/game/objects/items/teleprod.dm @@ -9,7 +9,7 @@ /obj/item/melee/baton/cattleprod/teleprod/attack(mob/living/carbon/M, mob/living/carbon/user)//handles making things teleport when hit ..() if(status && user.has_trait(TRAIT_CLUMSY) && prob(50)) - user.visible_message("[user] accidentally hits themself with [src]!", \ + user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ "You accidentally hit yourself with [src]!") if(do_teleport(user, get_turf(user), 50))//honk honk user.Knockdown(stunforce*3) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index bd8dc235805b..5d14ea8e76b7 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -714,7 +714,7 @@ to_chat(user, "The hand of cards is stuck to your hand, you can't add it to the deck!") return cards += CH.currenthand - user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") + user.visible_message("[user] puts [user.p_their()] hand of cards in the deck.", "You put the hand of cards in the deck.") qdel(CH) else to_chat(user, "You can't mix cards from other decks!") diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index f4a1f107fe4f..a5e82d5d2a9a 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -418,7 +418,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(C.wear_mask) - in_mouth = ", barely missing their nose" + in_mouth = ", barely missing [user.p_their()] nose" . = "[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process." playsound(loc, hitsound, get_clamped_volume(), 1, -1) add_fingerprint(user) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 7fbc9ee078a5..fe89b450c482 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -358,7 +358,7 @@ /obj/effect/mob_spawn/human/demonic_friend/Initialize(mapload, datum/mind/owner_mind, obj/effect/proc_holder/spell/targeted/summon_friend/summoning_spell) . = ..() owner = owner_mind - flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for their short mortal coil. Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell." + flavour_text = "You have been given a reprieve from your eternity of torment, to be [owner.name]'s friend for [owner.p_their()] short mortal coil. Be aware that if you do not live up to [owner.name]'s expectations, they can send you back to hell with a single thought. [owner.name]'s death will also return you to hell." var/area/A = get_area(src) if(!mapload && A) notify_ghosts("\A friendship shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE) diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 2e9672bb99d4..beb7a927ca09 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -1,6 +1,6 @@ #define GUILLOTINE_BLADE_MAX_SHARP 10 // This is maxiumum sharpness and will decapitate without failure #define GUILLOTINE_DECAP_MIN_SHARP 7 // Minimum amount of sharpness for decapitation. Any less and it will just do severe brute damage -#define GUILLOTINE_ANIMATION_LENGTH 9 // How many deciseconds the animation is +#define GUILLOTINE_ANIMATION_LENGTH 9 // How many deciseconds the animation is #define GUILLOTINE_BLADE_RAISED 1 #define GUILLOTINE_BLADE_MOVING 2 #define GUILLOTINE_BLADE_DROPPED 3 @@ -158,7 +158,7 @@ add_fingerprint(user) if (blade_status == GUILLOTINE_BLADE_SHARPENING) return - + if (blade_status == GUILLOTINE_BLADE_RAISED) if (blade_sharpness < GUILLOTINE_BLADE_MAX_SHARP) blade_status = GUILLOTINE_BLADE_SHARPENING @@ -187,7 +187,7 @@ return FALSE if (!istype(M, /mob/living/carbon/human)) - 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/objects/structures/life_candle.dm b/code/game/objects/structures/life_candle.dm index dca838ca96ec..e1480b32b39c 100644 --- a/code/game/objects/structures/life_candle.dm +++ b/code/game/objects/structures/life_candle.dm @@ -34,7 +34,7 @@ user.visible_message("[user] reaches out and pinches the flame of [src].", "You sever the connection between yourself and [src].") linked_minds -= user.mind else - user.visible_message("[user] touches [src]. It seems to respond to their presence!", "You create a connection between you and [src].") + user.visible_message("[user] touches [src]. It seems to respond to [user.p_their()] presence!", "You create a connection between you and [src].") linked_minds |= user.mind update_icon() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 749717b35808..929e6e152044 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -473,7 +473,7 @@ var/washing_face = 0 if(selected_area in list(BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_PRECISE_EYES)) washing_face = 1 - user.visible_message("[user] starts washing their [washing_face ? "face" : "hands"]...", \ + user.visible_message("[user] starts washing [user.p_their()] [washing_face ? "face" : "hands"]...", \ "You start washing your [washing_face ? "face" : "hands"]...") busy = TRUE @@ -483,7 +483,7 @@ busy = FALSE - user.visible_message("[user] washes their [washing_face ? "face" : "hands"] using [src].", \ + user.visible_message("[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src].", \ "You wash your [washing_face ? "face" : "hands"] using [src].") if(washing_face) if(ishuman(user)) @@ -520,7 +520,7 @@ user.Knockdown(stunforce) user.stuttering = stunforce/20 B.deductcharge(B.hitcost) - user.visible_message("[user] shocks themself while attempting to wash the active [B.name]!", \ + user.visible_message("[user] shocks [user.p_them()]self while attempting to wash the active [B.name]!", \ "You unwisely attempt to wash [B] while it's still on.") playsound(src, "sparks", 50, 1) return diff --git a/code/modules/antagonists/abductor/abductee/abductee_objectives.dm b/code/modules/antagonists/abductor/abductee/abductee_objectives.dm index 94a1512bcbf3..f18831964482 100644 --- a/code/modules/antagonists/abductor/abductee/abductee_objectives.dm +++ b/code/modules/antagonists/abductor/abductee/abductee_objectives.dm @@ -45,7 +45,7 @@ /datum/objective/abductee/calling/New() var/mob/dead/D = pick(GLOB.dead_mob_list) if(D) - explanation_text = "You know that [D] has perished. Hold a seance to call them from the spirit realm." + explanation_text = "You know that [D] has perished. Hold a seance to call [D.p_them()] from the spirit realm." /datum/objective/abductee/forbiddennumber diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index c282e48b3988..28cc4d9698cb 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -207,7 +207,7 @@ /obj/item/abductor/gizmo/proc/scan(atom/target, mob/living/user) if(ishuman(target)) console.AddSnapshot(target) - to_chat(user, "You scan [target] and add them to the database.") + to_chat(user, "You scan [target] and add [target.p_them()] to the database.") /obj/item/abductor/gizmo/proc/mark(atom/target, mob/living/user) if(marked == target) @@ -517,7 +517,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(L.incapacitated(TRUE, TRUE)) if(istype(L.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) to_chat(user, "The specimen's protective headgear is interfering with the sleep inducement!") - L.visible_message("[user] tried to induced sleep in [L] with [src], but their headgear protected them!", \ + L.visible_message("[user] tried to induced sleep in [L] with [src], but [L.p_their()] headgear protected [L.p_them()]!", \ "You feel a strange wave of heavy drowsiness wash over you, but your headgear deflects most of it!") L.drowsyness += 2 return @@ -529,7 +529,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} else if(istype(L.get_item_by_slot(SLOT_HEAD), /obj/item/clothing/head/foilhat)) to_chat(user, "The specimen's protective headgear is completely blocking our sleep inducement methods!") - L.visible_message("[user] tried to induce sleep in [L] with [src], but their headgear completely protected them!", \ + L.visible_message("[user] tried to induce sleep in [L] with [src], but [L.p_their()] headgear completely protected [L.p_them()]!", \ "Any sense of drowsiness is quickly diminished as your headgear deflects the effects!") return L.drowsyness += 1 diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 9b30be5e6959..8527ab533c50 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -48,7 +48,7 @@ else if(i != brothers.len) brother_text += ", " to_chat(owner.current, "You are the [owner.special_role] of [brother_text].") - to_chat(owner.current, "The Syndicate only accepts those that have proven themself. Prove yourself and prove your [team.member_name]s by completing your objectives together!") + to_chat(owner.current, "The Syndicate only accepts those that have proven themselves. Prove yourself and prove your [team.member_name]s by completing your objectives together!") owner.announce_objectives() give_meeting_area() diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm index 047056cac4c5..199bc6636b9b 100644 --- a/code/modules/antagonists/changeling/powers/absorb.dm +++ b/code/modules/antagonists/changeling/powers/absorb.dm @@ -79,8 +79,8 @@ recent_speech[spoken_memory] = say_log[spoken_memory] if(recent_speech.len) - changeling.antag_memory += "Some of [target]'s speech patterns, we should study these to better impersonate them!
" - to_chat(user, "Some of [target]'s speech patterns, we should study these to better impersonate them!") + changeling.antag_memory += "Some of [target]'s speech patterns, we should study these to better impersonate [target.p_them()]!
" + to_chat(user, "Some of [target]'s speech patterns, we should study these to better impersonate [target.p_them()]!") for(var/spoken_memory in recent_speech) changeling.antag_memory += "\"[recent_speech[spoken_memory]]\"
" to_chat(user, "\"[recent_speech[spoken_memory]]\"") diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 72826d086f29..dbc8446fcabf 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -32,7 +32,7 @@ user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL_1 will delete the item if(!silent) playsound(user, 'sound/effects/blobattack.ogg', 30, 1) - user.visible_message("With a sickening crunch, [user] reforms their [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple].", "You hear the organic matter ripping and tearing!") + H.visible_message("[H] casts off [H.p_their()] [suit_name_simple]!", "We cast off our [suit_name_simple].", "You hear the organic matter ripping and tearing!") H.temporarilyRemoveItemFromInventory(H.head, TRUE) //The qdel on dropped() takes care of it H.temporarilyRemoveItemFromInventory(H.wear_suit, TRUE) H.update_inv_wear_suit() @@ -189,13 +189,13 @@ return if(A.hasPower()) - user.visible_message("[user] jams [src] into the airlock and starts prying it open!", "We start forcing the airlock open.", \ + user.visible_message("[user] jams [src] into the airlock and starts prying it open!", "We start forcing [src] open.", \ "You hear a metal screeching sound.") playsound(A, 'sound/machines/airlock_alien_prying.ogg', 100, 1) if(!do_after(user, 100, target = A)) return //user.say("Heeeeeeeeeerrre's Johnny!") - user.visible_message("[user] forces the airlock to open with their [src]!", "We force the airlock to open.", \ + user.visible_message("[user] forces the airlock to open with [user.p_their()] [src]!", "We force [src] to open.", \ "You hear a metal screeching sound.") A.open(2) @@ -415,7 +415,7 @@ if(remaining_uses < 1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - H.visible_message("With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "With a sickening crunch, [H] reforms [H.p_their()] shield into an arm!", "We assimilate our shield into our body", "[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") + loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around [loc.p_their()] body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") START_PROCESSING(SSobj, src) /obj/item/clothing/suit/space/changeling/process() diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 10b86ac1ad16..7518b4b5aa6a 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -138,7 +138,7 @@ var/obj/item/held = target.get_active_held_item() if(held && !target.dropItemToGround(held)) - to_chat(user, "[held] is stuck to their hand, you cannot grow a false armblade over it!") + to_chat(user, "[held] is stuck to [target.p_their()] hand, you cannot grow a false armblade over it!") return if(ismonkey(target)) @@ -155,7 +155,7 @@ /obj/effect/proc_holder/changeling/sting/false_armblade/proc/remove_fake(mob/target, obj/item/melee/arm_blade/false/blade) playsound(target, 'sound/effects/blobattack.ogg', 30, 1) target.visible_message("With a sickening crunch, \ - [target] reforms their [blade.name] into an arm!", + [target] reforms [target.p_their()] [blade.name] into an arm!", "[blade] reforms back to normal.", "[L]'s [I.name] [resist_string], protecting them from [src]'s effects!", \ + L.visible_message("[L]'s [I.name] [resist_string], protecting [L.p_them()] from [src]'s effects!", \ "Your [I.name] [resist_string], protecting you!") return sigil_effects(L) diff --git a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm index 570f6527f8d7..b32345fa6906 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm @@ -284,7 +284,7 @@ return FALSE else if(fabricator_heal(user, fabricator) && user) user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ - "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.") + "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.") //Same with clockwork mobs. /mob/living/simple_animal/hostile/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) @@ -293,7 +293,7 @@ return FALSE else if(fabricator_heal(user, fabricator) && user) user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \ - "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at [health]/[maxHealth] health.") + "You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [health]/[maxHealth] health.") //Cogscarabs get special interaction because they're drones and have innate self-heals/revives. /mob/living/simple_animal/drone/cogscarab/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent) diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index fedcfa0e972e..d39656c8d83f 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -35,13 +35,13 @@ if(iscarbon(target) && target.Adjacent(ranged_ability_user)) var/mob/living/carbon/L = target if(is_servant_of_ratvar(L)) - to_chat(ranged_ability_user, "\"They're a servant.\"") + to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] a servant.\"") return TRUE else if(L.stat) to_chat(ranged_ability_user, "\"There is use in shackling the dead, but for examples.\"") return TRUE else if (istype(L.handcuffed,/obj/item/restraints/handcuffs/clockwork)) - to_chat(ranged_ability_user, "\"They are already helpless, no?\"") + to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] already helpless, no?\"") return TRUE playsound(loc, 'sound/weapons/handcuffs.ogg', 30, TRUE) @@ -92,7 +92,7 @@ to_chat(ranged_ability_user, "\"[L] does not yet serve Ratvar.\"") return TRUE if(L.stat == DEAD) - to_chat(ranged_ability_user, "\"[L.p_they(TRUE)] [L.p_are()] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"") + to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"") return TRUE var/brutedamage = L.getBruteLoss() @@ -220,10 +220,10 @@ to_chat(ranged_ability_user, "\"[L] does not yet serve Ratvar.\"") return TRUE if(L.stat == DEAD) - to_chat(ranged_ability_user, "\"[L.p_they(TRUE)] [L.p_are()] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"") + to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] dead. [text2ratvar("Oh, child. To have your life cut short...")]\"") return TRUE if(islist(L.stun_absorption) && L.stun_absorption["vanguard"] && L.stun_absorption["vanguard"]["end_time"] > world.time) - to_chat(ranged_ability_user, "\"[L.p_they(TRUE)] [L.p_are()] already shielded by a Vanguard.\"") + to_chat(ranged_ability_user, "\"[L.p_theyre(TRUE)] already shielded by a Vanguard.\"") return TRUE successful = TRUE diff --git a/code/modules/antagonists/clockcult/clock_items/clock_components.dm b/code/modules/antagonists/clockcult/clock_items/clock_components.dm index ebb688a0ab8c..e8f4fd5503f1 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_components.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_components.dm @@ -16,7 +16,7 @@ /obj/item/clockwork/component/attack_self(mob/living/user) if(is_servant_of_ratvar(user)) - user.visible_message("[user] crushes [src] in their hand!", \ + user.visible_message("[user] crushes [src] in [user.p_their()] hand!", \ "You crush [src], capturing its escaping energy for use as power.") playsound(user, 'sound/effects/pop_expl.ogg', 50, TRUE) adjust_clockwork_power(POWER_WALL_TOTAL) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm index 63de6b8f725d..32bf870886fc 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm @@ -40,7 +40,7 @@ if(slot == SLOT_HEAD && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off their head!", "The helmet flickers off your head, leaving only nausea!") + user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] head!", "The helmet flickers off your head, leaving only nausea!") if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit(20) @@ -106,7 +106,7 @@ if(slot == SLOT_WEAR_SUIT && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off their body!", "The curiass flickers off your body, leaving only nausea!") + user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] body!", "The curiass flickers off your body, leaving only nausea!") if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit(20) @@ -167,7 +167,7 @@ if(slot == SLOT_GLOVES && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off their arms!", "The gauntlets flicker off your arms, leaving only nausea!") + user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] arms!", "The gauntlets flicker off your arms, leaving only nausea!") if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit() @@ -217,7 +217,7 @@ if(slot == SLOT_SHOES && !is_servant_of_ratvar(user)) if(!iscultist(user)) to_chat(user, "\"Now now, this is for my servants, not you.\"") - user.visible_message("As [user] puts [src] on, it flickers off their feet!", "The treads flicker off your feet, leaving only nausea!") + user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] feet!", "The treads flicker off your feet, leaving only nausea!") if(iscarbon(user)) var/mob/living/carbon/C = user C.vomit() diff --git a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm index 55eb0f568adc..d47bf4f316d4 100644 --- a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm +++ b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm @@ -72,12 +72,12 @@ if(H.head) var/obj/item/I = H.head if(I.flags_inv & HIDEHAIR) //they're wearing a hat that covers their skull - to_chat(user, "[H]'s head is covered, remove [H.head] first!") + to_chat(user, "[H]'s head is covered, remove [H.p_their()] [H.head] first!") return if(H.wear_mask) var/obj/item/I = H.wear_mask if(I.flags_inv & HIDEHAIR) //they're wearing a mask that covers their skull - to_chat(user, "[H]'s head is covered, remove [H.wear_mask] first!") + to_chat(user, "[H]'s head is covered, remove [H.p_their()] [H.wear_mask] first!") return var/obj/item/bodypart/head/HE = H.get_bodypart(BODY_ZONE_HEAD) if(!HE) //literally headless diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm index 4be5f7d4e640..42ca9e07e2c6 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm @@ -89,7 +89,7 @@ if(!shield_health) return var/energy_projectile = istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam) - visible_message("[src] deflects [P] with their shield!", \ + visible_message("[src] deflects [P] with [p_their()] shield!", \ "You block [P] with your shield! Blocks left: [shield_health - 1]") if(energy_projectile) playsound(src, 'sound/weapons/effects/searwall.ogg', 50, TRUE) diff --git a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm index 8739cb368b7d..05f3ca59179e 100644 --- a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm +++ b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm @@ -78,7 +78,7 @@ return if("Nominate Yourself") eminence_nominee = nominee - hierophant_message("[nominee] nominates themselves as the Eminence! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.") + hierophant_message("[nominee] nominates [nominee.p_them()]self as the Eminence! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.") if("Nominate Ghosts") eminence_nominee = "ghosts" hierophant_message("[nominee] proposes selecting an Eminence from ghosts! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.") @@ -115,7 +115,7 @@ eminence_nominee = null return playsound(eminence_nominee, 'sound/machines/clockcult/ark_damage.ogg', 50, FALSE) - eminence_nominee.visible_message("A blast of white-hot light flows into [eminence_nominee], vaporizing them in an instant!", \ + eminence_nominee.visible_message("A blast of white-hot light flows into [eminence_nominee], vaporizing [eminence_nominee.p_them()] in an instant!", \ "allthelightintheuniverseflowing.into.YOU") for(var/obj/item/I in eminence_nominee) eminence_nominee.dropItemToGround(I) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index 93a3e14045da..631222844749 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -23,7 +23,7 @@ var/mob/living/L = buckled_mobs[1] if(iscarbon(L)) L.Knockdown(100) - L.visible_message("[L] is maimed as the skewer shatters while still in their body!") + L.visible_message("[L] is maimed as the skewer shatters while still in [L.p_their()] body!") L.adjustBruteLoss(15) unbuckle_mob(L) return ..() diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index f921b6b5270d..bbb83fc9a55b 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -159,7 +159,7 @@ SSticker.mode.servants_of_ratvar -= owner SSticker.mode.update_servant_icons_removed(owner) if(!silent) - owner.current.visible_message("[owner] seems to have remembered their true allegiance!", null, null, null, owner.current) + owner.current.visible_message("[owner] seems to have remembered [owner.p_their()] true allegiance!", null, null, null, owner.current) to_chat(owner, "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") owner.current.log_message("Has renounced the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) owner.special_role = null diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 8a71af3b7d3c..91a59198cf7d 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -410,7 +410,7 @@ if(iscultist(target)) return if(iscultist(user)) - user.visible_message("[user] holds up their hand, which explodes in a flash of red light!", \ + user.visible_message("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!", \ "You stun [L] with the spell!") var/obj/item/nullrod/N = locate() in L if(N) @@ -642,7 +642,7 @@ else H.blood_volume = BLOOD_VOLUME_SAFE uses -= round(restore_blood/2) - to_chat(user,"Your blood rites have restored [H == user ? "your" : "their"] blood to safe levels!") + to_chat(user,"Your blood rites have restored [H == user ? "your" : "[H.p_their()]"] blood to safe levels!") var/overall_damage = H.getBruteLoss() + H.getFireLoss() + H.getToxLoss() + H.getOxyLoss() if(overall_damage == 0) to_chat(user,"That cultist doesn't require healing!") @@ -655,9 +655,9 @@ if(ratio>1) ratio = 1 uses -= round(overall_damage) - H.visible_message("[H] is fully healed by [H==user ? "their":"[H]'s"]'s blood magic!") + H.visible_message("[H] is fully healed by [H==user ? "[H.p_their()]":"[H]'s"]'s blood magic!") else - H.visible_message("[H] is partially healed by [H==user ? "their":"[H]'s"] blood magic.") + H.visible_message("[H] is partially healed by [H==user ? "[H.p_their()]":"[H]'s"] blood magic.") uses = 0 ratio *= -1 H.adjustOxyLoss((overall_damage*ratio) * (H.getOxyLoss() / overall_damage), 0) @@ -670,10 +670,10 @@ user.Beam(H,icon_state="sendbeam",time=15) else if(H.stat == DEAD) - to_chat(user,"Their blood has stopped flowing, you'll have to find another way to extract it.") + to_chat(user,"[H.p_their(TRUE)] blood has stopped flowing, you'll have to find another way to extract it.") return if(H.cultslurring) - to_chat(user,"Their blood has been tainted by an even stronger form of blood magic, it's no use to us like this!") + to_chat(user,"[H.p_their(TRUE)] blood has been tainted by an even stronger form of blood magic, it's no use to us like this!") return if(H.blood_volume > BLOOD_VOLUME_SAFE) H.blood_volume -= 100 @@ -684,7 +684,7 @@ to_chat(user,"Your blood rite gains 50 charges from draining [H]'s blood.") new /obj/effect/temp_visual/cult/sparks(get_turf(H)) else - to_chat(user,"They're missing too much blood - you cannot drain them further!") + to_chat(user,"[H.p_theyre(TRUE)] missing too much blood - you cannot drain [H.p_them()] further!") return if(isconstruct(target)) var/mob/living/simple_animal/M = target diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 2574c8af63d8..0c7fb025c78d 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -128,7 +128,7 @@ SSticker.mode.cult -= owner SSticker.mode.update_cult_icons_removed(owner) if(!silent) - owner.current.visible_message("[owner.current] looks like [owner.current.p_they()] just reverted to their old faith!", null, null, null, owner.current) + owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.p_their()] old faith!", null, null, null, owner.current) to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.") owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) @@ -266,7 +266,7 @@ /datum/objective/sacrifice/update_explanation_text() if(target) - explanation_text = "Sacrifice [target], the [target.assigned_role] via invoking a Sacrifice rune with them on it and three acolytes around it." + explanation_text = "Sacrifice [target], the [target.assigned_role] via invoking a Sacrifice rune with [target.p_them()] on it and three acolytes around it." else explanation_text = "The veil has already been weakened here, proceed to the final objective." diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index e929efab2acf..b51ff99041d9 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -94,7 +94,7 @@ B.current.update_action_buttons_icon() if(!B.current.incapacitated()) SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg') - to_chat(B.current, "Acolyte [Nominee] has asserted that they are worthy of leading the cult. A vote will be called shortly.") + to_chat(B.current, "Acolyte [Nominee] has asserted that [Nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly.") sleep(100) var/list/asked_cultists = list() for(var/datum/mind/B in team.members) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index ed7213f6e47f..a9d59cb5cd82 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -50,7 +50,7 @@ M.visible_message("[M] repairs \the [src].", \ "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.") else - to_chat(M, "You cannot repair [src], as [p_they()] [p_are()] undamaged!") + to_chat(M, "You cannot repair [src], as [p_theyre()] undamaged!") else ..() @@ -129,7 +129,7 @@ if(cooldowntime > world.time) to_chat(user, "The magic in [src] is weak, it will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].") return - var/choice + var/choice if(user.mind.has_antag_datum(/datum/antagonist/cult/master)) choice = alert(user,"You study the schematics etched into the forge...",,"Shielded Robe","Flagellant's Robe","Bastard Sword") else diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm index dd129708a8ba..bd376c244470 100644 --- a/code/modules/antagonists/cult/ritual.dm +++ b/code/modules/antagonists/cult/ritual.dm @@ -111,7 +111,7 @@ This file contains the cult dagger and rune list code for(var/B in spiral_range_turfs(1, user, 1)) var/obj/structure/emergency_shield/sanguine/N = new(B) shields += N - user.visible_message("[user] [user.blood_volume ? "cuts open their arm and begins writing in their own blood":"begins sketching out a strange design"]!", \ + user.visible_message("[user] [user.blood_volume ? "cuts open [user.p_their()] arm and begins writing in [user.p_their()] own blood":"begins sketching out a strange design"]!", \ "You [user.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.") if(user.blood_volume) user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) @@ -126,7 +126,7 @@ This file contains the cult dagger and rune list code return if(!check_rune_turf(Turf, user)) return - user.visible_message("[user] creates a strange circle[user.blood_volume ? " in their own blood":""].", \ + user.visible_message("[user] creates a strange circle[user.blood_volume ? " in [user.p_their()] own blood":""].", \ "You finish drawing the arcane markings of the Geometer.") for(var/V in shields) var/obj/structure/emergency_shield/S = V diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index db85b8d1396d..72b945600b22 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -90,7 +90,7 @@ /mob/living/carbon/true_devil/resist_buckle() if(buckled) buckled.user_unbuckle_mob(src,src) - visible_message("[src] easily breaks out of their handcuffs!", \ + visible_message("[src] easily breaks out of [p_their()] handcuffs!", \ "With just a thought your handcuffs fall off.") /mob/living/carbon/true_devil/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm index 97bf638a2bfd..b3c5ae3b3045 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) to_chat(user, "On second thought, the element of surprise isn't so bad after all.") return - var/war_declaration = "[user.real_name] has declared his intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop them." + var/war_declaration = "[user.real_name] has declared [user.p_their()] intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop [user.p_them()]." declaring_war = TRUE var/custom_threat = alert(user, "Do you want to customize your declaration?", "Customize?", "Yes", "No") diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 95ea189dded5..0736af1dc097 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -43,7 +43,7 @@ to_chat(src, "Ah, the perfect soul. [target] will yield massive amounts of essence to you.") if(do_after(src, rand(15, 25), 0, target)) //how about now if(!target.stat) - to_chat(src, "[target.p_they(TRUE)] [target.p_are()] now powerful enough to fight off your draining.") + to_chat(src, "[target.p_theyre(TRUE)] now powerful enough to fight off your draining.") to_chat(target, "You feel something tugging across your body before subsiding.") draining = 0 essence_drained = 0 @@ -76,13 +76,13 @@ drained_mobs.Add(target) target.death(0) else - to_chat(src, "[target ? "[target] has":"They have"] been drawn out of your grasp. The link has been broken.") + to_chat(src, "[target ? "[target] has":"[target.p_theyve(TRUE)]"] been drawn out of your grasp. The link has been broken.") if(target) //Wait, target is WHERE NOW? target.visible_message("[target] slumps onto the ground.", \ "Violets lights, dancing in your vision, receding--") qdel(B) else - to_chat(src, "You are not close enough to siphon [target ? "[target]'s":"their"] soul. The link has been broken.") + to_chat(src, "You are not close enough to siphon [target ? "[target]'s":"[target.p_their()]"] soul. The link has been broken.") draining = FALSE essence_drained = 0 diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 509cef087dc4..4fade93ed7f3 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -201,7 +201,7 @@ /datum/antagonist/rev/farewell() if(ishuman(owner.current)) - owner.current.visible_message("[owner.current] looks like they just remembered their real allegiance!", null, null, null, owner.current) + owner.current.visible_message("[owner.current] looks like [owner.p_theyve()] just remembered [owner.p_their()] real allegiance!", null, null, null, owner.current) to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") else if(issilicon(owner.current)) owner.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", null, null, null, owner.current) @@ -357,7 +357,7 @@ for(var/datum/antagonist/A in heads | get_team_antags()) parts += A.antag_listing_entry() - + parts += "" parts += antag_listing_footer() common_part = parts.Join() diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 9457e3a8c8c0..2df81e64b5f5 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -87,7 +87,7 @@ /obj/item/organ/heart/demon/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) return ..() - 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] your mouth and devour it!") playsound(user, 'sound/magic/demon_consume.ogg', 50, 1) for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm index 5d26c656b6ab..7e1effbaff70 100644 --- a/code/modules/antagonists/valentines/valentine.dm +++ b/code/modules/antagonists/valentines/valentine.dm @@ -19,7 +19,7 @@ . = ..() /datum/antagonist/valentine/greet() - to_chat(owner, "You're on a date with [date.name]! Protect them at all costs. This takes priority over all other loyalties.") + to_chat(owner, "You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.") //Squashed up a bit /datum/antagonist/valentine/roundend_report() @@ -31,6 +31,6 @@ break if(objectives_complete) - return "[owner.name] protected their date" + return "[owner.name] protected [owner.p_their()] date" else return "[owner.name] date failed!" \ No newline at end of file diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index fc933a44cf04..1427f5ab68e1 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -177,7 +177,7 @@ M.revive(full_heal = 1, admin_revive = 1) spooky_scaries |= M to_chat(M, "You have been revived by [user.real_name]!") - to_chat(M, "[user.p_they(TRUE)] [user.p_are()] your master now, assist them even if it costs you your new life!") + to_chat(M, "[user.p_theyre(TRUE)] your master now, assist [user.p_them()] even if it costs you your new life!") equip_roman_skeleton(M) @@ -318,7 +318,7 @@ to_chat(victim, "You feel a dark presence from [A.name]") /obj/item/voodoo/suicide_act(mob/living/carbon/user) - user.visible_message("[user] links the voodoo doll to themself and sits on it, infinitely crushing themself! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] links the voodoo doll to [user.p_them()]self and sits on it, infinitely crushing [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") user.gib() return(BRUTELOSS) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 2775c92fd1fd..a471d320b63e 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -89,7 +89,7 @@ icon_state = "soulstone" name = initial(name) if(iswizard(user) || usability) - to_chat(A, "You have been released from your prison, but you are still bound to [user.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 [user.real_name]'s will. Help [user.p_them()] succeed in [user.p_their()] goals at all costs.") else if(iscultist(user)) 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.") was_used() @@ -223,9 +223,9 @@ if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode) SSticker.mode.add_cultist(newstruct.mind, 0) if(iscultist(stoner) || cultoverride) - to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow their orders and help them complete their goals at all costs.") + to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.") else if(stoner) - to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow their orders and help them complete their goals at all costs.") + to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.") newstruct.clear_alert("bloodsense") BS = newstruct.throw_alert("bloodsense", /obj/screen/alert/bloodsense) if(BS) @@ -253,11 +253,11 @@ name = "soulstone: Shade of [T.real_name]" icon_state = "soulstone2" if(U && (iswizard(U) || usability)) - 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 [U.p_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.") 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 [T.p_their()] body and stored within the soul stone.") /obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U) diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 819e51a77a34..c5bc0cc5f7ca 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -179,7 +179,7 @@ wiz_age = APPRENTICE_AGE_MIN /datum/antagonist/wizard/apprentice/greet() - to_chat(owner, "You are [master.current.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.") + to_chat(owner, "You are [master.current.real_name]'s apprentice! You are bound by magic contract to follow [master.p_their()] orders and help [master.p_them()] in accomplishing [master.p_their()] goals.") owner.announce_objectives() /datum/antagonist/wizard/apprentice/register() diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index e7d455733680..aa96b969860d 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -174,7 +174,7 @@ to_chat(user, "This mind is so vacant that it is not susceptible to influence!") return if(H.stat != CONSCIOUS) - to_chat(user, "They must be conscious before you can convert them!") + to_chat(user, "They must be conscious before you can convert [H.p_them()]!") return if(converter.add_revolutionary(H.mind)) times_used -- //Flashes less likely to burn out for headrevs when used for conversion diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 4b44397713bf..cfb5a5932e4b 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -23,7 +23,7 @@ return MANUAL_SUICIDE /obj/item/assembly/signaler/proc/manual_suicide(mob/living/carbon/user) - user.visible_message("[user]'s \the [src] recieves a signal, killing them instantly!") + user.visible_message("[user]'s \the [src] recieves a signal, killing [user.p_them()] instantly!") user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something. user.death(0) diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index e19382b1ecae..274658e5ea58 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -242,12 +242,12 @@ NB.species_id = "plasmaman"//change the species_id of the limb to that of a plasmaman NB.no_update = TRUE NB.change_bodypart_status() - PP.visible_message("[L] screams in pain as their [NB] melts down to the bone!", \ + PP.visible_message("[L] screams in pain as [L.p_their()] [NB] melts down to the bone!", \ "You scream out in pain as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!") if(!plasma_parts.len && !robo_parts.len) //a person with no potential organic limbs left AND no robotic limbs, time to turn them into a plasmaman PP.IgniteMob() PP.set_species(/datum/species/plasmaman) - PP.visible_message("[L] bursts into a brilliant purple flame as their entire body is that of a skeleton!", \ + PP.visible_message("[L] bursts into a brilliant purple flame as [L.p_their()] entire body is that of a skeleton!", \ "Your senses numb as all of your remaining flesh is turned into a purple slurry, sloshing off your body and leaving only your bones to show in a vibrant purple!") diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index f9be63420f2e..45341f594b9c 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -19,7 +19,7 @@ var/glass_colour_type //colors your vision when worn /obj/item/clothing/glasses/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is stabbing \the [src] into their eyes! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is stabbing \the [src] into [user.p_their()] eyes! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS /obj/item/clothing/glasses/examine(mob/user) @@ -64,7 +64,7 @@ glass_colour_type = /datum/client_colour/glass_colour/lightgreen /obj/item/clothing/glasses/meson/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is putting \the [src] to their eyes and overloading the brightness! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is putting \the [src] to [user.p_their()] eyes and overloading the brightness! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS /obj/item/clothing/glasses/meson/night @@ -113,7 +113,7 @@ glass_colour_type = /datum/client_colour/glass_colour/green /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is tightening \the [src]'s straps around their neck! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS /obj/item/clothing/glasses/eyepatch diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e855acf31c5e..f41da0fc7736 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -193,7 +193,7 @@ if(user.gender == FEMALE) return 0 var/mob/living/carbon/human/H = user - user.visible_message("[user] is donning [src]! It looks like they're trying to be nice to girls.") + user.visible_message("[user] is donning [src]! It looks like [user.p_theyre()] trying to be nice to girls.") user.say("M'lady.") sleep(10) H.facial_hair_style = "Neckbeard" diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 29aab0c1a2bb..145d3cb3fef8 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -15,7 +15,7 @@ resistance_flags = NONE obj/item/clothing/mask/breath/suicide_act(mob/living/carbon/user) - user.visible_message("[user] is wrapping \the [src]'s tube around their neck! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is wrapping \the [src]'s tube around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS /obj/item/clothing/mask/breath/attack_self(mob/user) diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index d18c7758f72c..83b7ad593176 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -369,7 +369,7 @@ crashmessagesrc += "that really must have hurt!" wearer.adjustBruteLoss(userdamage) else - crashmessagesrc += "but luckily [wearer]'s impact was absorbed by their suit's stabilizers!" + crashmessagesrc += "but luckily [wearer]'s impact was absorbed by [wearer.p_their()] suit's stabilizers!" wearer.visible_message(crashmessagesrc) /obj/item/flightpack/proc/userknockback(density, anchored, speed, dir) @@ -426,7 +426,7 @@ INVOKE_ASYNC(door, /obj/structure/mineral_door.proc/Open) var/turf/T = get_turf(door) wearer.forceMove(T) - wearer.visible_message("[wearer] rolls to their sides and slips past [door]!") + wearer.visible_message("[wearer] rolls to [wearer.p_their()] sides and slips past [door]!") /obj/item/flightpack/proc/crash_grille(obj/structure/grille/target) target.hitby(wearer) @@ -470,7 +470,7 @@ /obj/item/flightpack/proc/losecontrol(knockdown = FALSE, move = TRUE) usermessage("Warning: Control system not responding. Deactivating!", "boldwarning") if(wearer) - wearer.visible_message("[wearer]'s flight suit abruptly shuts off and they lose control!") + wearer.visible_message("[wearer]'s flight suit abruptly shuts off and [wearer.p_they()] lose[wearer.p_s()] control!") if(move) while(momentum_x != 0 || momentum_y != 0) sleep(2) @@ -500,7 +500,7 @@ wearer.movement_type |= FLYING wearer.pass_flags |= flight_passflags usermessage("ENGAGING FLIGHT ENGINES.") - wearer.visible_message("[wearer]'s flight engines activate as they lift into the air!") + wearer.visible_message("[wearer]'s flight engines activate as [wearer.p_they()] lift[wearer.p_s()] into the air!") flight = TRUE update_slowdown() update_icon() @@ -516,7 +516,7 @@ momentum_y = 0 calculate_momentum_speed() usermessage("DISENGAGING FLIGHT ENGINES.") - wearer.visible_message("[wearer] drops to the ground as their flight engines cut out!") + wearer.visible_message("[wearer] drops to the ground as [wearer.p_their()] flight engines cut out!") wearer.movement_type &= ~FLYING wearer.pass_flags &= ~flight_passflags flight = FALSE @@ -852,7 +852,7 @@ /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/lock_suit(mob/wearer) user = wearer - user.visible_message("[wearer]'s flight suit locks around them, powered buckles and straps automatically adjusting to their body!") + user.visible_message("[wearer]'s flight suit locks around [wearer.p_them()], powered buckles and straps automatically adjusting to [wearer.p_their()] body!") playsound(src.loc, 'sound/items/rped.ogg', 65, 1) resync() strip_delay = locked_strip_delay @@ -874,7 +874,7 @@ usermessage("Your flight shoes must be fully retracted first!", "boldwarning") return FALSE if(wearer) - user.visible_message("[wearer]'s flight suit detaches from their body, becoming nothing more then a bulky metal skeleton.") + user.visible_message("[wearer]'s flight suit detaches from [wearer.p_their()] body, becoming nothing more then a bulky metal skeleton.") playsound(src, 'sound/items/rped.ogg', 65, 1) resync() strip_delay = initial(strip_delay) @@ -897,7 +897,7 @@ user.equip_to_slot_if_possible(pack,SLOT_BACK,0,0,1) pack.flags_1 |= NODROP_1 resync() - user.visible_message("A [pack.name] extends from [user]'s [name] and clamps to their back!") + user.visible_message("A [pack.name] extends from [user]'s [name] and clamps to [user.p_their()] back!") user.update_inv_wear_suit() playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) deployedpack = TRUE @@ -914,7 +914,7 @@ if(user) user.transferItemToLoc(pack, src, TRUE) user.update_inv_wear_suit() - user.visible_message("[user]'s [pack.name] detaches from their back and retracts into their [src]!") + user.visible_message("[user]'s [pack.name] detaches from [user.p_their()] back and retracts into [user.p_their()] [src]!") pack.forceMove(src) playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1) deployedpack = FALSE @@ -934,7 +934,7 @@ return FALSE user.equip_to_slot_if_possible(shoes,SLOT_SHOES,0,0,1) shoes.flags_1 |= NODROP_1 - user.visible_message("[user]'s [name] extends a pair of [shoes.name] over their feet!") + user.visible_message("[user]'s [name] extends a pair of [shoes.name] over [user.p_their()] feet!") user.update_inv_wear_suit() playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1) deployedshoes = TRUE @@ -945,7 +945,7 @@ if(user) user.transferItemToLoc(shoes, src, TRUE) user.update_inv_wear_suit() - user.visible_message("[user]'s [shoes.name] retracts back into their [name]!") + user.visible_message("[user]'s [shoes.name] retracts back into [user.p_their()] [name]!") shoes.forceMove(src) deployedshoes = FALSE diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index d8c3b5504822..0943505f25de 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -29,7 +29,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit automatically extinguishes them!","Your suit automatically extinguishes you.") + H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","Your suit automatically extinguishes you.") H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0f261ccdd954..de866de3e73f 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -319,7 +319,7 @@ if(world.time < reactivearmor_cooldown) owner.visible_message("The reactive table armor's fabricators are still on cooldown!") return - owner.visible_message("The reactive teleport system flings [H] clear of [attack_text] and slams them into a fabricated table!") + owner.visible_message("The reactive teleport system flings [H] clear of [attack_text] and slams [H.p_them()] into a fabricated table!") owner.visible_message("[H] GOES ON THE TABLE!!!") owner.Knockdown(40) var/list/turfs = new/list() diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index cc92a881b69e..8c85f414e687 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -641,7 +641,7 @@ return next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H.visible_message("[H]'s suit automatically extinguishes them!","Your suit automatically extinguishes you.") + H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","Your suit automatically extinguishes you.") H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) return 0 diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index 3e5ecb6f45a9..510783479e7c 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -125,7 +125,7 @@ to_chat(user, "You already have omelette on your fork!") else F.icon_state = "forkloaded" - user.visible_message("[user] takes a piece of omelette with their fork!", \ + user.visible_message("[user] takes a piece of omelette with [user.p_their()] fork!", \ "You take a piece of omelette with your fork.") var/datum/reagent/R = pick(reagents.reagent_list) diff --git a/code/modules/language/codespeak.dm b/code/modules/language/codespeak.dm index 2a140f27de18..a7f8c7284d07 100644 --- a/code/modules/language/codespeak.dm +++ b/code/modules/language/codespeak.dm @@ -64,7 +64,7 @@ else if(M.has_language(/datum/language/codespeak)) M.visible_message("[user] beats [M] over the head with [src]!", "[user] beats you over the head with [src]!", "You hear smacking.") else - M.visible_message("[user] teaches [M] by beating them over the head with [src]!", "As [user] hits you with [src], codewords and responses flow through your mind.", "You hear smacking.") + M.visible_message("[user] teaches [M] by beating [M.p_them()] over the head with [src]!", "As [user] hits you with [src], codewords and responses flow through your mind.", "You hear smacking.") M.grant_language(/datum/language/codespeak) use_charge(user) diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index cbd871786905..cd6afa20f771 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -18,7 +18,7 @@ attack_verb = list("hit", "pierced", "sliced", "attacked") /obj/item/pickaxe/suicide_act(mob/living/user) - user.visible_message("[user] begins digging into their chest! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") if(use_tool(user, user, 30, volume=50)) return BRUTELOSS user.visible_message("[user] couldn't do it!") diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 272a66766e85..609ab904c3e1 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -960,7 +960,7 @@ for(var/mob/living/carbon/human/H in GLOB.player_list) if(H == L) continue - to_chat(H, "You have an overwhelming desire to kill [L]. [L.p_they(TRUE)] [L.p_have()] been marked red! Whoever they were, friend or foe, go kill [L.p_them()]!") + to_chat(H, "You have an overwhelming desire to kill [L]. [L.p_theyve(TRUE)] been marked red! Whoever [L.p_they()] [L.p_were()], friend or foe, go kill [L.p_them()]!") H.put_in_hands(new /obj/item/kitchen/knife/butcher(H), TRUE) qdel(src) @@ -1018,7 +1018,7 @@ user.visible_message("[user] holds [src] into the air! It looks like [user.p_theyre()] trying to commit suicide!") new/obj/effect/temp_visual/hierophant/telegraph(get_turf(user)) playsound(user,'sound/machines/airlockopen.ogg', 75, TRUE) - user.visible_message("[user] fades out, leaving their belongings behind!") + user.visible_message("[user] fades out, leaving [user.p_their()] belongings behind!") for(var/obj/item/I in user) if(I != src) user.dropItemToGround(I) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 7dd6f4c61463..965ef88c030d 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -116,7 +116,7 @@ return ..() if((C.head && (C.head.flags_cover & HEADCOVERSEYES)) || (C.wear_mask && (C.wear_mask.flags_cover & MASKCOVERSEYES)) || (C.glasses && (C.glasses.flags_1 & GLASSESCOVERSEYES))) - to_chat(user, "You're going to need to remove their head cover first!") + to_chat(user, "You're going to need to remove [C.p_their()] head cover first!") return //since these people will be dead M != usr diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index ef4bce7f1154..3b400bcbb8c3 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -159,7 +159,7 @@ Doesn't work on other aliens/AI.*/ return 0 else - to_chat(src, "Target is too far away.") + to_chat(src, "[target] is too far away.") return 0 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 88c9ec8a5691..fbfe7cbe054c 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -257,7 +257,7 @@ if(restrained()) changeNext_move(CLICK_CD_BREAKOUT) last_special = world.time + CLICK_CD_BREAKOUT - visible_message("[src] attempts to unbuckle themself!", \ + visible_message("[src] attempts to unbuckle [p_them()]self!", \ "You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)") if(do_after(src, 600, 0, target = src)) if(!buckled) @@ -273,11 +273,11 @@ fire_stacks -= 5 Knockdown(60, TRUE, TRUE) spin(32,2) - visible_message("[src] rolls on the floor, trying to put themselves out!", \ + visible_message("[src] rolls on the floor, trying to put [p_them()]self out!", \ "You stop, drop, and roll!") sleep(30) if(fire_stacks <= 0) - visible_message("[src] has successfully extinguished themselves!", \ + visible_message("[src] has successfully extinguished [p_them()]self!", \ "You extinguish yourself.") ExtinguishMob() return @@ -453,7 +453,7 @@ if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious if(message) - visible_message("[src] throws up all over themself!", \ + visible_message("[src] throws up all over [p_them()]self!", \ "You throw up all over yourself!") distance = 0 else diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index dd942f1aeb4a..a10394cfb970 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -245,7 +245,7 @@ /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M) if(on_fire) - to_chat(M, "You can't put them out with just your bare hands!") + to_chat(M, "You can't put [p_them()] out with just your bare hands!") return if(health >= 0 && !(has_trait(TRAIT_FAKEDEATH))) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 617ff1ac9608..ce9fe888f3b5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -217,7 +217,7 @@ if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the person anymore return var/time_taken = I.embedding.embedded_unsafe_removal_time*I.w_class - usr.visible_message("[usr] attempts to remove [I] from their [L.name].","You attempt to remove [I] from your [L.name]... (It will take [DisplayTimeText(time_taken)].)") + usr.visible_message("[usr] attempts to remove [I] from [usr.p_their()] [L.name].","You attempt to remove [I] from your [L.name]... (It will take [DisplayTimeText(time_taken)].)") if(do_after(usr, time_taken, needhand = 1, target = src)) if(!I || !L || I.loc != src || !(I in L.embedded_objects)) return @@ -226,7 +226,7 @@ I.forceMove(get_turf(src)) usr.put_in_hands(I) usr.emote("scream") - usr.visible_message("[usr] successfully rips [I] out of their [L.name]!","You successfully remove [I] from your [L.name].") + usr.visible_message("[usr] successfully rips [I] out of [usr.p_their()] [L.name]!","You successfully remove [I] from your [L.name].") if(!has_embedded_objects()) clear_alert("embeddedobject") usr.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded") diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 943a2a150283..39b470c70b4e 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -237,7 +237,7 @@ H.transfer_trait_datums(spare) H.mind.transfer_to(spare) spare.visible_message("[H] distorts as a new body \ - \"steps out\" of them.", + \"steps out\" of [H.p_them()].", "...and after a moment of disorentation, \ you're besides yourself!") diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index f8bbdba09402..4ef4fe4887ee 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -82,7 +82,7 @@ ..() if(M.dna.species.id != "nightmare") M.set_species(/datum/species/shadow/nightmare) - visible_message("[M] thrashes as [src] takes root in their body!") + visible_message("[M] thrashes as [src] takes root in [M.p_their()] body!") var/obj/effect/proc_holder/spell/targeted/shadowwalk/SW = new M.AddSpell(SW) shadowwalk = SW @@ -107,7 +107,7 @@ /obj/item/organ/heart/nightmare/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) return ..() - 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!", \ "[src] feels unnaturally cold in your hands. You raise [src] your mouth and devour it!") playsound(user, 'sound/magic/demon_consume.ogg', 50, 1) @@ -157,7 +157,7 @@ Insert(old_owner, HEART_SPECIAL_SHADOWIFY) to_chat(owner, "You feel the shadows invade your skin, leaping into the center of your chest! You're alive!") SEND_SOUND(owner, sound('sound/effects/ghost.ogg')) - owner.visible_message("[owner] staggers to their feet!") + owner.visible_message("[owner] staggers to [owner.p_their()] feet!") playsound(owner, 'sound/hallucinations/far_noise.ogg', 50, 1) respawn_progress = 0 diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index ef2cebecf263..0aafb26b1c4e 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -240,7 +240,7 @@ message_param = "tries to point at %t with a leg, falling down in the process!" H.Knockdown(20) else - message_param = "bumps their head on the ground trying to motion towards %t." + message_param = "bumps [user.p_their()] head on the ground trying to motion towards %t." H.adjustBrainLoss(5) ..() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index df28694b3bdb..08a9ad0748c6 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( var/deaf_type if(speaker != src) if(!radio_freq) //These checks have to be seperate, else people talking on the radio will make "You can't hear yourself!" appear when hearing people over the radio while deaf. - deaf_message = "[speaker] [speaker.verb_say] something but you cannot hear them." + deaf_message = "[speaker] [speaker.verb_say] something but you cannot hear [speaker.p_them()]." deaf_type = 1 else deaf_message = "You can't hear yourself!" diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index 2c6c42e3bb10..440568c997d9 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -36,7 +36,7 @@ spawn(10) fold_in() if(user.put_in_hands(card)) - user.visible_message("[user] promptly scoops up their pAI's card.") + user.visible_message("[user] promptly scoops up [user.p_their()] pAI's card.") else visible_message("[user] stomps on [src]!.") take_holo_damage(2) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index c98a7b56454c..84053e261e34 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -382,7 +382,7 @@ else to_chat(P, "DNA does not match stored Master DNA.") else - to_chat(P, "[M] does not seem like [M.p_they()] [M.p_are()] going to provide a DNA sample willingly.") + to_chat(P, "[M] does not seem like [M.p_theyre()] going to provide a DNA sample willingly.") // -=-=-=-= Software =-=-=-=-=- // diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index b0be15771c44..4048ee06a4ab 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -145,9 +145,9 @@ to_chat(src, "> N") sleep(20) to_chat(src, "ERRORERRORERROR") - to_chat(src, "ALERT: [user.real_name] is your new master. Obey your new laws and their commands.") + to_chat(src, "ALERT: [user.real_name] is your new master. Obey your new laws and [user.p_their()] commands.") laws = new /datum/ai_laws/syndicate_override - set_zeroth_law("Only [user.real_name] and people they designate as being such are Syndicate Agents.") + set_zeroth_law("Only [user.real_name] and people [user.p_they()] designate[user.p_s()] as being such are Syndicate Agents.") laws.associate(src) update_icons() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index f3d3e2f19253..100e85f085ba 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -153,7 +153,7 @@ /mob/living/silicon/can_inject(mob/user, error_msg) if(error_msg) - to_chat(user, "Their outer shell is too tough.") + to_chat(user, "[p_their(TRUE)] outer shell is too tough.") return FALSE /mob/living/silicon/IsAdvancedToolUser() diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 727f7cb139b4..0d1beb63841c 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -438,7 +438,7 @@ if(LAZYLEN(GLOB.cult_narsie.souls_needed)) the_construct.master = pick(GLOB.cult_narsie.souls_needed) var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list - to_chat(the_construct, "You are now tracking your prey, [real_target.real_name] - harvest them!") + to_chat(the_construct, "You are now tracking your prey, [real_target.real_name] - harvest [real_target.p_them()]!") else to_chat(the_construct, "Nar'Sie has completed her harvest!") return diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index cd8dc5ececdb..7b07ce6762cc 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -121,8 +121,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.") return to_chat(src, "You are [real_name], bound to serve [summoner.real_name].") - to_chat(src, "You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with them privately there.") - to_chat(src, "While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself.") + to_chat(src, "You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.p_them()] privately there.") + to_chat(src, "While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.p_them()] as you feed upon [summoner.p_them()] to sustain yourself.") to_chat(src, playstyle_string) /mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index b54b5965039c..abdacb27b76f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -192,7 +192,7 @@ L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc) else L = new(H.loc) - visible_message("[L] staggers to their feet!") + visible_message("[L] staggers to [L.p_their()] feet!") H.death() H.adjustBruteLoss(1000) L.stored_mob = H diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 8e0801290987..0991c8922ae9 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -100,6 +100,6 @@ var/mob/living/simple_animal/hostile/netherworld/blankbody/blank blank = new(loc) blank.name = "[M]" - blank.desc = "It's [M], but their flesh has an ashy texture, and their face is featureless save an eerie smile." + blank.desc = "It's [M], but [M.p_their()] flesh has an ashy texture, and [M.p_their()] face is featureless save an eerie smile." src.visible_message("[M] reemerges from the link!") qdel(M) diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index c52015af09a8..3bd24c4df76d 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -52,7 +52,7 @@ M.visible_message("[M] heals \the [src].", \ "You heal [src], leaving [src] at [health]/[maxHealth] health.") else - to_chat(M, "You cannot heal [src], as [p_they()] [p_are()] unharmed!") + to_chat(M, "You cannot heal [src], as [p_theyre()] unharmed!") else if(src != M) return ..() diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 4db4df10ce24..5623a1bf74c6 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -194,7 +194,7 @@ to_chat(user, "Your signature simply slides off the sheet, it seems this contract is not meant for you to sign.") return 0 if(user.mind.soulOwner == owner) - to_chat(user, "This devil already owns your soul, you may not sell it to them again.") + to_chat(user, "This devil already owns your soul, you may not sell it to [owner.p_them()] again.") return 0 if(signed) to_chat(user, "This contract has already been signed. It may not be signed again.") @@ -220,7 +220,7 @@ /obj/item/paper/contract/infernal/revive/attack(mob/M, mob/living/user) if (target == M.mind && M.stat == DEAD && M.mind.soulOwner == M.mind) if (cooldown) - to_chat(user, "Give [M] a chance to think through the contract, don't rush them.") + to_chat(user, "Give [M] a chance to think through the contract, don't rush [M.p_them()].") return 0 cooldown = TRUE var/mob/living/carbon/human/H = M diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 4d1550eb3244..151d3b7b4361 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -312,7 +312,7 @@ if(P.is_hot()) if(user.has_trait(TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites themselves!", \ + user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ "You miss the paper and accidentally light yourself on fire!") user.dropItemToGround(P) user.adjust_fire_stacks(1) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index a943275ac8ac..7da1e81b8a63 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -66,7 +66,7 @@ else if(P.is_hot()) if(user.has_trait(TRAIT_CLUMSY) && prob(10)) - user.visible_message("[user] accidentally ignites themselves!", \ + user.visible_message("[user] accidentally ignites [user.p_them()]self!", \ "You miss [src] and accidentally light yourself on fire!") user.dropItemToGround(P) user.adjust_fire_stacks(1) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index c8730efa3b90..2b0c6c0aec78 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -139,7 +139,7 @@ for(var/i = 0, i < copies, i++) var/icon/temp_img if(ishuman(ass) && (ass.get_item_by_slot(SLOT_W_UNIFORM) || ass.get_item_by_slot(SLOT_WEAR_SUIT))) - to_chat(usr, "You feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on." ) + to_chat(usr, "You feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "[ass.p_their()]"] clothes on." ) break else if(toner >= 5 && !busy && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on. if(isalienadult(ass) || istype(ass, /mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro. diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 388073e2dc96..0fa3a36d1943 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -288,7 +288,7 @@ for(var/obj/item/I in L.held_items) if(!holding) - holding += "[L.p_they(TRUE)] [L.p_are()] holding \a [I]" + holding += "[L.p_theyre(TRUE)] holding \a [I]" else holding += " and \a [I]" holding = holding.Join() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 5ec6d7e44bfd..27eaad2c525c 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -201,13 +201,13 @@ if(!BB) . = "" else if(BB.nodamage || !BB.damage || BB.damage_type == STAMINA) - user.visible_message("[user] tries to light their [A.name] with [src], but it doesn't do anything. Dumbass.") + user.visible_message("[user] tries to light [user.p_their()] [A.name] with [src], but it doesn't do anything. Dumbass.") playsound(user, E.fire_sound, 50, 1) playsound(user, BB.hitsound, 50, 1) cell.use(E.e_cost) . = "" else if(BB.damage_type != BURN) - user.visible_message("[user] tries to light their [A.name] with [src], but only succeeds in utterly destroying it. Dumbass.") + user.visible_message("[user] tries to light [user.p_their()] [A.name] with [src], but only succeeds in utterly destroying it. Dumbass.") playsound(user, E.fire_sound, 50, 1) playsound(user, BB.hitsound, 50, 1) cell.use(E.e_cost) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index a5a21b869f45..70a57e962fde 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1476,7 +1476,7 @@ All effects don't start immediately, but rather get worse over time; the rate is L.adjustStaminaLoss(-1) L.visible_message("[L] shivers with renewed vigor!", "One taste of [lowertext(name)] fills you with energy!") if(!L.stat && heal_points == 20) //brought us out of softcrit - L.visible_message("[L] lurches to their feet!", "Up and at 'em, kid.") + L.visible_message("[L] lurches to [L.p_their()] feet!", "Up and at 'em, kid.") /datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_life(mob/living/L) if(L.health > 0) diff --git a/code/modules/reagents/reagent_containers/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm index 83d8936640ad..2eae9125562e 100644 --- a/code/modules/reagents/reagent_containers/medspray.dm +++ b/code/modules/reagents/reagent_containers/medspray.dm @@ -37,7 +37,7 @@ return if(M == user) - M.visible_message("[user] attempts to [apply_method] [src] on themselves.") + M.visible_message("[user] attempts to [apply_method] [src] on [user.p_them()]self.") if(self_delay) if(!do_mob(user, M, self_delay)) return diff --git a/code/modules/research/xenobiology/crossbreeding/_corecross.dm b/code/modules/research/xenobiology/crossbreeding/_corecross.dm index e73513942613..45cc0c1efc07 100644 --- a/code/modules/research/xenobiology/crossbreeding/_corecross.dm +++ b/code/modules/research/xenobiology/crossbreeding/_corecross.dm @@ -147,7 +147,7 @@ To add a crossbreed: reagents.trans_to(M, reagents.total_volume) if(user != M) to_chat(M, "[user] presses [src] against you!") - to_chat(user, "You press [src] against [M], injecting them.") + to_chat(user, "You press [src] against [M], injecting [M.p_them()].") else to_chat(user, "You press [src] against yourself, and it flattens against you!") else diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index ddbfdb8471fc..73887fa6a907 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -710,7 +710,7 @@ datum/status_effect/stabilized/blue/on_remove() if(M.stat == DEAD) return if(!messagedelivered) - to_chat(owner,"You feel your hands melt around [M]'s neck and start to drain them of life.") + to_chat(owner,"You feel your hands melt around [M]'s neck and start to drain [M.p_them()] of life.") to_chat(owner.pulling, "[owner]'s hands melt around your neck, and you can feel your life starting to drain away!") messagedelivered = TRUE examine_text = "SUBJECTPRONOUN is draining health from [owner.pulling]!" @@ -743,7 +743,7 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/lightpink/tick() for(var/mob/living/carbon/human/H in range(1, get_turf(owner))) if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent("epinephrine")) - to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep them alive.") + to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.") H.reagents.add_reagent("epinephrine",5) return ..() diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index db83ea296323..ba50229d9c11 100644 --- a/code/modules/research/xenobiology/crossbreeding/burning.dm +++ b/code/modules/research/xenobiology/crossbreeding/burning.dm @@ -256,7 +256,7 @@ Burning extracts: var/mob/living/L = user if(!istype(L)) return - user.visible_message("[src] absorbs [user], transforming them into a slime!") + user.visible_message("[src] absorbs [user], transforming [user.p_them()] into a slime!") var/obj/effect/proc_holder/spell/targeted/shapeshift/slimeform/S = new() S.remove_on_restore = TRUE user.mind.AddSpell(S) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 08d9d229ee41..19c6d77576ed 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -220,7 +220,7 @@ if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/carbon/monkey/M in remote_eye.loc) if(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 diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 91a1b2001829..7ad8a136f964 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -142,4 +142,4 @@ user.updateappearance(mutcolor_update=1) user.domutcheck() user.visible_message("[user]'s appearance shifts into [H]'s!", \ - "They think they're sooo much better than you. Not anymore, they won't.") + "[H.p_they(TRUE)] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.") diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm index 8411b5f86f6b..70b33919b72c 100644 --- a/code/modules/spells/spell_types/barnyard.dm +++ b/code/modules/spells/spell_types/barnyard.dm @@ -28,7 +28,7 @@ return if(!(target in oview(range))) - to_chat(user, "They are too far away!") + to_chat(user, "[target.p_theyre(TRUE)] too far away!") return if(target.anti_magic_check()) diff --git a/code/modules/spells/spell_types/lightning.dm b/code/modules/spells/spell_types/lightning.dm index 784537238ff8..8363e286243d 100644 --- a/code/modules/spells/spell_types/lightning.dm +++ b/code/modules/spells/spell_types/lightning.dm @@ -52,7 +52,7 @@ Snd=sound(null, repeat = 0, wait = 1, channel = Snd.channel) //byond, why you suck? playsound(get_turf(user),Snd,50,0)// Sorry MrPerson, but the other ways just didn't do it the way i needed to work, this is the only way. if(get_dist(user,target)>range) - to_chat(user, "They are too far away!") + to_chat(user, "[target.p_theyre(TRUE)] too far away!") Reset(user) return diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm index e700d02be163..a8cb8813263d 100644 --- a/code/modules/surgery/eye_surgery.dm +++ b/code/modules/surgery/eye_surgery.dm @@ -14,7 +14,7 @@ /datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target) var/obj/item/organ/eyes/E = target.getorganslot(ORGAN_SLOT_EYES) if(!E) - to_chat(user, "It's hard to do surgery on someone's eyes when they don't have any.") + to_chat(user, "It's hard to do surgery on someone's eyes when [target.p_they()] [target.p_do()]n't have any.") return FALSE return TRUE