From 56d994b464dff0ec3745b3aa167c45db0addf6ac Mon Sep 17 00:00:00 2001 From: Couls Date: Thu, 26 Sep 2019 19:53:09 -0400 Subject: [PATCH] Slime people rework (#11990) --- .../mob/living/carbon/human/species/slime.dm | 22 ++++++++++++++---- code/modules/surgery/organs/subtypes/slime.dm | 11 +++++++++ icons/obj/species_organs/slime.dmi | Bin 0 -> 1687 bytes paradise.dme | 1 + 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 code/modules/surgery/organs/subtypes/slime.dm create mode 100644 icons/obj/species_organs/slime.dmi 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 0000000000000000000000000000000000000000..58ec636ca7ecc7caf9d98f1f2f927006e3d95d94 GIT binary patch literal 1687 zcmV;I259+-P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#F;QWJ|xl(;xkGK-28Y!wW-IMa#}b5kK~xT>7ey!2vRs+1L6 z{ah4Wd_B1U7j7ixug^2W000HrNklxh)?$_V<`#itres|>j`SbWc!(=;wZ1dKDY$uRy z-WrhY1k%Onc2TF>MKg`_#u@+s*4BDtYJx7^8=DW(p=ZaAA0U;PB$EwDs(nE7K{~`H z!uqwV$`vL0NDlxKA1pP&;k!040pRr+;dHyGwY46jhda@}^Lvs`jFd{C`5+x~loS1` z$~-jInS^cif>qBiQxcK{CHhETXU|8SJ^#6@<7MM?yJ*cmXU1_f8;}$qA>PtYH?1f= z*%=u9?OG=jMt3>M;pXaaO6sb3T_#)~@n$spfW{JNK1he^?D=SX-&{rrgJ1tT!-548 ziad7>qvrq>Sehda13-KxWa$p_4_`$&Bxk?Bt^GgeQZ+;CCRhd_`1{pP9R;OKP7dOc zDFA@Eh$G>9GEFElbh&v5qr04d5FVCrDv4;t>2}drt7A@ltksb`6dE75#}Op!5^C7@X6$%8BdIR>F~Fwz=}2ifZ=e@+;8ywRm55y z5vSXAUu!H)23Rg5cx#~42LM!(i5Y8#p#qbEFdewzqv3lpW%L}_$Aqxq1c^=g3U3BV zeU{4zrls%&B$vMG@k90a!RT}eLA2izM0>X&+P$jBA2A&6iPY?K7HBm=lL0H%byfht zwSfub(yEc@q@UNB^1v~9gpCrSkL3`3j3)rVF-76tyLtBkVD&o8q$~DWoNgCoMH~9t z+98PcTL3zxmYR$HzB{Erp#dly5yXZL0KwSgj3l(wFVkXz=0@nl$1)A;u2l96*ZTmI zf>DzSH44avF-!}}{A+9FCx!v_y{XB3K1uPa$3H9HI3bAZErG*VctKq64-Rxym)SRj z0fYpx!RK|Kt1ACo1iLhkT`cyZD`0ms9opWs9b2~9Dv7#8amb#Mk7UejGRB$WUg<&g zS9e&;W#9u{)b`!S#T5?OQ$nDR0YE%1FWKFk+2e5DvX9Kpe3EWKZ0HMku7v0(tEU2< z3kJYC23W^ztH1bVT$oWBNpl=qJ_g)c{~yM~lYyzoXV{ zj@tmB{nTkik%(TF9_y*f(P`=x(o(&U$kRjP-GFC61^9;mZvs#thz%wjy?Rj)TP^`W zz;o0Fz*17(bOgZ4#e!=xfPev26)MLjs2m?7swyqm^;PLf1t^N5i^azv#YUj0_tS1p zo*{C5#QQ)H?Y#ldl|1X7ErkKkg%yC+Ki1o`0ssWD#Sg#|8tm8+Z(TDJ8tm8#pdY{= ziv`zYz}b_-L#%;-GvpJF%Li*+I6+|DkHtxy7Pt?gNZ*hmSQd zlx1hz-f6;kZy5Z`58Yu0J9$3(cdXR`2Ba+am_J%v+js&`XSyFqO?Z-&zXv4Qar;a^0MMw+5S~i_z>$@W zHE9LYz+P|PPXW)-jQ}va<7X@$$iRSXu-Du7&FtY^ji)O-$s1+BtKg0PDEcyZYe2RW h$Tn{c$aVtR=3jXFa}Ktq;+y~g002ovPDHLkV1j~dHZK4G literal 0 HcmV?d00001 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"