From 74dfd82072cdf88d84e2d10f4242524a1b8b2d08 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Mon, 25 May 2015 14:47:58 +0930
Subject: [PATCH] Organ cleanup, stat to DEAD, world removal

---
 code/game/antagonist/alien/borer.dm   |  2 +-
 code/modules/organs/misc.dm           |  9 ++----
 code/modules/organs/organ.dm          |  1 -
 code/modules/organs/subtypes/xenos.dm | 42 +++++++++------------------
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/code/game/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm
index 706c8dbece..bd436ceaf8 100644
--- a/code/game/antagonist/alien/borer.dm
+++ b/code/game/antagonist/alien/borer.dm
@@ -36,7 +36,7 @@ var/datum/antagonist/xenos/borer/borers
 		var/obj/item/organ/external/head/head = H.get_organ("head")
 		if(head.status & ORGAN_ROBOT)
 			continue
-		if(H.stat != 2 && !H.has_brain_worms())
+		if(H.stat != DEAD && !H.has_brain_worms())
 			possible_hosts |= H
 	return possible_hosts
 
diff --git a/code/modules/organs/misc.dm b/code/modules/organs/misc.dm
index 8a96988452..a330e307a3 100644
--- a/code/modules/organs/misc.dm
+++ b/code/modules/organs/misc.dm
@@ -1,9 +1,4 @@
 //CORTICAL BORER ORGANS.
-/obj/item/organ/borer
-	name = "cortical borer"
-	parent_organ = "head"
-	vital = 1
-
 /obj/item/organ/borer/process()
 
 	// Borer husks regenerate health, feel no pain, and are resistant to stuns and brainloss.
@@ -32,6 +27,8 @@
 	icon_state = "borer"
 	organ_tag = "brain"
 	desc = "A disgusting space slug."
+	parent_organ = "head"
+	vital = 1
 
 /obj/item/organ/borer/removed(var/mob/living/user)
 
@@ -55,7 +52,7 @@
 	var/datum/mind/backup
 
 /obj/item/organ/stack/process()
-	if(owner && owner.stat != 2 && !is_broken())
+	if(owner && owner.stat != DEAD && !is_broken())
 		backup_time = world.time
 		if(owner.mind) backup = owner.mind
 
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index c45d1c7859..9f94656806 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -222,7 +222,6 @@ var/list/organ_cache = list()
 /obj/item/organ/emp_act(severity)
 	if(!(status & ORGAN_ROBOT))
 		return
-	world << "emp on [src] with sev [severity]."
 	switch (severity)
 		if (1.0)
 			take_damage(0,20)
diff --git a/code/modules/organs/subtypes/xenos.dm b/code/modules/organs/subtypes/xenos.dm
index 7052237b16..0b1233085f 100644
--- a/code/modules/organs/subtypes/xenos.dm
+++ b/code/modules/organs/subtypes/xenos.dm
@@ -1,11 +1,20 @@
 //XENOMORPH ORGANS
+/obj/item/organ/xenos
+	name = "xeno organ"
+	icon = 'icons/effects/blood.dmi'
+	desc = "It smells like an accident in a chemical factory."
+
 /obj/item/organ/xenos/eggsac
 	name = "egg sac"
 	parent_organ = "groin"
+	icon_state = "xgibmid1"
+	organ_tag = "egg sac"
 
 /obj/item/organ/xenos/plasmavessel
 	name = "plasma vessel"
 	parent_organ = "chest"
+	icon_state = "xgibdown1"
+	organ_tag = "plasma vessel"
 	var/stored_plasma = 0
 	var/max_plasma = 500
 
@@ -26,41 +35,18 @@
 /obj/item/organ/xenos/acidgland
 	name = "acid gland"
 	parent_organ = "head"
-
-/obj/item/organ/xenos/hivenode
-	name = "hive node"
-	parent_organ = "chest"
-
-/obj/item/organ/xenos/resinspinner
-	name = "resin spinner"
-	parent_organ = "head"
-
-/obj/item/organ/xenos
-	name = "xeno organ"
-	icon = 'icons/effects/blood.dmi'
-	desc = "It smells like an accident in a chemical factory."
-
-/obj/item/organ/xenos/eggsac
-	name = "egg sac"
-	icon_state = "xgibmid1"
-	organ_tag = "egg sac"
-
-/obj/item/organ/xenos/plasmavessel
-	name = "plasma vessel"
-	icon_state = "xgibdown1"
-	organ_tag = "plasma vessel"
-
-/obj/item/organ/xenos/acidgland
-	name = "acid gland"
 	icon_state = "xgibtorso"
 	organ_tag = "acid gland"
 
 /obj/item/organ/xenos/hivenode
 	name = "hive node"
+	parent_organ = "chest"
 	icon_state = "xgibmid2"
 	organ_tag = "hive node"
 
 /obj/item/organ/xenos/resinspinner
-	name = "hive node"
+	name = "resin spinner"
+	parent_organ = "head"
 	icon_state = "xgibmid2"
-	organ_tag = "resin spinner"
\ No newline at end of file
+	organ_tag = "resin spinner"
+