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
+2
View File
@@ -58,6 +58,8 @@
playsound(loc, 'sound/weapons/flash.ogg', 100, 1)
flick("[base_state]_flash", src)
set_light(2, 1, COLOR_WHITE)
addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2)
last_flash = world.time
use_power(1000)
+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)
+7 -5
View File
@@ -324,24 +324,26 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]."
return mob_detail
/obj/item/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if(!on || !pictures_left || ismob(target.loc)) return
/obj/item/camera/afterattack(atom/target, mob/user, flag)
if(!on || !pictures_left || ismob(target.loc))
return
captureimage(target, user, flag)
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3)
set_light(3, 2, LIGHT_COLOR_TUNGSTEN)
addtimer(CALLBACK(src, /atom./proc/set_light, 0), 2)
pictures_left--
desc = "A polaroid camera. It has [pictures_left] photos left."
to_chat(user, "<span class='notice'>[pictures_left] photos left.</span>")
icon_state = icon_off
on = 0
on = FALSE
if(istype(src,/obj/item/camera/spooky))
if(user.mind && user.mind.assigned_role == "Chaplain" && see_ghosts)
if(prob(24))
handle_haunt(user)
spawn(64)
icon_state = icon_on
on = 1
on = TRUE
/obj/item/camera/proc/can_capture_turf(turf/T, mob/user)
var/viewer = user