From 41b90f01e23a689ad13cabdc2094d2f6581c10c2 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Fri, 6 Apr 2018 02:05:48 -0700 Subject: [PATCH 1/2] READY flash fixes (#36920) * flash fixes * switches to get_turf * fixes the fix * parent call and comment added the comment so it doesnt get removed again by accident --- code/modules/assembly/flash.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 0c9735ce4d..2b0e3af514 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -71,7 +71,7 @@ /obj/item/device/assembly/flash/proc/AOE_flash(bypass_checks = FALSE, range = 3, power = 5, targeted = FALSE, mob/user) if(!bypass_checks && !try_use_flash()) return FALSE - var/list/mob/targets = get_flash_targets(loc, range, FALSE) + var/list/mob/targets = get_flash_targets(get_turf(src), range, FALSE) if(user) targets -= user for(var/mob/living/carbon/C in targets) @@ -150,7 +150,7 @@ return FALSE if(!AOE_flash(FALSE, 3, 5, FALSE, user)) return FALSE - to_chat(user, "Your [src] emits a blinding light!") + to_chat(user, "[src] emits a blinding light!") /obj/item/device/assembly/flash/emp_act(severity) if(!try_use_flash()) @@ -159,6 +159,11 @@ burn_out() . = ..() +/obj/item/device/assembly/flash/activate()//AOE flash on signal recieved + if(!..()) + return + AOE_flash() + /obj/item/device/assembly/flash/proc/terrible_conversion_proc(mob/living/carbon/human/H, mob/user) if(istype(H) && ishuman(user) && H.stat != DEAD) if(user.mind)