From 765256e61a8ce04a2c8fd572e2f7210b1df64f97 Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Fri, 23 Sep 2016 16:53:16 -0400
Subject: [PATCH] EMPing a flash will now only flash the person holding it

---
 code/modules/assembly/flash.dm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index f174129c534..4b8d3042fc6 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -48,7 +48,8 @@
 		crit_fail = 1
 		update_icon()
 		var/turf/T = get_turf(src)
-		T.visible_message("The [src.name] burns out!")
+		if(T)
+			T.visible_message("[src] burns out!")
 
 
 /obj/item/device/assembly/flash/proc/flash_recharge(interval=10)
@@ -135,10 +136,10 @@
 
 
 /obj/item/device/assembly/flash/emp_act(severity)
-	if(!try_use_flash() || !loc)
+	if(!try_use_flash())
 		return 0
-	for(var/mob/living/carbon/M in viewers(3, loc))
-		flash_carbon(M, null, 10, 0)
+	if(iscarbon(loc))
+		flash_carbon(loc, null, 10, 0)
 	burn_out()
 	..()