From fdf5ac35ee5fa20fa87cc4bda7043adf34254561 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sun, 5 Jul 2020 22:07:17 -0400 Subject: [PATCH] Fixes some minor ingition_message grammar issues (#51889) --- code/game/objects/items/dualsaber.dm | 2 +- code/modules/projectiles/guns/energy.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index ca0109d15cb..b8689c2faca 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -159,7 +159,7 @@ var/mob/living/carbon/C = user if(C.wear_mask) 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." + . = "[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [A.loc == user ? "[user.p_their()] [A.name]" : A] in the process." playsound(loc, hitsound, get_clamped_volume(), TRUE, -1) add_fingerprint(user) // Light your candles while spinning around the room diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index dfb0a93f8d0..ea96c4718de 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -139,7 +139,7 @@ update_icon() return -/obj/item/gun/energy/update_icon_state() +/obj/item/gun/energy/update_icon_state() //fuck if(initial(inhand_icon_state)) return var/ratio = get_charge_ratio() @@ -223,13 +223,13 @@ if(!BB) . = "" else if(BB.nodamage || !BB.damage || BB.damage_type == STAMINA) - user.visible_message("[user] tries to light [user.p_their()] [A.name] with [src], but it doesn't do anything. Dumbass.") + user.visible_message("[user] tries to light [A.loc == user ? "[user.p_their()] [A.name]" : A] with [src], but it doesn't do anything. Dumbass.") playsound(user, E.fire_sound, 50, TRUE) playsound(user, BB.hitsound, 50, TRUE) cell.use(E.e_cost) . = "" else if(BB.damage_type != BURN) - user.visible_message("[user] tries to light [user.p_their()] [A.name] with [src], but only succeeds in utterly destroying it. Dumbass.") + user.visible_message("[user] tries to light [A.loc == user ? "[user.p_their()] [A.name]" : A] with [src], but only succeeds in utterly destroying it. Dumbass.") playsound(user, E.fire_sound, 50, TRUE) playsound(user, BB.hitsound, 50, TRUE) cell.use(E.e_cost) @@ -239,4 +239,4 @@ playsound(user, E.fire_sound, 50, TRUE) playsound(user, BB.hitsound, 50, TRUE) cell.use(E.e_cost) - . = "[user] casually lights their [A.name] with [src]. Damn." + . = "[user] casually lights [A.loc == user ? "[user.p_their()] [A.name]" : A] with [src]. Damn."