shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6288 from Citadel-Station-13/upstream-merge-36920

Browse Source 
[MIRROR] READY flash fixes
This commit is contained in:
deathride58
2018-04-07 00:50:23 +00:00
committed by GitHub
parent 36c9094155 846e040057
commit 863ca69d3f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/assembly/flash.dm
View File

@@ -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, "<span class='danger'>Your [src] emits a blinding light!</span>")
to_chat(user, "<span class='danger'>[src] emits a blinding light!</span>")
/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)