From 38adc54c77ae79c68ebb2050c1510ca27d1e4e76 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Mon, 22 Aug 2016 23:40:57 -0700
Subject: [PATCH] Humans no longer spew debug messages when deleted

---
 code/modules/surgery/organs/organ_external.dm | 7 ++++---
 code/modules/surgery/organs/organ_internal.dm | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index e2702b36afe..699b9ed1ee3 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -69,13 +69,14 @@
 	if(parent && parent.children)
 		parent.children -= src
 
-	if(owner)
-		owner.organs_by_name[limb_name] = null
-
 	if(internal_organs)
 		for(var/obj/item/organ/internal/O in internal_organs)
 			internal_organs -= O
 			O.remove(owner,special = 1)
+			qdel(O)
+
+	if(owner)
+		owner.organs_by_name[limb_name] = null
 
 	if(children)
 		for(var/obj/item/organ/external/C in children)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index a902dc55afa..2d9ddf78e80 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -39,7 +39,7 @@
 		var/mob/living/carbon/human/H = M
 		parent = H.get_organ(check_zone(parent_organ))
 		if(!istype(parent))
-			log_to_dd("[src] attempted to insert into a [parent], but [parent] wasn't an organ! Area: [get_area(M)]")
+			log_debug("[src] attempted to insert into a [parent_organ], but [parent_organ] wasn't an organ! [atom_loc_line(M)]")
 		else
 			parent.internal_organs |= src
 	//M.internal_organs_by_name[src] |= src(H,1)
@@ -52,6 +52,8 @@
 // Returns the removed object, which is usually just itself
 // However, you MUST set the object's positiion yourself when you call this!
 /obj/item/organ/internal/remove(mob/living/carbon/M, special = 0)
+	if(!owner)
+		log_debug("\'remove\' called on [src] without an owner! Mob: [M], [atom_loc_line(M)]")
 	owner = null
 	if(M)
 		M.internal_organs -= src
@@ -63,7 +65,7 @@
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/parent = H.get_organ(check_zone(parent_organ))
 		if(!istype(parent))
-			log_to_dd("[src] attempted to remove from a [parent], but [parent] didn't exist! Area: [get_area(M)], Mob: [M]")
+			log_debug("[src] attempted to remove from a [parent_organ], but [parent_organ] didn't exist! [atom_loc_line(M)]")
 		else
 			parent.internal_organs -= src