From 8483e18877ea91939d34c9615212ac4e3d4c8234 Mon Sep 17 00:00:00 2001
From: Roxy <75404941+TealSeer@users.noreply.github.com>
Date: Sat, 4 Jul 2026 14:02:56 -0400
Subject: [PATCH] Fix flaky hard delete on hearts  (#96797)

## About The Pull Request

#96409 correctly identified the source of the problem, but failed to
resolve it because the timer is actually added during qdel, as part of
Destroy related organ movement. That means it's already past the point
where a delete_me timer would get removed.

## Why It's Good For The Game

Fixes #96458

## Changelog

N/A
---
 code/modules/surgery/organs/internal/heart/_heart.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm
index 86eecc8e41a..feb34bf041e 100644
--- a/code/modules/surgery/organs/internal/heart/_heart.dm
+++ b/code/modules/surgery/organs/internal/heart/_heart.dm
@@ -47,7 +47,7 @@
 
 /obj/item/organ/heart/Remove(mob/living/carbon/heartless, special, movement_flags)
 	. = ..()
-	if(!special)
+	if(!special && !QDELETED(src))
 		addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 12 SECONDS, TIMER_DELETE_ME)
 	beat = BEAT_NONE
 	owner?.stop_sound_channel(CHANNEL_HEARTBEAT)