From 3493b60fafe3fd0b4261af479014aafe40bcb98b Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Fri, 3 Apr 2015 21:03:06 -0700
Subject: [PATCH] Attempting to fix icon procs for organs.

---
 code/modules/organs/organ_external.dm | 7 +------
 code/modules/organs/organ_icon.dm     | 9 ++++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 61a92a6c57..65399273a3 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -700,11 +700,6 @@ Note that amputating the affected organ does in fact remove the infection from t
 /obj/item/organ/external/proc/is_stump()
 	return 0
 
-/obj/item/organ/external/replaced()
-	get_icon()
-	icon = mob_icon
-	return ..()
-
 /obj/item/organ/external/proc/release_restraints(var/mob/living/carbon/human/holder)
 	if(!holder)
 		holder = owner
@@ -865,7 +860,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		return
 	var/is_robotic = status & ORGAN_ROBOT
 	var/mob/living/carbon/human/victim = owner
-	get_icon()
+
 	..()
 
 	status |= ORGAN_DESTROYED
diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm
index 1b25698c4a..d05a269f28 100644
--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -5,13 +5,12 @@ var/global/list/limb_icon_cache = list()
 
 /obj/item/organ/external/proc/compile_icon()
 	overlays.Cut()
-	get_icon()
 	 // This is a kludge, only one icon has more than one generation of children though.
 	for(var/obj/item/organ/external/organ in contents)
 		if(organ.children && organ.children.len)
 			for(var/obj/item/organ/external/child in organ.children)
-				overlays += child.get_icon()
-		overlays += organ.get_icon()
+				overlays += child.mob_icon
+		overlays += organ.mob_icon
 
 /obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human)
 	s_tone = null
@@ -28,6 +27,10 @@ var/global/list/limb_icon_cache = list()
 	var/obj/item/organ/eyes/eyes = owner.internal_organs_by_name["eyes"]
 	if(eyes) eyes.update_colour()
 
+/obj/item/organ/external/head/removed()
+	get_icon()
+	..()
+
 /obj/item/organ/external/head/get_icon()
 
 	..()