From ec33b8f8c9ee324af2a448f7b0575a7f090634b7 Mon Sep 17 00:00:00 2001 From: Morrow Date: Tue, 3 Oct 2023 23:06:09 -0400 Subject: [PATCH 1/2] Initial --- code/modules/paperwork/photography.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index e004715f326a..8689ea5c45db 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -184,6 +184,7 @@ for(var/atom/A in the_turf) if(A.invisibility) continue atoms.Add(A) + CHECK_TICK // Sort the atoms into their layers var/list/sorted = sort_atoms_by_layer(atoms) @@ -209,6 +210,7 @@ xoff+=A:step_x yoff+=A:step_y res.Blend(IM, blendMode2iconMode(A.blend_mode), A.pixel_x + xoff, A.pixel_y + yoff) + CHECK_TICK // Lastly, render any contained effects on top. for(var/turf/the_turf as anything in turfs) @@ -218,6 +220,7 @@ var/image/IM = getFlatIcon(the_turf.loc) if(IM) res.Blend(IM, blendMode2iconMode(the_turf.blend_mode),xoff,yoff) + CHECK_TICK return res @@ -262,6 +265,7 @@ var/list/turf/turfs = RANGE_TURFS(radius, target) & view(world_view_size + radius, user.client) for(var/turf/T as anything in turfs) mobs += get_mobs(T) + CHECK_TICK var/datum/picture/P = createpicture(target, user, turfs, mobs, flag) printpicture(user, P) From 7140dd5908cab40d8c054c1b6f5a467b51fd6504 Mon Sep 17 00:00:00 2001 From: Morrow Date: Tue, 3 Oct 2023 23:16:21 -0400 Subject: [PATCH 2/2] Move this so people aren't confused when they click and wait a second for things to happen --- code/modules/paperwork/photography.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 8689ea5c45db..13615150ca67 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -246,13 +246,15 @@ /obj/item/device/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) if(!on || !pictures_left || ismob(target.loc) || isstorage(target.loc)) return if(user.contains(target) || istype(target, /atom/movable/screen)) return - captureimage(target, user, flag) playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 15, 1) pictures_left-- desc = "A polaroid camera. It has [pictures_left] photos left." to_chat(user, SPAN_NOTICE("[pictures_left] photos left.")) + + captureimage(target, user, flag) + icon_state = icon_off on = 0 spawn(64)