diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 59a119a89a..c31b566cf3 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -297,6 +297,11 @@ icon = 'icons/obj/surgery.dmi' icon_state = "posibrain-ipc" +/obj/item/organ/brain/slime + name = "slime nucleus" + desc = "A slimey membranous mass from a slimeperson." + icon_state = "brain-s" + ////////////////////////////////////TRAUMAS//////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index c37671cfc5..2f463fa8bc 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -9,7 +9,7 @@ mutant_heart = /obj/item/organ/heart/slime mutantstomach = /obj/item/organ/stomach/slime mutantliver = /obj/item/organ/liver/slime - mutant_brain = /obj/item/organ/brain/jelly + mutant_brain = /obj/item/organ/brain/slime mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None", "legs" = "Plantigrade") inherent_traits = list(TRAIT_TOXINLOVER) meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime @@ -31,11 +31,6 @@ species_category = SPECIES_CATEGORY_JELLY ass_image = 'icons/ass/assslime.png' -/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) C.faction -= "slime" if(ishuman(C)) diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 16bfee8212..749f5a8c38 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -78,7 +78,7 @@ cachedmoveCalc = value /obj/item/organ/liver/slime - name = "filtratum" //this is the name that Fermi came up with when testmerging that one thing that never got finished on Citadel - if Fermi ever updates this, this probably will have a lot more functionality. + name = "viscoplasm" //this is the name that Fermis came up with when working on that organ PR that never got finished - if Fermis ever updates this, this probably will have a lot more functionality. icon_state = "liver-s" desc = "An organelle resembling a liver for slimepeople." diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 594553c662..083c71fda2 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -591,8 +591,8 @@ /obj/item/organ/lungs/slime name = "vacuole" - desc = "A large organelle designed to store oxygen and other important gasses." icon_state = "lungs-s" + desc = "A large organelle designed to store oxygen and other important gasses." safe_toxins_max = 0 //We breathe this to gain POWER. diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 7fbd1045a5..ba7b950602 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -79,9 +79,9 @@ ..() /obj/item/organ/stomach/slime - name = "macrolysosome" + name = "macrolysosome" //an original cell has multiple lysosomes, but in this case a slimeperson only really has one... a big one? probably give it "macro" in the name. icon_state = "stomach-s" - desc = "A slimeperson organelle resembling a stomach. It breaks down, or digests macromolecules. Or just food." + desc = "A slimeperson organelle resembling a stomach. It breaks down, or digests macromolecules. Or food and drinks." /obj/item/organ/stomach/fly name = "insectoid stomach" diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index be9cb74799..0460934eee 100755 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ