diff --git a/code/modules/mob/living/carbon/human/species/slime.dm b/code/modules/mob/living/carbon/human/species/slime.dm index 0b4080d6851..76e7ce2afee 100644 --- a/code/modules/mob/living/carbon/human/species/slime.dm +++ b/code/modules/mob/living/carbon/human/species/slime.dm @@ -25,8 +25,7 @@ male_cough_sounds = list('sound/effects/slime_squish.ogg') female_cough_sounds = list('sound/effects/slime_squish.ogg') - species_traits = list(LIPS, IS_WHITELISTED, NO_BREATHE, NO_INTORGANS, NO_SCAN) - dies_at_threshold = TRUE + species_traits = list(LIPS, IS_WHITELISTED, NO_SCAN) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = HAS_SKIN_COLOR | NO_EYES dietflags = DIET_CARN @@ -35,16 +34,29 @@ flesh_color = "#5fe8b1" blood_color = "#0064C8" exotic_blood = "water" - blood_damage_type = TOX butt_sprite = "slime" //Has default darksight of 2. has_organ = list( - "brain" = /obj/item/organ/internal/brain/slime + "brain" = /obj/item/organ/internal/brain/slime, + "osmatic pressure regulator" = /obj/item/organ/internal/heart/slime, + "gas exchange membrane" = /obj/item/organ/internal/lungs/slime ) mutantears = null - + has_limbs = list( + "chest" = list("path" = /obj/item/organ/external/chest/unbreakable), + "groin" = list("path" = /obj/item/organ/external/groin/unbreakable), + "head" = list("path" = /obj/item/organ/external/head/unbreakable), + "l_arm" = list("path" = /obj/item/organ/external/arm/unbreakable), + "r_arm" = list("path" = /obj/item/organ/external/arm/right/unbreakable), + "l_leg" = list("path" = /obj/item/organ/external/leg/unbreakable), + "r_leg" = list("path" = /obj/item/organ/external/leg/right/unbreakable), + "l_hand" = list("path" = /obj/item/organ/external/hand/unbreakable), + "r_hand" = list("path" = /obj/item/organ/external/hand/right/unbreakable), + "l_foot" = list("path" = /obj/item/organ/external/foot/unbreakable), + "r_foot" = list("path" = /obj/item/organ/external/foot/right/unbreakable) + ) suicide_messages = list( "is melting into a puddle!", "is ripping out their own core!", diff --git a/code/modules/surgery/organs/subtypes/slime.dm b/code/modules/surgery/organs/subtypes/slime.dm new file mode 100644 index 00000000000..a1c4e5a0bf6 --- /dev/null +++ b/code/modules/surgery/organs/subtypes/slime.dm @@ -0,0 +1,11 @@ +/obj/item/organ/internal/heart/slime + icon = 'icons/obj/species_organs/slime.dmi' + name = "osmotic pressure regulator" + 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." + +/obj/item/organ/internal/lungs/slime + icon = 'icons/obj/species_organs/slime.dmi' + name = "gas exchange membrane" + icon_state = "lungs" + desc = "Membrane used for oxygen intake and gas exchange. These seem to work similar to lungs." \ No newline at end of file diff --git a/icons/obj/species_organs/slime.dmi b/icons/obj/species_organs/slime.dmi new file mode 100644 index 00000000000..58ec636ca7e Binary files /dev/null and b/icons/obj/species_organs/slime.dmi differ diff --git a/paradise.dme b/paradise.dme index 55c92017702..4bf862793c8 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2442,6 +2442,7 @@ #include "code\modules\surgery\organs\subtypes\plasmaman.dm" #include "code\modules\surgery\organs\subtypes\shadow.dm" #include "code\modules\surgery\organs\subtypes\skrell.dm" +#include "code\modules\surgery\organs\subtypes\slime.dm" #include "code\modules\surgery\organs\subtypes\standard.dm" #include "code\modules\surgery\organs\subtypes\tajaran.dm" #include "code\modules\surgery\organs\subtypes\unathi.dm"