From ef2c7af6a036ddc828da66a74428999028f3026c Mon Sep 17 00:00:00 2001 From: Kilakk Date: Thu, 23 May 2013 16:24:53 -0400 Subject: [PATCH] Telescopic baton message fix. Fixed first- and third- person extend/collapse messages for the telescopic baton, woo --- code/game/objects/items/weapons/swords_axes_etc.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index f8e24e1d858..24d622bff1a 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -120,8 +120,8 @@ /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("\red You extend the baton.",\ - "\red With a flick of their wrist, [user] extends their telescopic baton.",\ + user.visible_message("\red With a flick of their wrist, [user] extends their telescopic baton.",\ + "\red You extend the baton.",\ "You hear an ominous click.") icon_state = "telebaton_1" item_state = "telebaton_1" @@ -129,8 +129,8 @@ force = 15//quite robust attack_verb = list("smacked", "struck", "slapped") else - user.visible_message("\blue You collapse the baton.",\ - "\blue [user] collapses their telescopic baton.",\ + user.visible_message("\blue [user] collapses their telescopic baton.",\ + "\blue You collapse the baton.",\ "You hear a click.") icon_state = "telebaton_0" item_state = "telebaton_0"