From f0a649f4ab7eb8a6109fa6ffb587bbd40166d376 Mon Sep 17 00:00:00 2001 From: Rhials Date: Wed, 14 Sep 2022 22:34:42 -0400 Subject: [PATCH] Makes the Sepia/Timefreeze cameras not burn out after a single use. (#69796) Removes the "used" variable from the sepia/timefreeze cameras. This does not increase the camera's film capacity at all, but they can be refilled for another single shot using camera film. --- .../xenobiology/crossbreeding/_misc.dm | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index b827a1fa329..8f12d7c2733 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -12,7 +12,6 @@ Slimecrossing Items pictures_max = 1 can_customise = FALSE default_picture_name = "A nostalgic picture" - var/used = FALSE /datum/saved_bodypart var/obj/item/bodypart/old_part @@ -58,16 +57,15 @@ Slimecrossing Items /obj/item/camera/rewind/afterattack(atom/target, mob/user, flag) if(!on || !pictures_left || !isturf(target.loc)) return - if(!used)//selfie time - if(user == target) - to_chat(user, span_notice("You take a selfie!")) - else - to_chat(user, span_notice("You take a photo with [target]!")) - to_chat(target, span_notice("[user] takes a photo with you!")) - to_chat(target, span_boldnotice("You'll remember this moment forever!")) - used = TRUE - target.AddComponent(/datum/component/dejavu, 2) + if(user == target) + to_chat(user, span_notice("You take a selfie!")) + else + to_chat(user, span_notice("You take a photo with [target]!")) + to_chat(target, span_notice("[user] takes a photo with you!")) + to_chat(target, span_boldnotice("You'll remember this moment forever!")) + + target.AddComponent(/datum/component/dejavu, 2) .=..() @@ -78,15 +76,11 @@ Slimecrossing Items desc = "They say a picture is like a moment stopped in time." pictures_left = 1 pictures_max = 1 - var/used = FALSE /obj/item/camera/timefreeze/afterattack(atom/target, mob/user, flag) if(!on || !pictures_left || !isturf(target.loc)) return - if(!used) //refilling the film does not refill the timestop - new /obj/effect/timestop(get_turf(target), 2, 50, list(user)) - used = TRUE - desc = "This camera has seen better days." + new /obj/effect/timestop(get_turf(target), 2, 50, list(user)) . = ..() //Hypercharged slime cell - Charged Yellow