From 6a7e13762bcfb22b39d8ae0f50819764998204cf Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 18 May 2026 15:19:23 -0400 Subject: [PATCH] Ship Projectiles Hard Del (#22473) Fix for a hard del caused by overmap projectiles failing to clear their walk cycle and timers consistently. This hard delete is relatively rare, except in any kind of event involving ship combat.... --- .../overmap/ship_weaponry/projectiles/_overmap_projectiles.dm | 3 ++- html/changelogs/hellfirejag-overmap-projectiles-harddel.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/hellfirejag-overmap-projectiles-harddel.yml diff --git a/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm b/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm index 6bbde991481..271d704536c 100644 --- a/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm +++ b/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm @@ -26,7 +26,7 @@ x = sx y = sy z = SSatlas.current_map.overmap_z - addtimer(CALLBACK(src, PROC_REF(move_to)), 1) + addtimer(CALLBACK(src, PROC_REF(move_to)), 1, TIMER_STOPPABLE|TIMER_DELETE_ME) /obj/effect/overmap/projectile/Bump(var/atom/A) if(istype(A, /turf/unsimulated/map/edge)) @@ -66,6 +66,7 @@ ammunition = null target = null entry_target = null + walk(src, 0) return ..() /obj/effect/overmap/projectile/proc/prepare_for_entry() diff --git a/html/changelogs/hellfirejag-overmap-projectiles-harddel.yml b/html/changelogs/hellfirejag-overmap-projectiles-harddel.yml new file mode 100644 index 00000000000..96318d18eed --- /dev/null +++ b/html/changelogs/hellfirejag-overmap-projectiles-harddel.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed a hard delete caused by ship overmap projectiles."