From ddb6f7ebae910a09a8007dcd74a639aa77c30d0b Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Mon, 16 Apr 2018 17:19:42 -0700 Subject: [PATCH] Esword cig lighting messages fix (#37216) * fix esword cig lighting message `Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.` * fix desword cig lighting message `Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.` * check fix * desword check fix * suggested message replacement * suggested message change desword --- code/game/objects/items/melee/energy.dm | 4 ++-- code/game/objects/items/twohanded.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index c25a9a2852..27db9a7e0a 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -53,9 +53,9 @@ var/in_mouth = "" if(iscarbon(user)) var/mob/living/carbon/C = user - if(C.wear_mask == src) + if(C.wear_mask) in_mouth = ", barely missing their nose" - . = "[user] swings their [src][in_mouth]. They light [A] in the process." + . = "[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/twohanded.dm b/code/game/objects/items/twohanded.dm index 50d90684da..34a40b32a8 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -417,9 +417,9 @@ var/in_mouth = "" if(iscarbon(user)) var/mob/living/carbon/C = user - if(C.wear_mask == src) + if(C.wear_mask) in_mouth = ", barely missing their nose" - . = "[user] swings [user.p_their()] [src][in_mouth]. [user.p_they()] light[user.p_s()] [A] in the process." + . = "[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) // Light your candles while spinning around the room