Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

2020-07-09 22:14:20 +03:00
parent e12d690d3f 0c7b06baf4
commit 9de8483bcf
31 changed files with 1145 additions and 846 deletions
@@ -23,6 +23,13 @@
 	heatmod = 0.5 // = 1/4x heat damage
 	burnmod = 0.5 // = 1/2x generic burn damage
 	species_language_holder = /datum/language_holder/jelly
+	mutant_brain = /obj/item/organ/brain/jelly
+
+/obj/item/organ/brain/jelly
+	name = "slime nucleus"
+	desc = "A slimey membranous mass from a slime person"
+	icon_state = "brain-slime"
+

 /datum/species/jelly/on_species_loss(mob/living/carbon/C)
 	if(regenerate_limbs)