From 7cb4534227ddbc867b2c8819ed87bfd9cdaedab9 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Sat, 13 Feb 2016 00:18:16 -0500
Subject: [PATCH] Dionas have a liver

---
 .../living/carbon/human/species/station.dm    | 30 +++++++++----------
 code/modules/surgery/organs/subtypes/diona.dm | 14 ++++-----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index a87a28804a1..08858f2f253 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -55,7 +55,7 @@
 	flesh_color = "#34AF10"
 	reagent_tag = PROCESS_ORG
 	base_color = "#066000"
-	
+
 	suicide_messages = list(
 		"is attempting to bite their tongue off!",
 		"is jamming their claws into their eye sockets!",
@@ -106,7 +106,7 @@
 	reagent_tag = PROCESS_ORG
 	flesh_color = "#AFA59E"
 	base_color = "#333333"
-	
+
 	suicide_messages = list(
 		"is attempting to bite their tongue off!",
 		"is jamming their claws into their eye sockets!",
@@ -147,7 +147,7 @@
 	reagent_tag = PROCESS_ORG
 	flesh_color = "#966464"
 	base_color = "#B43214"
-	
+
 	suicide_messages = list(
 		"is attempting to bite their tongue off!",
 		"is jamming their claws into their eye sockets!",
@@ -231,7 +231,7 @@
 	flesh_color = "#808D11"
 
 	reagent_tag = PROCESS_ORG
-	
+
 	suicide_messages = list(
 		"is attempting to bite their tongue off!",
 		"is jamming their claws into their eye sockets!",
@@ -324,7 +324,7 @@
 		"eyes" =     /obj/item/organ/internal/eyes,
 		"stack" =    /obj/item/organ/internal/stack/vox
 		)
-	
+
 	suicide_messages = list(
 		"is attempting to bite their tongue off!",
 		"is jamming their claws into their eye sockets!",
@@ -350,7 +350,7 @@
 	dietflags = DIET_HERB
 	blood_color = "#FB9800"
 	reagent_tag = PROCESS_ORG
-	
+
 	suicide_messages = list(
 		"is attempting to bite their antenna off!",
 		"is jamming their claws into their eye sockets!",
@@ -378,7 +378,7 @@
 	has_organ = list(
 		"brain" = /obj/item/organ/internal/brain/slime
 		)
-		
+
 	suicide_messages = list(
 		"is melting into a puddle!",
 		"is turning a dull, brown color and melting into a puddle!",
@@ -462,12 +462,12 @@
 	reagent_tag = PROCESS_ORG
 
 	has_organ = list(
-		"nutrient channel" =   /obj/item/organ/internal/diona/nutrients,
-		"neural strata" =      /obj/item/organ/internal/diona/strata,
-		"response node" =      /obj/item/organ/internal/diona/node,
-		"gas bladder" =        /obj/item/organ/internal/diona/bladder,
-		"polyp segment" =      /obj/item/organ/internal/diona/polyp,
-		"anchoring ligament" = /obj/item/organ/internal/diona/ligament
+		"nutrient channel" =   /obj/item/organ/internal/liver/diona,
+		"neural strata" =      /obj/item/organ/internal/heart/diona,
+		"receptor node" =      /obj/item/organ/internal/eyes/diona,
+		"gas bladder" =        /obj/item/organ/internal/brain/diona,
+		"polyp segment" =      /obj/item/organ/internal/kidneys/diona,
+		"anchoring ligament" = /obj/item/organ/internal/appendix/diona
 		)
 
 	has_limbs = list(
@@ -483,7 +483,7 @@
 		"l_foot" = list("path" = /obj/item/organ/external/diona/foot),
 		"r_foot" = list("path" = /obj/item/organ/external/diona/foot/right)
 		)
-		
+
 	suicide_messages = list(
 		"is losing branches!",
 		"is pulling themselves apart!",
@@ -581,7 +581,7 @@
 		"l_foot" = list("path" = /obj/item/organ/external/foot/ipc),
 		"r_foot" = list("path" = /obj/item/organ/external/foot/right/ipc)
 		)
-	
+
 	suicide_messages = list(
 		"is powering down!",
 		"is smashing their own monitor!",
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index 60875eff479..c319e3d570d 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -149,7 +149,7 @@
 /obj/item/organ/diona/process()
 	return
 
-/obj/item/organ/internal/diona/strata
+/obj/item/organ/internal/heart/diona
 	name = "neural strata"
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "nymph"
@@ -158,7 +158,7 @@
 	parent_organ = "chest"
 	slot = "heart"
 
-/obj/item/organ/internal/diona/bladder
+/obj/item/organ/internal/brain/diona
 	name = "gas bladder"
 	parent_organ = "head"
 	icon = 'icons/obj/objects.dmi'
@@ -167,7 +167,7 @@
 	origin_tech = "biotech=3"
 	slot = "brain"
 
-/obj/item/organ/internal/diona/polyp
+/obj/item/organ/internal/kidneys/diona
 	name = "polyp segment"
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "nymph"
@@ -176,7 +176,7 @@
 	parent_organ = "groin"
 	slot = "kidneys"
 
-/obj/item/organ/internal/diona/ligament
+/obj/item/organ/internal/appendix/diona
 	name = "anchoring ligament"
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "nymph"
@@ -185,7 +185,7 @@
 	parent_organ = "groin"
 	slot = "appendix"
 
-/obj/item/organ/internal/diona/node
+/obj/item/organ/internal/eyes/diona
 	name = "receptor node"
 	organ_tag = "receptor node"
 	icon = 'icons/mob/alien.dmi'
@@ -196,13 +196,13 @@
 
 //TODO:Make absorb rads on insert
 
-/obj/item/organ/internal/diona/nutrients
+/obj/item/organ/internal/liver/diona
 	name = "nutrient vessel"
 	parent_organ = "chest"
 	organ_tag = "nutrient vessel"
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "claw"
-	slot = "nutri_vessel"
+	slot = "liver"
 
 //TODO:Make absorb light on insert.