From 8df12c8e2909b91ccd5c8cf717bb1908a76f24bf Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 20 Apr 2026 07:31:39 -0400 Subject: [PATCH] Even More Misc HardDels (#22299) Just a few more misc hard dels I found from the logs today. Not counting the event round which inexplicably had hundreds of them. --- code/game/machinery/camera/camera.dm | 8 ++++++++ code/game/objects/items/bodybag.dm | 5 +++++ code/game/objects/structures/door_assembly.dm | 5 +++++ code/modules/paperwork/paper.dm | 14 ++++++++++++-- code/modules/paperwork/paper_bundle.dm | 5 +++++ .../hellfirejag-even-more-misc-harddels.yml | 4 ++++ 6 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/hellfirejag-even-more-misc-harddels.yml diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 4785041f454..a2700133784 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -87,6 +87,14 @@ QDEL_NULL(assembly) cancelCameraAlarm(force = TRUE) + cancelAlarm() + + for(var/mob/target in motionTargets.Copy()) + lostTarget(target) + + if(area_motion && area_motion.motioncamera == src) + area_motion.motioncamera = null + area_motion = null QDEL_NULL(wires) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 66f5db7ad4e..e52981ab3e2 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -159,6 +159,10 @@ if(stasis_power) C.stasis_power = stasis_power +/obj/item/bodybag/cryobag/Destroy() + color = null + return ..() + /obj/structure/closet/body_bag/cryobag name = "stasis bag" desc = "A reusable plastic bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ @@ -195,6 +199,7 @@ /obj/structure/closet/body_bag/cryobag/Destroy() STOP_PROCESSING(SSprocessing, src) QDEL_NULL(airtank) + overlays.Cut() return ..() /obj/structure/closet/body_bag/cryobag/Entered(atom/movable/AM) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 079f64246eb..6da31d31c79 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -67,6 +67,11 @@ . = ..() update_state() +/obj/structure/door_assembly/Destroy() + electronics = null + created_name = null + return ..() + /obj/structure/door_assembly/door_assembly_generic base_name = "airlock" airlock_type = /obj/machinery/door/airlock diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 43359f5487d..9ae9e2aa5e8 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -66,6 +66,16 @@ var/can_change_icon_state = TRUE var/set_unsafe_on_init = FALSE +/obj/item/paper/Destroy() + info = null + info_links = null + stamps = null + ico = null + offset_x = null + offset_y = null + stamped = null + return ..() + /obj/item/paper/feedback_hints(mob/user, distance, is_adjacent) . += ..() if (old_name && (icon_state == "paper_plane" || icon_state == "paper_swan")) @@ -91,7 +101,7 @@ if (mapload) update_icon() else - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1, TIMER_STOPPABLE | TIMER_DELETE_ME) /obj/item/paper/proc/set_content(title, text) if(title) @@ -442,7 +452,7 @@ else flick("paper_onfire", src) - addtimer(CALLBACK(src, PROC_REF(burnpaper_callback), P, user, class), 20, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(burnpaper_callback), P, user, class), 20, TIMER_UNIQUE | TIMER_STOPPABLE | TIMER_DELETE_ME) /obj/item/paper/proc/burnpaper_callback(obj/item/P, mob/user, class = "warning") if (QDELETED(user) || QDELETED(src)) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 968a11e0942..43cbc53c419 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -23,6 +23,11 @@ drop_sound = 'sound/items/drop/paper.ogg' pickup_sound = 'sound/items/pickup/paper.ogg' +/obj/item/paper_bundle/Destroy() + pages.Cut() + pages = null + return ..() + /obj/item/paper_bundle/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Both papers and photos can be added to a paper bundle." diff --git a/html/changelogs/hellfirejag-even-more-misc-harddels.yml b/html/changelogs/hellfirejag-even-more-misc-harddels.yml new file mode 100644 index 00000000000..66b9d4c997c --- /dev/null +++ b/html/changelogs/hellfirejag-even-more-misc-harddels.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Some more fixes for a variety of hard dels.."