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 7a15fd2e5c..c37671cfc5 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -7,6 +7,9 @@ species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR,HAS_FLESH) mutantlungs = /obj/item/organ/lungs/slime 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_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 @@ -22,7 +25,6 @@ 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 tail_type = "mam_tail" wagging_type = "mam_waggingtail" diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index aaa4e34f36..4dba68ada3 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -98,8 +98,8 @@ failed = TRUE /obj/item/organ/heart/slime - name = "slime heart" - desc = "It seems we've gotten to the slimy core of the matter." + name = "mitochondria" + desc = "The powerhouse of the cell. Or in this case, the hearty organelle of a slimeperson." icon_state = "heart-s-on" icon_base = "heart-s" diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 69633c54df..16bfee8212 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -77,6 +77,11 @@ C.action_cooldown_mod *= value 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. + icon_state = "liver-s" + desc = "An organelle resembling a liver for slimepeople." + /obj/item/organ/liver/fly name = "insectoid liver" icon_state = "liver-x" //xenomorph liver? It's just a black liver so it fits. diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 953c8b2c1b..594553c662 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -592,6 +592,7 @@ /obj/item/organ/lungs/slime name = "vacuole" desc = "A large organelle designed to store oxygen and other important gasses." + icon_state = "lungs-s" 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 cabe49db25..7fbd1045a5 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -78,6 +78,11 @@ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "disgust") ..() +/obj/item/organ/stomach/slime + name = "macrolysosome" + icon_state = "stomach-s" + desc = "A slimeperson organelle resembling a stomach. It breaks down, or digests macromolecules. Or just food." + /obj/item/organ/stomach/fly name = "insectoid stomach" icon_state = "stomach-x" //xenomorph liver? It's just a black liver so it fits. diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index 454138a254..be9cb74799 100755 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ