From b197cb69fadbfe1de6b06af335275b922d46fdc2 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Fri, 3 Apr 2015 21:36:47 -0700
Subject: [PATCH] More organ fixes. Yay.

---
 code/modules/organs/organ_external.dm |  2 ++
 code/modules/organs/organ_internal.dm | 21 ++++++++++-----------
 code/modules/organs/wound.dm          |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 65399273a39..09c1c539aea 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -110,6 +110,8 @@
 	if(owner)
 		replaced(owner)
 		sync_colour_to_human(owner)
+	spawn(1)
+		get_icon()
 
 /obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
 	owner = target
diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm
index 4cb1dc96531..f7875a1e25f 100644
--- a/code/modules/organs/organ_internal.dm
+++ b/code/modules/organs/organ_internal.dm
@@ -158,14 +158,13 @@
 
 /obj/item/organ/appendix/removed()
 
-	..()
-
-	var/inflamed = 0
-	for(var/datum/disease/appendicitis/appendicitis in owner.viruses)
-		inflamed = 1
-		appendicitis.cure()
-		owner.resistances += appendicitis
-
-	if(inflamed)
-		icon_state = "appendixinflamed"
-		name = "inflamed appendix"
\ No newline at end of file
+	if(owner)
+		var/inflamed = 0
+		for(var/datum/disease/appendicitis/appendicitis in owner.viruses)
+			inflamed = 1
+			appendicitis.cure()
+			owner.resistances += appendicitis
+		if(inflamed)
+			icon_state = "appendixinflamed"
+			name = "inflamed appendix"
+	..()
\ No newline at end of file
diff --git a/code/modules/organs/wound.dm b/code/modules/organs/wound.dm
index 9d4a5364ae1..1d34ed72845 100644
--- a/code/modules/organs/wound.dm
+++ b/code/modules/organs/wound.dm
@@ -209,9 +209,9 @@
 
 /** WOUND DEFINITIONS **/
 
-//Note that the MINIMUM damage before a wound can be applied should correspond to 
+//Note that the MINIMUM damage before a wound can be applied should correspond to
 //the damage amount for the stage with the same name as the wound.
-//e.g. /datum/wound/cut/deep should only be applied for 15 damage and up, 
+//e.g. /datum/wound/cut/deep should only be applied for 15 damage and up,
 //because in it's stages list, "deep cut" = 15.
 /proc/get_wound_type(var/type = CUT, var/damage)
 	switch(type)
@@ -323,4 +323,4 @@ datum/wound/cut/massive
         return 0 //cannot be merged
 
 /datum/wound/lost_limb/small
-    stages = list("ripped stump" = 40, "bloody stump" = 30, "clotted stump" = 15, "scarred stump" = 0)
+    stages = list("ripped hole" = 40, "bloody hole" = 30, "clotted hole" = 15, "scarred hole" = 0)