From 8611499e87f72bed17f79d8cfa036a6ad8e2a70b Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Fri, 15 May 2015 23:53:59 +0930
Subject: [PATCH] Fixes #8842

---
 .../carbon/human/species/station/slime.dm     | 14 ++++++
 code/modules/organs/organ_alien.dm            | 47 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/human/species/station/slime.dm b/code/modules/mob/living/carbon/human/species/station/slime.dm
index 0f4f8364ee..6d5e918a95 100644
--- a/code/modules/mob/living/carbon/human/species/station/slime.dm
+++ b/code/modules/mob/living/carbon/human/species/station/slime.dm
@@ -29,6 +29,20 @@
 	swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL
 	push_flags = MONKEY|SLIME|SIMPLE_ANIMAL
 
+	has_limbs = list(
+		"chest" =  list("path" = /obj/item/organ/external/chest/slime),
+		"groin" =  list("path" = /obj/item/organ/external/groin/slime),
+		"head" =   list("path" = /obj/item/organ/external/head/slime),
+		"l_arm" =  list("path" = /obj/item/organ/external/arm/slime),
+		"r_arm" =  list("path" = /obj/item/organ/external/arm/right/slime),
+		"l_leg" =  list("path" = /obj/item/organ/external/leg/slime),
+		"r_leg" =  list("path" = /obj/item/organ/external/leg/right/slime),
+		"l_hand" = list("path" = /obj/item/organ/external/hand/slime),
+		"r_hand" = list("path" = /obj/item/organ/external/hand/right/slime),
+		"l_foot" = list("path" = /obj/item/organ/external/foot/slime),
+		"r_foot" = list("path" = /obj/item/organ/external/foot/right/slime)
+		)
+
 /datum/species/slime/handle_death(var/mob/living/carbon/human/H)
 	spawn(1)
 		if(H)
diff --git a/code/modules/organs/organ_alien.dm b/code/modules/organs/organ_alien.dm
index 4e2610f584..0905a61266 100644
--- a/code/modules/organs/organ_alien.dm
+++ b/code/modules/organs/organ_alien.dm
@@ -341,4 +341,49 @@
 	robotic = 2
 
 /obj/item/organ/stack/vox
-	name = "vox cortical stack"
\ No newline at end of file
+	name = "vox cortical stack"
+
+// Slime limbs.
+/obj/item/organ/external/chest/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/groin/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/arm/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/arm/right/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/leg/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/leg/right/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/foot/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/foot/right/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/hand/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/hand/right/slime
+	cannot_break = 1
+	dislocated = -1
+
+/obj/item/organ/external/head/slime
+	cannot_break = 1
+	dislocated = -1