cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39810 from AnturK/flashwithoutuser

Browse Source 
Fixes flash logging for emp/remote activation.
This commit is contained in:
Jordan Brown
2018-08-21 10:49:25 -04:00
committed by GitHub
parent e470c965f8 f7d3bd20f6
commit b2c534e848
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/flash.dm
+4 -1
View File
@@ -104,7 +104,10 @@
/obj/item/assembly/flash/proc/flash_carbon(mob/living/carbon/M, mob/user, power = 15, targeted = TRUE, generic_message = FALSE)
if(!istype(M))
return
log_combat(user, M, "[targeted? "flashed(targeted)" : "flashed(AOE)"]", src)
if(user)
log_combat(user, M, "[targeted? "flashed(targeted)" : "flashed(AOE)"]", src)
else //caused by emp/remote signal
M.log_message("was [targeted? "flashed(targeted)" : "flashed(AOE)"]",LOG_ATTACK)
if(generic_message && M != user)
to_chat(M, "<span class='disarm'>[src] emits a blinding light!</span>")
if(targeted)