From 685f7008a6642b045b31fe2899113698b26ed9e3 Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 2 Apr 2021 13:44:02 +0000 Subject: [PATCH] Makes organs consumable (#3754) * Slightly reorganizes Body yaml * Slightly reorganizes Body yaml * You can now monch all organs * Rewrites Mobs/Species/.rsi meta.jsons and replaces some human organ sprites * ReIDs organs and does some more cleanup --- .../{basic_human_organs.yml => human.yml} | 131 +++++--- .../Mechanisms/{basic_tests.yml => tests.yml} | 0 .../Mechanisms/{vox_organs.yml => vox.yml} | 0 .../Body/Parts/{human_parts.yml => human.yml} | 14 +- .../Body/Parts/{slime_parts.yml => slime.yml} | 14 +- .../Body/Parts/{vox_parts.yml => vox.yml} | 14 +- .../Presets/{basic_human.yml => human.yml} | 0 .../Human/organs.rsi/appendix-inflamed.png | Bin 0 -> 188 bytes .../Species/Human/organs.rsi/appendix.png | Bin 258 -> 158 bytes .../Human/organs.rsi/appendixinflamed.png | Bin 282 -> 0 bytes .../Species/Human/organs.rsi/eyeball-l.png | Bin 0 -> 364 bytes .../Species/Human/organs.rsi/eyeball-r.png | Bin 0 -> 354 bytes .../Species/Human/organs.rsi/eyeballs.png | Bin 574 -> 0 bytes .../Species/Human/organs.rsi/kidney-l.png | Bin 0 -> 262 bytes .../Species/Human/organs.rsi/kidney-r.png | Bin 0 -> 259 bytes .../Mobs/Species/Human/organs.rsi/kidneys.png | Bin 351 -> 0 bytes .../Mobs/Species/Human/organs.rsi/lung-l.png | Bin 0 -> 279 bytes .../Mobs/Species/Human/organs.rsi/lung-r.png | Bin 0 -> 275 bytes .../Mobs/Species/Human/organs.rsi/lungs.png | Bin 359 -> 0 bytes .../Mobs/Species/Human/organs.rsi/meta.json | 133 ++++---- .../Mobs/Species/Human/organs.rsi/muscle.png | Bin 0 -> 219 bytes .../Mobs/Species/Human/organs.rsi/nerve.png | Bin 0 -> 155 bytes .../Mobs/Species/Human/organs.rsi/stomach.png | Bin 370 -> 191 bytes .../{tonguenormal.png => tongue.png} | Bin .../Mobs/Species/Human/organs.rsi/vessel.png | Bin 0 -> 170 bytes .../Mobs/Species/Human/parts.rsi/meta.json | 287 ++++-------------- .../Mobs/Species/Slime/parts.rsi/meta.json | 287 ++++-------------- .../Mobs/Species/Vox/parts.rsi/meta.json | 76 ++++- .../{Parts => Species}/lungs_phoronman.png | Bin 29 files changed, 365 insertions(+), 591 deletions(-) rename Resources/Prototypes/Body/Mechanisms/{basic_human_organs.yml => human.yml} (55%) rename Resources/Prototypes/Body/Mechanisms/{basic_tests.yml => tests.yml} (100%) rename Resources/Prototypes/Body/Mechanisms/{vox_organs.yml => vox.yml} (100%) rename Resources/Prototypes/Body/Parts/{human_parts.yml => human.yml} (97%) rename Resources/Prototypes/Body/Parts/{slime_parts.yml => slime.yml} (97%) rename Resources/Prototypes/Body/Parts/{vox_parts.yml => vox.yml} (97%) rename Resources/Prototypes/Body/Presets/{basic_human.yml => human.yml} (100%) create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/appendix-inflamed.png delete mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/appendixinflamed.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-l.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-r.png delete mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-l.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-r.png delete mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/lung-l.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/lung-r.png delete mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/lungs.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/muscle.png create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/nerve.png rename Resources/Textures/Mobs/Species/Human/organs.rsi/{tonguenormal.png => tongue.png} (100%) create mode 100644 Resources/Textures/Mobs/Species/Human/organs.rsi/vessel.png rename Resources/Textures/Mobs/{Parts => Species}/lungs_phoronman.png (100%) diff --git a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml b/Resources/Prototypes/Body/Mechanisms/human.yml similarity index 55% rename from Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml rename to Resources/Prototypes/Body/Mechanisms/human.yml index c5146be6c6..c902134854 100644 --- a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml +++ b/Resources/Prototypes/Body/Mechanisms/human.yml @@ -1,30 +1,29 @@ -- type: entity - id: BaseMechanism - parent: BaseItem - name: "base mechanism" - abstract: true - components: - - type: Mechanism - - type: entity id: BaseHumanOrgan - parent: BaseMechanism - name: "base human organ" + parent: BaseItem abstract: true components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - -- type: entity - id: BrainHuman - parent: BaseHumanOrgan - name: "human brain" - description: "The source of incredible, unending intelligence. Honk." - components: + - type: Tag + tags: + - Grindable - type: Sprite netsync: false sprite: Mobs/Species/Human/organs.rsi + - type: Mechanism + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 10 + +- type: entity + id: OrganHumanBrain + parent: BaseHumanOrgan + name: brain + description: "The source of incredible, unending intelligence. Honk." + components: + - type: Sprite state: brain - type: Mechanism size: 1 @@ -37,28 +36,26 @@ - type: GhostOnMove - type: entity - id: EyesHuman + id: OrganHumanEyes parent: BaseHumanOrgan - name: "human eyes" - description: "Ocular organ capable of turning light into a colorful visual." + name: eyes + description: "I see you!" components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - state: eyeballs + layers: + - state: eyeball-l + - state: eyeball-r - type: Mechanism size: 1 compatibility: Biological - type: entity - id: HeartHuman + id: OrganHumanHeart parent: BaseHumanOrgan - name: "human heart" - description: "Pumps blood throughout a body. Essential for any entity with blood." + name: heart + description: "I feel bad for the heartless bastard who lost this." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi state: heart-on - type: Mechanism size: 1 @@ -67,15 +64,27 @@ - !type:HeartBehavior {} - type: entity - id: LungsHuman + id: OrganHumanEars parent: BaseHumanOrgan - name: "human lungs" + name: ears + description: "There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible." + components: + - type: Sprite + state: ears + - type: Mechanism + size: 1 + compatibility: Biological + +- type: entity + id: OrganHumanLungs + parent: BaseHumanOrgan + name: lungs description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - state: lungs + layers: + - state: lung-l + - state: lung-r - type: Mechanism size: 1 compatibility: Biological @@ -83,14 +92,12 @@ - !type:LungBehavior {} - type: entity - id: StomachHuman + id: OrganHumanStomach parent: BaseHumanOrgan - name: "human stomach" + name: stomach description: "Gross. This is hard to stomach." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi state: stomach - type: Mechanism size: 1 @@ -103,14 +110,12 @@ maxVol: 250 - type: entity - id: LiverHuman + id: OrganHumanLiver parent: BaseHumanOrgan - name: "human liver" - description: "Filters impurities out of a bloodstream and provides other important functionality to a human, such as reagent metabolization." + name: liver + description: "Pairing suggestion: chianti and fava beans." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi state: liver - type: Mechanism size: 1 @@ -123,15 +128,41 @@ toxinLethality: 0.01 - type: entity - id: KidneysHuman + id: OrganHumanKidneys parent: BaseHumanOrgan - name: "human kidneys" + name: kidneys description: "Filters toxins out of a bloodstream." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - state: kidneys + layers: + - state: kidney-l + - state: kidney-r + - type: Mechanism + size: 1 + compatibility: Biological + +- type: entity + id: OrganHumanTongue + parent: BaseHumanOrgan + name: tongue + description: "A fleshy muscle mostly used for lying." + components: + - type: Sprite + state: tongue + - type: Mechanism + size: 1 + compatibility: Biological + +- type: entity + id: OrganHumanAppendix + parent: BaseHumanOrgan + name: appendix + components: + - type: Sprite + layers: + - state: appendix + - state: appendix-inflamed + visible: false - type: Mechanism size: 1 compatibility: Biological diff --git a/Resources/Prototypes/Body/Mechanisms/basic_tests.yml b/Resources/Prototypes/Body/Mechanisms/tests.yml similarity index 100% rename from Resources/Prototypes/Body/Mechanisms/basic_tests.yml rename to Resources/Prototypes/Body/Mechanisms/tests.yml diff --git a/Resources/Prototypes/Body/Mechanisms/vox_organs.yml b/Resources/Prototypes/Body/Mechanisms/vox.yml similarity index 100% rename from Resources/Prototypes/Body/Mechanisms/vox_organs.yml rename to Resources/Prototypes/Body/Mechanisms/vox.yml diff --git a/Resources/Prototypes/Body/Parts/human_parts.yml b/Resources/Prototypes/Body/Parts/human.yml similarity index 97% rename from Resources/Prototypes/Body/Parts/human_parts.yml rename to Resources/Prototypes/Body/Parts/human.yml index 6d14fe543c..c680ced71d 100644 --- a/Resources/Prototypes/Body/Parts/human_parts.yml +++ b/Resources/Prototypes/Body/Parts/human.yml @@ -23,11 +23,11 @@ size: 14 compatibility: Biological mechanisms: - - HeartHuman - - LungsHuman - - StomachHuman - - LiverHuman - - KidneysHuman + - OrganHumanHeart + - OrganHumanLungs + - OrganHumanStomach + - OrganHumanLiver + - OrganHumanKidneys - type: BiologicalSurgeryData - type: Damageable # TODO BODY DettachableDamageableComponent? @@ -54,8 +54,8 @@ compatibility: Biological vital: true mechanisms: - - BrainHuman - - EyesHuman + - OrganHumanBrain + - OrganHumanEyes - type: BiologicalSurgeryData - type: Damageable damageContainer: biologicalDamageContainer diff --git a/Resources/Prototypes/Body/Parts/slime_parts.yml b/Resources/Prototypes/Body/Parts/slime.yml similarity index 97% rename from Resources/Prototypes/Body/Parts/slime_parts.yml rename to Resources/Prototypes/Body/Parts/slime.yml index bf348a9eb4..5009347247 100644 --- a/Resources/Prototypes/Body/Parts/slime_parts.yml +++ b/Resources/Prototypes/Body/Parts/slime.yml @@ -22,11 +22,11 @@ size: 14 compatibility: Biological mechanisms: - - HeartHuman - - LungsHuman - - StomachHuman - - LiverHuman - - KidneysHuman + - OrganHumanHeart + - OrganHumanLungs + - OrganHumanStomach + - OrganHumanLiver + - OrganHumanKidneys - type: BiologicalSurgeryData - type: Damageable # TODO BODY DettachableDamageableComponent? @@ -53,8 +53,8 @@ compatibility: Biological vital: true mechanisms: - - BrainHuman - - EyesHuman + - OrganHumanBrain + - OrganHumanEyes - type: BiologicalSurgeryData - type: Damageable damageContainer: biologicalDamageContainer diff --git a/Resources/Prototypes/Body/Parts/vox_parts.yml b/Resources/Prototypes/Body/Parts/vox.yml similarity index 97% rename from Resources/Prototypes/Body/Parts/vox_parts.yml rename to Resources/Prototypes/Body/Parts/vox.yml index f666121c7a..7b064ddcac 100644 --- a/Resources/Prototypes/Body/Parts/vox_parts.yml +++ b/Resources/Prototypes/Body/Parts/vox.yml @@ -23,11 +23,11 @@ size: 14 compatibility: Biological mechanisms: - - HeartHuman - - LungsHuman - - StomachHuman - - LiverHuman - - KidneysHuman + - OrganHumanHeart + - OrganHumanLungs + - OrganHumanStomach + - OrganHumanLiver + - OrganHumanKidneys - type: BiologicalSurgeryData - type: Damageable # TODO BODY DettachableDamageableComponent? @@ -54,8 +54,8 @@ compatibility: Biological vital: true mechanisms: - - BrainHuman - - EyesHuman + - OrganHumanBrain + - OrganHumanEyes - type: BiologicalSurgeryData - type: Damageable damageContainer: biologicalDamageContainer diff --git a/Resources/Prototypes/Body/Presets/basic_human.yml b/Resources/Prototypes/Body/Presets/human.yml similarity index 100% rename from Resources/Prototypes/Body/Presets/basic_human.yml rename to Resources/Prototypes/Body/Presets/human.yml diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix-inflamed.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix-inflamed.png new file mode 100644 index 0000000000000000000000000000000000000000..3e8f7a6ee95b232154c151cd56d04b483afb93e5 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L*oQU+f*g1Q1kN>m! ztk;VtZB*AhJS+Od+NcK?SH%I9F_r}R1v5B2yO9Ru_rGY zZMBM_JE@JatHC3}6-Z_mS+5eiUJ@ef;C&&agGFpHmxxv50;yAKN{y?UEDa??8xF2v g@@?4Jm{`Ef;If|cdoKI3LZHzMp00i_>zopr06OkJasU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix.png index 4d4fa1293a08c4f55d37b1818558ed8e2e599357..f52d5b0cdc9107e523d1303c00afc770edcfe202 100644 GIT binary patch delta 142 zcmZo-n#VXnqMn7Bfq|hhB>gy$5(@AMaXoP0z(#e=i=DGiMMk||JgHm4Ov6iC3Mk81 z666=m;PC858jxe<>EaloF)=wo;!T5Ktb+%GZ=)x}Du&HUvl=#N&k}rLWx#qtH&LL> rrF^>JEQZwvyXHBR1V>7?0SyXS!~7+1FIyGR6b4UrS3j3^P6qjnC delta 242 zcmVk6>M4- zgJ2LXHme>&lZeT%#bDDDcmtzl7yG)!O(LFP5e$|^VN5PYXNw^3(+1vqzj?!e5JCv? zV=8Uq(R1|Yx!#$lnq}N{^c-D#+8nYM)O15&2ULe6+K(P#E^9EpOvW_)sv_9JJ#(h8 z?9&`LlqPHT`5jjknQeo?3%tYIixc6j1wgDV0E+6C)WzDO(H(z1H}`EJKv`D^XO$%Q s9pt;KdK@L!FCoxEZz^M7?^L~d(40kLJ0BCRMy~b9ofhIYjc$8F6Yp09obsyv3)t92A>$u zQ0evvE*55_UGG~|0&#Uv|g zsYhWFvHxhGZHbdD{!Ie_!8pbwD{^xPE**S>QteQkY?1q_xB5=c>U4PXHMRb=d<(Y2 g%pX_?A%u7;zxkaUiFf&c&j07*qoM6N<$f<3``CjbBd diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-l.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-l.png new file mode 100644 index 0000000000000000000000000000000000000000..14e728707a96ff43cf2e118f6d0d3681abcafff5 GIT binary patch literal 364 zcmV-y0h9iTP)p@G$ZbO+JRa(Y-sR21NopLg*T zMNvXfb4^vze|dRnh7XTlGF;z$0L4OB^iYy6@M@erv-iKhpF6|T=Pwz)ef`ex>gIih zV^dc!be}(p;s{UzB{w9P@L8UcoXa30BF~_$slvd|&&wd8rNm&J6~Rz$Xbq1RHbzEp z?jRT7bhYcc`(R6U`AIP_{Qt}F=kFVav*)icF#h?+up+k&u8tDl;|+ncuf8+vi8Wvl znR}lB>jFTOMRB!fDV9xfdK&iNO|VF)wHDm0000< KMNUMnLSTZYq^t7) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-r.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-r.png new file mode 100644 index 0000000000000000000000000000000000000000..d18f4d4572511fc96b0b85503ff875353b14fb34 GIT binary patch literal 354 zcmV-o0iFJdP)0j6Lt-DVo}a0SXPQ;Fg0Ng6x<90W@<&p@9|AYOy(hi5iYb z(l;Z^au8sl)N(dPMh1Q)V?c2a68ndw=Fk8C3?Kjh!I}^$cEIa@zd;6r*`;Hd-{tL&5O7#>+0nBoc&tZmvd`ow5>*)6XFCU)&f9vRu|HxU8F5t`CoB#j+c?QRS zemtUIzCU(&GuTqsb@%@>PQ3bGc;=1&zkfXXf91$_q8vbR8jzQl0n-PberI5)vSRr3 z>mLI%GcyCfj5tyHDR#j9hflyX9~%>cP~S-g2Wd_)|Iy>8lp0MuIC6ON|9`)qf};XN zA3eO8{^dT%5%1sJ_S->P)+l{v~p)`Va?;pH)rZf_- z&dzu(D6#+SNt~D%!;y0%O+oMIBKp&ae%EMQ_cN&}o*z90`~4ceeyL-9(L!N*7Pm_I zW?s@TS)&Z>gkJ}u?ZmHKo&>px-rgQmm)<}-dKkkK7opt)Z~ib569RfmnWSMdCIsA; zT9SmHNnh8Av_$}TG};fa0om9D>(lF^2t5K?G2h*2YU?TmRl$$KSe8N(3-gn`u`8lpFmsrg| zr0QY<3fFKZHAMh8cqoq3XU2XR|M|lrck4aP=Z2KHdi;X&743>bHbcr)Cejwg-B;{O zRp@+MVL3Oa)P=zBKoA21aR9($yAE78@oCFNBocuh->;P4wE=7S9ROfYOvB#WPcd>} z7XV=8t=(;Db#mDZUB@QnDqY8BKAY+IAJUbHj~f-{{)Tu+NXS3UcabXmbdP+@AOHXW M07*qoM6N<$f*J?{;{X5v diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-l.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-l.png new file mode 100644 index 0000000000000000000000000000000000000000..9bcb14ea9d3f3f6cb283a9bce160af850e2ba16e GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJvz{)FArY;~60D08M0%P69rQA; zT>k0bdmvfrg+zj4*h7)@@E!fd-`=GySsbWPyi*O&=s<{_n5-J4cI8L4sA` zbnjJ`18>aZ?;Sk)T0b^%iJO&z7ViNaw$=kTqva(W_AL)nQnBJyV4m<^Qo*t@iCsXH zY5x8iw#y49Fu1Z8H7(i6>~Qe!+u!CE|NnKjCrF8~ex1JV!ac?X59)sPG(LR#disM2 z43=$CmJJ&03f7Ol-OcAwkebHECc-m&Q3c4+23%}n1_lNU3=2a-=A~**mIQi?!PC{x JWt~$(697sRW0(K{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-r.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-r.png new file mode 100644 index 0000000000000000000000000000000000000000..442c81338c1f15403635468b5adebf3ea982f3f5 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQ=Tr4ArY;~60D08M0%P69W*np zT>k0bDd@v2%dB(7D5Gn$wv9^Bw|8kOVe%Kb3K;`LIJ&)zBvx}agzowIsqf)KW3@%H zj)5X3uU;BliQmPvog>APqd}%wM#-d@fv2IS`r9>jHbFT>k#+%Q4PWN}jtd<)7g(@3 z1TuIt8_ci&_i1LvUlB`&6w5U-JN`dXjQMl>dp=KoyuJDeK%6H;Z?aGaiRm+as< z$E2LWLPf$s@gwiK;#~%7(8A5T-G@y GGywoav{>-~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys.png deleted file mode 100644 index 4296d5d33a4eac02c7ff79f6398ef91f2bb02ce9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmV-l0igbgP)XA0f)y^c}3cL*Az9BXqGm6(Q822`B_rYUOU2q1bg1 z$R-pjq5GC7_UZ2b?=Ardf*^>7WO1b3XH#0ok<*;B(7-%Nt<&*z!oGX|6+wY{lIp?j zEBc)t0AMy>p{`1BAz2nj`s(@yqhS{S@Vt4!qG$z+@Qxr)Qtc);nBrVWTgcpxhTVgX z{78VCxZmkn_wMqIrxP}tuWW~0p+16lz{R-E;z<9=SFql!0qmT8Y%dp*nH@0BP5e;= z)Kv+!RrdYiaRFfG-t2*U4ghMaP*-J;0PhI6kSs%_fhV*t+waNMK}=nhxH#VzUl#i@ x`3M>T7m_Ut;O_qOG4U-!7ULw@2AMbS?e{IeA*r(@YTh(izN9AEkB>i_cgZ@G za2(M2|Nk2=^A$m!{C#^C&u4aENU`kMW;QM9$DgOhwK5GNUwF>P?@dS$5lghF`X+gF zn($i&wiW9gr+IgI8rbZvW7R49tvC15f!o*5ORl@Sk8hjIGmZ%nf0t_aloT@X9MECE zc!kNu+F?SxK%S-PCwm@&SiT0G+J8?pnc4NlZx{k4k0&mk$LDp_x%Y=W#3zmHJUl!M Yt2&}y|Bvjb1p1W0)78&qol`;+06lANPXGV_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-r.png new file mode 100644 index 0000000000000000000000000000000000000000..7e29649ccd8886c45fc090f4fb039498612cc5d2 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJTb?eCArY;~60D08M0%POd6!x2 z{^1*B%{+K3f-A?8<3PqPO9qy{d9}w5Xy_dJ@aHPG!Tc)$3r;X@ zfA4hZz~lS?Wl6FzQ?> zU|3_rV436~qi{l>qwL6Mb$>~Vik%*pPJ8gOo4k6tU`bWLtp#m6!F~vIs6KGu00YB* Xk4V|}u5V9)zGU!p^>bP0l+XkK4fJs$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs.png deleted file mode 100644 index 7a2a48e218af19c09c1e6ae91590829df903b261..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)YE0LFh22N9%%mXP!n6qkle%lunihkaf1 z>zgZp65zdf+t6+hM%<6GG8d9tZ#-m|N*F`Bn zqhdr7WAz72XAuC?S%lReAd(nBy9MP2N|_;&7|(Hu0v~|z>GKXmfsg07h$Pl-K`DSt z1&c7KO+3d%rh>`bw`3|>`XUUFsn~6Ripr#_`zKum!AE;+?}4ZZuVsETPkw~gTe6U`2fTbp|vl{WuO26002ovPDHLk FV1fr-ryKwP diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json index 1ca0ec3cb8..84720d277e 100644 --- a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json @@ -1,65 +1,72 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "appendix" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7489d8e74693f9ca811e4f8a921de10ed96c619e/icons/obj/surgery.dmi", - "states": [ - { - "name": "appendix", - - }, - { - "name": "appendixinflamed", - - }, - { - "name": "brain", - - }, - { - "name": "ears", - - }, - { - "name": "eyeballs", - - }, - { - "name": "heart-off", - - }, - { - "name": "heart-on", - "delays": [ - [ - 0.6, - 0.1, - 0.1 - ] - ] - }, - { - "name": "kidneys", - - }, - { - "name": "liver", - - }, - { - "name": "lungs", - - }, - { - "name": "stomach", - - }, - { - "name": "tonguenormal", - - } - ] -} \ No newline at end of file + { + "name": "appendix-inflamed" + }, + { + "name": "brain" + }, + { + "name": "ears" + }, + { + "name": "eyeball-l" + }, + { + "name": "eyeball-r" + }, + { + "name": "heart-off" + }, + { + "name": "heart-on", + "delays": [ + [ + 0.6, + 0.1, + 0.1 + ] + ] + }, + { + "name": "kidney-l" + }, + { + "name": "kidney-r" + }, + { + "name": "liver" + }, + { + "name": "lung-l" + }, + { + "name": "lung-r" + }, + { + "name": "stomach" + }, + { + "name": "tongue" + }, + { + "name": "muscle" + }, + { + "name": "nerve" + }, + { + "name": "vessel" + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/muscle.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/muscle.png new file mode 100644 index 0000000000000000000000000000000000000000..38da7e760720f1bc6fb4a57d4cf3d086bc0e496c GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*yx%tS)}kq=8YXv3 zm~B+oOq0^|7M819ZTcLjhOs2bFPOpM*^M+Hr_j^IF+^ixa)Lz0ffWs>(uIs1L>yT9T3+ldmcYsBsp)v_(JQfeL17Il6M|kno7SXqKuB)Vq<3v9 z2Ufj$6*j4FNpt8K0ar%m#hardEjMXT5$!$`cxP?KlAcF-Y-y}*j{FQxCxw#(XID4@ PEobm_^>bP0l+XkK6L*yx%tS)}kq=8YY(= zSbP>J&R7!U7tG-B>_!@pW9#YS7$Pw>IbnhEi5P~3s&BXyc%Fr<=$LYand7kHC5A&6 z=A2+$CV5+=@&Hd>X6g#V?uA|w{tm1&Dl;C%FeL2akpGk@rwlZR!PC{xWt~$(695-3 BGdutQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png index 0d7be9bfe42b6030736154d907c1e527e3dd8e54..ebf1d5f5141efea3d613ee4a659f6e4f6c6b9dd7 100644 GIT binary patch delta 175 zcmeyww4ZT;L_G^L0|P^2NcwRgB^2Nj;(Fk~fu%N9Cn9~G)n|QO(((VqnuN3UJAkr` zB|(0{3=Yq3qyah6o-U3d8WYc+yC~S8z{7lDo}PobLjr^9T!sSXJN2UVnPL}e_IXze z{xmo>LHnSYL&&?zUtP9mna?yoaSULqHEpW>*3DIrAgj^w+L0+MB0R&ZeYR-G^(K!g b|DUt|Xyx3PzoGIv&>jX)S3j3^P6_2Q%vlGP-{s0DnB3UMpGs^-3&o%8X%Pi&)6-(Be<4nD%U?E10`t}YU6%`f#o)1W_hsy>{A>{x7002ovPDHLkV1mQS Bp7j6# diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/tonguenormal.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/tongue.png similarity index 100% rename from Resources/Textures/Mobs/Species/Human/organs.rsi/tonguenormal.png rename to Resources/Textures/Mobs/Species/Human/organs.rsi/tongue.png diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/vessel.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/vessel.png new file mode 100644 index 0000000000000000000000000000000000000000..cfca0298383538cd7e6e7318337bcc8e50b7bbde GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*Y*g3mmM}|`(q!G> z(g_r2ED7=pW^j0RBMr#$@pN$vk(ipCuz)>5w9#lrjr4*wD`yH!yRqZ);b6{ha9y`M!S+0dAC-!;* P&1LX(^>bP0l+XkKTjno@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json index 4fb3997c36..ce03292c8a 100644 --- a/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json @@ -1,231 +1,62 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", - "states": [ - { - "name": "full", - - }, - { - "name": "head_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "head_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json index 4bf286bb1b..a7822a9e6c 100644 --- a/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json @@ -1,231 +1,62 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica", - "states": [ - { - "name": "full", - - }, - { - "name": "head_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "head_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json index 1ed5e8a33c..1070da1203 100644 --- a/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json @@ -1 +1,75 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb", "states": [{"name": "groin_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "groin_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "head_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "head_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_foot", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "overlay_husk", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_foot", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "torso_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "torso_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "vox_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "groin_f", + "directions": 4 + }, + { + "name": "groin_m", + "directions": 4 + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "overlay_husk", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + }, + { + "name": "vox_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Parts/lungs_phoronman.png b/Resources/Textures/Mobs/Species/lungs_phoronman.png similarity index 100% rename from Resources/Textures/Mobs/Parts/lungs_phoronman.png rename to Resources/Textures/Mobs/Species/lungs_phoronman.png