Merge remote-tracking branch 'upstream/master' into universal-damage

code/modules/surgery/organs/subtypes/slime.dm

@@ -1,11 +1,15 @@
 /obj/item/organ/internal/heart/slime
 	icon = 'icons/obj/species_organs/slime.dmi'
-	name = "osmotic pressure regulator"
+	name = "slime heart"
 	icon_state = "heart"
-	desc = "It appears to be some kind of biological pump that uses osmotic pressure to regulate water flow. It seems to work similar to a heart."
+	desc = "This is a slime's osmotic pressure regulator, it appears to be some kind of biological pump that uses osmotic pressure to regulate water flow. It seems to work similar to a heart."
+	dead_icon = null
+
+/obj/item/organ/internal/heart/slime/update_icon()
+	return
 
 /obj/item/organ/internal/lungs/slime
 	icon = 'icons/obj/species_organs/slime.dmi'    
-	name = "gas exchange membrane"
+	name = "slime lungs"
 	icon_state = "lungs"
-	desc = "Membrane used for oxygen intake and gas exchange. These seem to work similar to lungs."
+	desc = "This is a slime's gas exchange membrane, this membrane used for oxygen intake and gas exchange. These seem to work similar to lungs."

code/modules/surgery/organs/subtypes/unbreakable.dm

@@ -1,5 +1,6 @@
 /obj/item/organ/external/chest/unbreakable
 	cannot_break = TRUE
+	encased = null
 
 /obj/item/organ/external/groin/unbreakable
 	cannot_break = TRUE
@@ -30,6 +31,7 @@
 
 /obj/item/organ/external/head/unbreakable
 	cannot_break = TRUE
+	encased = null
 
 // Cannot dismember or break
 /obj/item/organ/external/chest/unbreakable/sturdy