From d065268efdb0bb4c50d9c726639fd7fb9d446c26 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 25 May 2020 21:15:26 +0200 Subject: [PATCH 1/3] Gives flashes and cameras a flash --- code/game/objects/items/devices/flash.dm | 4 +++- code/modules/paperwork/photography.dm | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index b8602e671c3..6c2379b7606 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -67,7 +67,7 @@ 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) @@ -75,6 +75,8 @@ playsound(src.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)) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 8d0525c5eb1..1134f7a0752 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -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, "[pictures_left] photos left.") 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 From caaa43439f4302418bd7ff31d70fb253bd58e4d1 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 25 May 2020 21:19:51 +0200 Subject: [PATCH 2/3] Small refactor --- code/game/objects/items/devices/flash.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 6c2379b7606..58848f3f7e4 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -71,18 +71,18 @@ 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) From 881b5c748cce342ca51993a93888f22222169857 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 25 May 2020 23:17:13 +0200 Subject: [PATCH 3/3] include flashers --- code/game/machinery/flasher.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index b7b7e35eef6..57057ad510a 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -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)