From 1a7c2a1ecac686054913b9d38e5a67ff4eac4fa1 Mon Sep 17 00:00:00 2001
From: AnturK <why@so.serious>
Date: Sun, 20 Dec 2015 21:33:29 +0100
Subject: [PATCH] Fixes emp flashlight firing when storing it

---
 code/game/objects/items/devices/flashlight.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 6e9b4ce89fd..5e56436efc7 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -313,6 +313,8 @@ obj/item/device/flashlight/lamp/bananalamp
 
 /obj/item/device/flashlight/emp/afterattack(atom/A as mob|obj, mob/user, proximity)
 	if(!proximity) return
+	if(istype(A, /obj/item/weapon/storage/) && A.loc == user) 
+		return
 	if (emp_cur_charges > 0)
 		emp_cur_charges -= 1
 		A.visible_message("<span class='danger'>[user] blinks \the [src] at \the [A].", \