From 302dfba07aaf55357ea23d427de2b2ec3c2ceb25 Mon Sep 17 00:00:00 2001
From: Luc <89928798+lewcc@users.noreply.github.com>
Date: Mon, 10 Oct 2022 15:13:35 -0400
Subject: [PATCH] Fixes cursed heart overlay sticking around (#19275)

---
 code/modules/surgery/organs/heart.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index d8cb9ec38ec..9c24d7a12bc 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -124,6 +124,15 @@
 		RegisterSignal(owner, COMSIG_LIVING_PRE_DEFIB, .proc/just_before_revive)
 		RegisterSignal(owner, COMSIG_LIVING_DEFIBBED, .proc/on_defib_revive)
 
+/obj/item/organ/internal/heart/cursed/remove(mob/living/carbon/M, special)
+	if(owner?.client?.prefs.colourblind_mode == COLOURBLIND_MODE_NONE)
+		owner.client.color = ""
+
+	UnregisterSignal(owner, COMSIG_LIVING_PRE_DEFIB, .proc/just_before_revive)
+	UnregisterSignal(owner, COMSIG_LIVING_DEFIBBED, .proc/on_defib_revive)
+	return ..()
+
+
 /obj/item/organ/internal/heart/cursed/proc/on_defib_revive(mob/living/carbon/shocked, mob/living/carbon/shocker, obj/item/defib, mob/dead/observer/ghost = null)
 	SIGNAL_HANDLER  // COMSIG_LIVING_DEFIBBED