From 012a05ff798ad9ea4f0257750dbabf5f7c6d727a Mon Sep 17 00:00:00 2001
From: FenodyreeAv <fenodyree.av@gmail.com>
Date: Mon, 22 Jun 2026 14:52:28 +0100
Subject: [PATCH] Allows robot organs to die (#22739)

Fixes robot organs continuing to process after death.

Stops this:
<img width="790" height="331" alt="image"
src="https://github.com/user-attachments/assets/5f8db817-0a8d-4263-90f4-74a18da78d9a"
/>
---
 code/modules/organs/organ.dm                         | 2 ++
 code/modules/surgery/organs_internal.dm              | 1 +
 html/changelogs/Fenodyree-FixImmortalRobotOrgans.yml | 5 +++++
 3 files changed, 8 insertions(+)
 create mode 100644 html/changelogs/Fenodyree-FixImmortalRobotOrgans.yml

diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index d175fb42c53..fcb4635d221 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -128,6 +128,8 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
 
 /obj/item/organ/proc/die()
 	if(status & ORGAN_ROBOT)
+		damage = max_damage
+		STOP_PROCESSING(SSprocessing, src)
 		return
 	damage = max_damage
 	status |= ORGAN_DEAD
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 4b1c8725550..189b6d37564 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -156,6 +156,7 @@
 				user.visible_message("<b>[user]</b> repairs [target]'s [I.name] with [tool].", \
 					SPAN_NOTICE("You repair [target]'s [I.name] with [tool].") )
 				I.surgical_fix(user)
+				START_PROCESSING(SSprocessing, I)
 				if(istype(tool, /obj/item/stack/nanopaste))
 					var/obj/item/stack/nanopaste/nanopaste = tool
 					nanopaste.use(1)
diff --git a/html/changelogs/Fenodyree-FixImmortalRobotOrgans.yml b/html/changelogs/Fenodyree-FixImmortalRobotOrgans.yml
new file mode 100644
index 00000000000..92eab5f99dc
--- /dev/null
+++ b/html/changelogs/Fenodyree-FixImmortalRobotOrgans.yml
@@ -0,0 +1,5 @@
+author: Fenodyree
+delete-after: True
+
+changes:
+  - bugfix: "Fixes immortal robot organs."