From 382017cbe82bccc795c8da0f1c8d50eff8ca84d9 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Fri, 15 Dec 2017 10:53:30 +1300
Subject: [PATCH] Merge pull request #33298 from QualityVan/zombrain

Fixes zombie head removal
---
 code/modules/surgery/bodyparts/dismemberment.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 4daeb9ea45..e99455c833 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -236,6 +236,11 @@
 		if(pill)
 			pill.forceMove(src)
 
+	//Make sure de-zombification happens before organ removal instead of during it
+	var/obj/item/organ/zombie_infection/ooze = owner.getorganslot(ORGAN_SLOT_ZOMBIE)
+	if(istype(ooze))
+		ooze.transfer_to_limb(src, owner)
+
 	name = "[owner.real_name]'s head"
 	..()