Merge pull request #13490 from farie82/flash-and-camera-flash

Gives flashes and cameras a light flash
This commit is contained in:
Fox McCloud
2020-06-05 23:18:47 -04:00
committed by GitHub
3 changed files with 16 additions and 10 deletions
+7 -5
View File
@@ -67,20 +67,22 @@
times_used = max(0, times_used) //sanity
/obj/item/flash/proc/try_use_flash(var/mob/user = null)
/obj/item/flash/proc/try_use_flash(mob/user = null)
flash_recharge(user)
if(broken)
return 0
return FALSE
playsound(src.loc, use_sound, 100, 1)
playsound(loc, use_sound, 100, 1)
flick("[initial(icon_state)]2", src)
set_light(2, 1, COLOR_WHITE)
addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2)
times_used++
if(user && !clown_check(user))
return 0
return FALSE
return 1
return TRUE
/obj/item/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1)