From fdfa737658049e602abc2b4e776263149f50a592 Mon Sep 17 00:00:00 2001
From: Vivalas <t.pt@aol.com>
Date: Fri, 23 Jun 2017 00:19:46 -0500
Subject: [PATCH] Removes life check and adds qdel stuff

---
 code/modules/mob/living/carbon/human/human.dm        | 1 +
 code/modules/mob/living/carbon/human/human_organs.dm | 5 -----
 code/modules/surgery/organs/organ_external.dm        | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ba55801c522..b3d5c09e626 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -66,6 +66,7 @@
 
 /mob/living/carbon/human/Destroy()
 	QDEL_LIST(bodyparts)
+	QDEL_LIST(splinted_limbs)
 	return ..()
 
 /mob/living/carbon/human/dummy
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 15a49474d3e..bec84778c73 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -21,11 +21,6 @@
 		for(var/obj/item/organ/external/Ex in bodyparts)
 			bad_external_organs |= Ex
 
-	if(splinted_limbs.len) //clean up the splinted limbs list
-		for(var/obj/item/organ/external/splinted in splinted_limbs)
-			if(!(splinted.status & ORGAN_SPLINTED))
-				splinted_limbs -= splinted
-
 	//processing internal organs is pretty cheap, do that first.
 	for(var/obj/item/organ/internal/I in internal_organs)
 		I.process()
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 763b8655471..36fbd6e6e91 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -688,6 +688,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 /obj/item/organ/external/proc/update_splints()
 	if(!(status & ORGAN_SPLINTED))
+		owner.splinted_limbs -= src
 		return
 	if(owner.step_count >= splinted_count + SPLINT_LIFE)
 		status &= ~ORGAN_SPLINTED //oh no, we actually need surgery now!