From c80704e7243455387d51263cef1dbec365886da8 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Tue, 1 May 2018 16:45:54 -0500 Subject: [PATCH] Conjugating verbs is hard --- code/datums/spells/mind_transfer.dm | 2 +- code/game/dna/dna_modifier.dm | 2 +- code/game/gamemodes/vampire/vampire_powers.dm | 2 +- code/game/machinery/Sleeper.dm | 2 +- code/game/machinery/cryo.dm | 4 ++-- code/game/machinery/cryopod.dm | 2 +- code/game/objects/items/weapons/cigs.dm | 4 ++-- code/game/objects/items/weapons/implants/implantchair.dm | 2 +- code/game/objects/items/weapons/tape.dm | 2 +- code/modules/mob/living/carbon/human/interactive/functions.dm | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 43ca8590af3..d6a48d25c68 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -32,7 +32,7 @@ Also, you never added distance checking after target is selected. I've went ahea return if(!target.key || !target.mind) - to_chat(user, "[target.p_they(TRUE)] appear to be catatonic. Not even magic can affect [target.p_their()] vacant mind.") + to_chat(user, "[target.p_they(TRUE)] appear[target.p_s()] to be catatonic. Not even magic can affect [target.p_their()] vacant mind.") return if(user.suiciding) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index d119a94fac1..93d9977b5e8 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -192,7 +192,7 @@ return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - to_chat(usr, "[L.name] will not fit into the [src] because [L.p_they()] have a slime latched onto [L.p_their()] head.") + to_chat(usr, "[L.name] will not fit into the [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") return if(L == user) visible_message("[user] climbs into the [src].") diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 499382cb447..1e77967b1f6 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -346,7 +346,7 @@ ticker.mode.vampire_enthralled[H.mind] = user.mind H.mind.special_role = SPECIAL_ROLE_VAMPIRE_THRALL to_chat(H, "You have been Enthralled by [user]. Follow [user.p_their()] every command.") - to_chat(user, "You have successfully Enthralled [H]. If [H.p_they()] refuse to do as you say just adminhelp.") + to_chat(user, "You have successfully Enthralled [H]. If [H.p_they()] refuse[H.p_s()] to do as you say just adminhelp.") add_attack_logs(user, H, "Vampire-thralled") diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 1e997cc6a59..6d1e10de6a4 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -338,7 +338,7 @@ return for(var/mob/living/carbon/slime/M in range(1,GG.affecting)) if(M.Victim == GG.affecting) - to_chat(usr, "[GG.affecting.name] will not fit into the sleeper because [GG.affecting.p_they()] have a slime latched onto [GG.affecting.p_their()] head.") + to_chat(usr, "[GG.affecting.name] will not fit into the sleeper because [GG.affecting.p_they()] [GG.affecting.p_have()] a slime latched onto [GG.affecting.p_their()] head.") return visible_message("[user] starts putting [GG.affecting.name] into the sleeper.") diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 77ae7f56a5b..36a05e0442e 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -108,7 +108,7 @@ return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - to_chat(usr, "[L.name] will not fit into the cryo cell because [L.p_they()] have a slime latched onto [L.p_their()] head.") + to_chat(usr, "[L.name] will not fit into the cryo cell because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") return if(put_mob(L)) if(L == user) @@ -301,7 +301,7 @@ return for(var/mob/living/carbon/slime/M in range(1,GG.affecting)) if(M.Victim == GG.affecting) - to_chat(usr, "[GG.affecting.name] will not fit into the cryo because [GG.affecting.p_they()] have a slime latched onto [GG.affecting.p_their()] head.") + to_chat(usr, "[GG.affecting.name] will not fit into the cryo because [GG.affecting.p_they()] [GG.affecting.p_have()] a slime latched onto [GG.affecting.p_their()] head.") return var/mob/M = GG.affecting if(put_mob(M)) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 1c9352eccab..80db23c59f7 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -551,7 +551,7 @@ for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - to_chat(usr, "[L.name] will not fit into the cryo pod because [L.p_they()] have a slime latched onto [L.p_their()] head.") + to_chat(usr, "[L.name] will not fit into the cryo pod because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") return diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index deea4572f93..73ff43abbde 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -54,7 +54,7 @@ LIGHTERS ARE IN LIGHTERS.DM if(istype(M) && M.on_fire) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(M) - light("[user] coldly lights the [name] with the burning body of [M]. Clearly, [user.p_they()] offer the warmest of regards...") + light("[user] coldly lights the [name] with the burning body of [M]. Clearly, [user.p_they()] offer[user.p_s()] the warmest of regards...") return 1 else return ..() @@ -88,7 +88,7 @@ LIGHTERS ARE IN LIGHTERS.DM else if(istype(W, /obj/item/melee/energy/sword/saber)) var/obj/item/melee/energy/sword/saber/S = W if(S.active) - light("[user] swings their [W], barely missing their nose. [user.p_they(TRUE)] light [user.p_their()] [name] in the process.") + light("[user] swings their [W], barely missing their nose. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] in the process.") else if(istype(W, /obj/item/assembly/igniter)) light("[user] fiddles with [W], and manages to light [user.p_their()] [name].") diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 703054795f2..314077db68e 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -79,7 +79,7 @@ return var/mob/M = G.affecting if(M.buckled_mob) - to_chat(usr, "[M] will not fit into [src] because [M.p_they()] have a slime latched onto [M.p_their()] head.") + to_chat(usr, "[M] will not fit into [src] because [M.p_they()] [M.p_have()] a slime latched onto [M.p_their()] head.") return if(put_mob(M)) qdel(G) diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index c160ed7e5c2..4db8645f693 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -18,7 +18,7 @@ else if(amount < 2) to_chat(user, "You'll need more tape for this!") else if(!M.check_has_mouth()) - to_chat(user, "[M.p_they()] have no mouth to tape over!") + to_chat(user, "[M.p_they()] [M.p_have()] no mouth to tape over!") else if(M == user) to_chat(user, "You try to tape your own mouth shut.") diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm index 8399a280dfc..8266295ca89 100644 --- a/code/modules/mob/living/carbon/human/interactive/functions.dm +++ b/code/modules/mob/living/carbon/human/interactive/functions.dm @@ -631,7 +631,7 @@ TARGET = newSnack newSnack.reagents.remove_any((newSnack.reagents.total_volume/2)-1) newSnack.name = "Synthetic [newSnack.name]" - custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as [p_they()] vomit[p_s()] [newSnack] from [p_their] mouth!") + custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as [p_they()] vomit[p_s()] [newSnack] from [p_their()] mouth!") catch(var/exception/e) log_runtime(e, src, "Caught in SNPC cooking module") doing &= ~SNPC_SPECIAL