From 2b06ab2c88f6f44bd6ec3880645fb801c1bd28f9 Mon Sep 17 00:00:00 2001
From: LordFowl <pundanar@gmail.com>
Date: Sat, 17 Mar 2018 12:15:01 -0400
Subject: [PATCH] Fixes batons mkII (#4422)

Fixes a logic error in new batons, this time with 87% less dev commits. I'd put high priority but it only affects IPCs and fuck 'em.
---
 code/game/objects/items/weapons/stunbaton.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 6c7ad5958d7..9fe37ef7ebc 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -156,7 +156,8 @@
 					return 1
 				else
 					H.visible_message("<span class='danger'>[L] has been prodded in the [affecting.name] with [src] by [user]!</span>")
-					H.electrocute_act(force * 2, src, ground_zero = target_zone)
+					if(!sheathed)
+						H.electrocute_act(force * 2, src, ground_zero = target_zone)
 		else
 			if(!status)
 				L.visible_message("<span class='warning'>[L] has been prodded with [src] by [user]. Luckily it was off.</span>")