From 36dd0889bf7825bae4789beff1fe20c6ab3e87d5 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Thu, 24 Dec 2015 06:25:36 -0800 Subject: [PATCH] fixes flashes being stupid on emp. now, if i understand this code right, the old code would flash in the viewers(3) of ***FUCKING USR*** on emp, meaning the person to trigger the emp, not the person holding the flash. The documents say that if the second arg is null, ***it defaults to usr.*** I have it doing loc because this way it flashes from inside a pocket, but not a backpack or other container. --- code/modules/assembly/flash.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index fa176aea591..f4acecd0841 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -132,9 +132,9 @@ /obj/item/device/assembly/flash/emp_act(severity) - if(!try_use_flash()) + if(!try_use_flash() || !loc) return 0 - for(var/mob/living/carbon/M in viewers(3, null)) + for(var/mob/living/carbon/M in viewers(3, loc)) flash_carbon(M, null, 10, 0) burn_out() ..()