From 43e4bd613db045610d6e67eab932dce08e1e5ccc Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 10 Jul 2021 14:12:55 +0100 Subject: [PATCH] [MIRROR] Left-Click Combat Mode Harmbaton (#6823) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Left-Click Combat Mode Harmbaton (#60085) * Left-Click Combat Mode Harmbaton Co-authored-by: 小月猫 --- code/game/objects/items/stunbaton.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 0f416e0cf30..28be1dc7db0 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -212,6 +212,10 @@ else to_chat(user, span_danger("The baton is still charging!")) return + else if(user.combat_mode && !turned_on) + ..() + user.do_attack_animation(M) + return else M.visible_message(span_warning("[user] prods [M] with [src]. Luckily it was off."), \ span_warning("[user] prods you with [src]. Luckily it was off."))