From 9cc8d6902e44b6f47aa0b18946d9615c90c3bf76 Mon Sep 17 00:00:00 2001 From: PixelTK <85175107+PixelTheKermit@users.noreply.github.com> Date: Thu, 20 Jul 2023 22:55:49 +0100 Subject: [PATCH] Arachnids: New markings, new organs sprites and chelicerae (#18177) * New markings, new organs sprites and chelicerae * Update locale --- Resources/Locale/en-US/markings/arachnid.ftl | 34 ++++-- Resources/Prototypes/Body/Organs/arachnid.yml | 42 +++++++- .../Mobs/Customization/Markings/arachnid.yml | 101 ++++++++++++++---- Resources/Prototypes/Species/arachnid.yml | 3 +- .../Arachnid/appendages.rsi/chipped.png | Bin 0 -> 599 bytes .../appendages.rsi}/curled.png | Bin .../Arachnid/appendages.rsi/harvest.png | Bin 0 -> 689 bytes .../appendages.rsi}/long.png | Bin .../appendages.rsi}/meta.json | 28 +++-- .../appendages.rsi}/sharp.png | Bin .../Arachnid/appendages.rsi/short.png | Bin 0 -> 490 bytes .../appendages.rsi}/stingers.png | Bin .../appendages.rsi}/web.png | Bin .../appendages.rsi}/zigzag.png | Bin .../Arachnid/chelicerae.rsi/basic.png | Bin 0 -> 233 bytes .../Arachnid/chelicerae.rsi/meta.json | 15 +++ .../chest.rsi}/cross.png | Bin .../Arachnid/chest.rsi/heart.png | Bin 0 -> 194 bytes .../Arachnid/chest.rsi/hourglass.png | Bin 0 -> 204 bytes .../Arachnid/chest.rsi/meta.json | 43 ++++++++ .../Arachnid/chest.rsi/nail-and-hammer.png | Bin 0 -> 150 bytes .../chest.rsi}/slashes.png | Bin .../Customization/Arachnid/chest.rsi/star.png | Bin 0 -> 268 bytes .../chest.rsi}/stripes.png | Bin .../chest.rsi}/x.png | Bin .../Species/Arachnid/organs.rsi/heart-off.png | Bin 0 -> 298 bytes .../Species/Arachnid/organs.rsi/heart-on.png | Bin 0 -> 558 bytes .../Species/Arachnid/organs.rsi/lung-l.png | Bin 0 -> 266 bytes .../Species/Arachnid/organs.rsi/lung-r.png | Bin 0 -> 259 bytes .../Species/Arachnid/organs.rsi/meta.json | 29 +++++ .../Species/Arachnid/organs.rsi/muscle.png | Bin 0 -> 481 bytes .../Species/Arachnid/organs.rsi/stomach.png | Bin 0 -> 184 bytes .../Species/Arachnid/organs.rsi/web-gland.png | Bin 0 -> 433 bytes .../Mobs/Species/Arachnid/parts.rsi/eyes.png | Bin 137 -> 138 bytes .../Species/Arachnid/parts.rsi/head_f.png | Bin 429 -> 423 bytes .../Species/Arachnid/parts.rsi/head_m.png | Bin 429 -> 423 bytes .../Mobs/Species/Arachnid/parts.rsi/l_arm.png | Bin 355 -> 341 bytes .../Mobs/Species/Arachnid/parts.rsi/r_arm.png | Bin 346 -> 355 bytes .../Species/Arachnid/parts.rsi/template.png | Bin 1444 -> 1416 bytes 39 files changed, 248 insertions(+), 47 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped.png rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/appendages.rsi}/curled.png (100%) create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest.png rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/appendages.rsi}/long.png (100%) rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/appendages.rsi}/meta.json (83%) rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/appendages.rsi}/sharp.png (100%) create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short.png rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/appendages.rsi}/stingers.png (100%) rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/appendages.rsi}/web.png (100%) rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/appendages.rsi}/zigzag.png (100%) create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/chelicerae.rsi/basic.png create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/chelicerae.rsi/meta.json rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/chest.rsi}/cross.png (100%) create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart.png create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass.png create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer.png rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/chest.rsi}/slashes.png (100%) create mode 100644 Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star.png rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/chest.rsi}/stripes.png (100%) rename Resources/Textures/Mobs/Customization/{arachnid.rsi => Arachnid/chest.rsi}/x.png (100%) create mode 100644 Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-off.png create mode 100644 Resources/Textures/Mobs/Species/Arachnid/organs.rsi/heart-on.png create mode 100644 Resources/Textures/Mobs/Species/Arachnid/organs.rsi/lung-l.png create mode 100644 Resources/Textures/Mobs/Species/Arachnid/organs.rsi/lung-r.png create mode 100644 Resources/Textures/Mobs/Species/Arachnid/organs.rsi/muscle.png create mode 100644 Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach.png create mode 100644 Resources/Textures/Mobs/Species/Arachnid/organs.rsi/web-gland.png diff --git a/Resources/Locale/en-US/markings/arachnid.ftl b/Resources/Locale/en-US/markings/arachnid.ftl index d1a2ab7562..e19a03ffae 100644 --- a/Resources/Locale/en-US/markings/arachnid.ftl +++ b/Resources/Locale/en-US/markings/arachnid.ftl @@ -1,22 +1,32 @@ -marking-ArachnidAppendagesDefault = Appendages (long) +marking-ArachnidCheliceraeBasic = Chelicerae (Basic) +marking-ArachnidCheliceraeBasic-basic = Chelicerae + +marking-ArachnidAppendagesDefault = Appendages (Long) marking-ArachnidAppendagesDefault-long = Appendage -marking-ArachnidAppendagesDefault-web = Web marking-ArachnidAppendagesSharp = Appendages (Sharp) marking-ArachnidAppendagesSharp-sharp = Appendage -marking-ArachnidAppendagesSharp-web = Web marking-ArachnidAppendagesZigZag = Appendages (ZigZag) marking-ArachnidAppendagesZigZag-zigzag = Appendage -marking-ArachnidAppendagesSharp-web = Web marking-ArachnidAppendagesCurled = Appendages (Curled) marking-ArachnidAppendagesCurled-curled = Appendage -marking-ArachnidAppendagesCurled-web = Web marking-ArachnidAppendagesStingers = Appendages (Stingers) marking-ArachnidAppendagesStingers-stingers = Appendage -marking-ArachnidAppendagesStingers-web = Web + +marking-ArachnidAppendagesChipped = Appendages (Chipped) +marking-ArachnidAppendagesChipped-chipped = Appendage + +marking-ArachnidAppendagesCurled = Appendages (Curled) +marking-ArachnidAppendagesCurled-curled = Appendage + +marking-ArachnidAppendagesHarvest = Appendages (Harvest) +marking-ArachnidAppendagesHarvest-harvest = Appendage + +marking-ArachnidAppendagesShort = Appendages (Short) +marking-ArachnidAppendagesShort-short = Appendage marking-ArachnidTorsoStripes = Stripes marking-ArachnidTorsoStripes-stripes = Design @@ -29,3 +39,15 @@ marking-ArachnidTorsoCross-cross = Design marking-ArachnidTorsoX = X marking-ArachnidTorsoX-x = Design + +marking-ArachnidTorsoHeart = Heart +marking-ArachnidTorsoHeart-heart = Design + +marking-ArachnidTorsoHourglass = Hourglass +marking-ArachnidTorsoHourglass-hourglass = Design + +marking-ArachnidTorsoNailAndHammer = Nail and Hammer +marking-ArachnidTorsoNailAndHammer-nail-and-hammer = Design + +marking-ArachnidTorsoStar = Star +marking-ArachnidTorsoStar-star = Design diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 8f844e7cca..ceb8242283 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -22,8 +22,10 @@ parent: OrganAnimalStomach name: Stomach description: "Gross. This is hard to stomach." - noSpawn: true components: + - type: Sprite + sprite: Mobs/Species/Arachnid/organs.rsi + state: stomach - type: Stomach updateInterval: 1.5 - type: SolutionContainerManager @@ -33,12 +35,42 @@ - type: Metabolizer updateFrequency: 1.5 +- type: entity + id: OrganArachnidLungs + parent: BaseArachnidOrgan + name: lungs + description: "Filters oxygen from an atmosphere... just more greedily." + components: + - type: Sprite + layers: + - state: lung-l + - state: lung-r + - type: Organ + - type: Lung + - type: Metabolizer + updateFrequency: 1.5 + removeEmpty: true + solutionOnBody: false + solution: "Lung" + metabolizerTypes: [ Human ] + groups: + - id: Gas + rateModifier: 100.0 + - type: SolutionContainerManager + solutions: + organ: + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + maxVol: 100.0 + canReact: false + - type: entity id: OrganArachnidHeart - parent: BaseHumanOrgan + parent: BaseArachnidOrgan name: heart - description: "I feel bad for the heartless bastard who lost this." - noSpawn: true + description: "A disgustingly persistent little biological pump made for spiders." components: - type: Sprite state: heart-on @@ -93,7 +125,7 @@ id: OrganArachnidEyes parent: BaseArachnidOrgan name: eyes - description: "Eyes see you!" + description: "Two was already too many." components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml index 4360e5d96a..5518d71128 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml @@ -1,3 +1,13 @@ +# Chelicerae +- type: marking + id: ArachnidCheliceraeBasic + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/chelicerae.rsi + state: basic + # Appendages - type: marking id: ArachnidAppendagesDefault @@ -5,9 +15,7 @@ markingCategory: Tail speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi - state: web - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/appendages.rsi state: long - type: marking @@ -16,9 +24,7 @@ markingCategory: Tail speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi - state: web - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/appendages.rsi state: sharp - type: marking @@ -27,9 +33,7 @@ markingCategory: Tail speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi - state: web - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/appendages.rsi state: stingers - type: marking @@ -38,9 +42,7 @@ markingCategory: Tail speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi - state: web - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/appendages.rsi state: zigzag - type: marking @@ -49,11 +51,36 @@ markingCategory: Tail speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi - state: web - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/appendages.rsi state: curled +- type: marking + id: ArachnidAppendagesChipped + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/appendages.rsi + state: chipped + +- type: marking + id: ArachnidAppendagesHarvest + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/appendages.rsi + state: harvest + +- type: marking + id: ArachnidAppendagesShort + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/appendages.rsi + state: short + # Chest - type: marking id: ArachnidTorsoStripes @@ -61,7 +88,7 @@ markingCategory: Chest speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/chest.rsi state: stripes - type: marking @@ -70,7 +97,7 @@ markingCategory: Chest speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/chest.rsi state: slashes - type: marking @@ -79,7 +106,7 @@ markingCategory: Chest speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/chest.rsi state: x - type: marking @@ -88,5 +115,41 @@ markingCategory: Chest speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/arachnid.rsi + - sprite: Mobs/Customization/Arachnid/chest.rsi state: cross + +- type: marking + id: ArachnidTorsoHeart + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/chest.rsi + state: heart + +- type: marking + id: ArachnidTorsoHourglass + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/chest.rsi + state: hourglass + +- type: marking + id: ArachnidTorsoNailAndHammer + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/chest.rsi + state: nail-and-hammer + +- type: marking + id: ArachnidTorsoStar + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Arachnid] + sprites: + - sprite: Mobs/Customization/Arachnid/chest.rsi + state: star diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 50b4e4315e..64a7d08914 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -58,7 +58,8 @@ required: false HeadSide: points: 1 - required: false + required: true + defaultMarkings: [ ArachnidCheliceraeBasic ] Chest: points: 1 required: false diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped.png new file mode 100644 index 0000000000000000000000000000000000000000..96ec7b9a72fc45e4323dec7d733fda75bcbd07bf GIT binary patch literal 599 zcmV-d0;v6oP)4gjDiilQjWx6-8_ zoO5$7FilgJf5$~??;ZYsa{+7Z!pN2&oO5$-3lT}Z*8YD=%7_Sv2q6Tp))p(taUMc= z+LF-H|4&H?;D4%k?;(T$#u!lo#ux}8fcO46<)~yR|IWFYDnyi#_+QL`R4E2A41;J2 z4#Uuu>~JXQdGEm(^DIOy`6v^0IQ|zsAZKe6+S9yBc4FeS*%%X-`hF>Z^jVcc*#zAISAlmzHNKR5nUm-) zaL&!+ILZ|ZjN?eYz|{P23SMZZ_$r(l*c-qe{T8tPneFYuSJq#h0ehFhyXz~8q9}@@ zD2k#eit?GPZWtVWUf%*~%;c`{QRnq7*m5Uotz1OQ@F6kvH?e_XidAia}77U0uaEx_6L1zJGmaO%0h6`*nuo!8%` zAd;9_%ixulz7mo<3G60#r+y%bRaXH@V49|G>n)FWVXXy3Wc94Cp8;$*S5>dTX>mrQ lS1!UGVpJ4GQ55Am`~j|*&3r&s_0002ovPDHLkV1hS86}bQa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/curled.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled.png similarity index 100% rename from Resources/Textures/Mobs/Customization/arachnid.rsi/curled.png rename to Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled.png diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..90f0462b08ae2d598617ee63ecdabf35dba0536f GIT binary patch literal 689 zcmV;i0#5yjP)q0G5K4(_aN3gpeFivDXQ5HYxvHeViebeQBnq{J-`9=iGpiJBw21D1Cgc zlmct*YAsu97o`-rOu5VW@bkE36RUmJVpD8%R1mm+Q|<7tRX1h7{eQ?k)LO&i@mOsl z+*2TK_k2E=csJ(k;;0V*>=R(?12;_ofRg@d6O0YF8wNL-*|rNI?2aupfP`p&swo@emhzml2KCWyiF-oK7h zN`E&4YLXrfm=|zo&{jV_24kPG%`{Cz?m4Bu3&2&OUP$W;%ci79&4OBgz4do{z!?cq z&0s#QzvA6o;O_QV+%m?1?^I7!*J*eq>b`y+?odACC>+gWpnw<=hm!r9Qfh$u}lR##I zxq5*sQ&W>b2H@y=fgZ$#5frT70)LtA_w_xf=`%S4?wSyt^1|+r3*4cPf*=TjAY6kV X*YtXlOqWa400000NkvXXu0mjfr4L9; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/long.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long.png similarity index 100% rename from Resources/Textures/Mobs/Customization/arachnid.rsi/long.png rename to Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long.png diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/meta.json b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json similarity index 83% rename from Resources/Textures/Mobs/Customization/arachnid.rsi/meta.json rename to Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json index ff7516ad4d..f2675085d6 100644 --- a/Resources/Textures/Mobs/Customization/arachnid.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json @@ -27,25 +27,21 @@ "name": "zigzag", "directions": 4 }, + { + "name": "chipped", + "directions": 4 + }, + { + "name": "harvest", + "directions": 4 + }, + { + "name": "short", + "directions": 4 + }, { "name": "web", "directions": 4 - }, - { - "name": "stripes", - "directions": 4 - }, - { - "name": "slashes", - "directions": 4 - }, - { - "name": "x", - "directions": 4 - }, - { - "name": "cross", - "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/sharp.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp.png similarity index 100% rename from Resources/Textures/Mobs/Customization/arachnid.rsi/sharp.png rename to Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp.png diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short.png new file mode 100644 index 0000000000000000000000000000000000000000..b7f5d8628fd06359039068e056c6721c62f3302d GIT binary patch literal 490 zcmV&=<@wWhr2zK0j~n35EXBAO!$~5JCtcWQnzQ z{B-#uC0tb%`o0GMIOn2$V}`waj_ld?gAG&T#uxxV(==)a+O{15KtwhrA!J`f0HhP) z1E0#Q+5buzcg__ek`+AglPnQ|bFS$79#vJT%Q<9UL|}}8F(#_VT08naUPfcTm@C;+ zw%VY!^qY_FbWo-h2P~^3rT2SZXy@S_x7LpHAeyErLfwXMl$ z?f*NH^KqJ0ZHaA_3+aiqh4kh2_auLVbzSeC3SHNYTYrN9FbqSmPiPUGQ&>q{GjnE)J8J!?6`TK$%nyoW+PtUx?U-9IWY~$3((`*-_qD!xar!qp6{?IRv Wxfm_2@6?bB67Y2Ob6Mw<&;$S-Jzc{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chelicerae.rsi/meta.json b/Resources/Textures/Mobs/Customization/Arachnid/chelicerae.rsi/meta.json new file mode 100644 index 0000000000..0681c4e012 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Arachnid/chelicerae.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "basic", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/cross.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross.png similarity index 100% rename from Resources/Textures/Mobs/Customization/arachnid.rsi/cross.png rename to Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross.png diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart.png new file mode 100644 index 0000000000000000000000000000000000000000..184f8039eb21b2a5ac8f75502346f056f43f877a GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=ot`d^Ar*7pUb5vqY#_jPL7VyX zh9*S;rsD!V2RG;#7cBRXv~=!QS{}S+h(TiHjFN0-mmZF6*2UngF;qQw#tA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json new file mode 100644 index 0000000000..97c7e2107c --- /dev/null +++ b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stripes", + "directions": 4 + }, + { + "name": "slashes", + "directions": 4 + }, + { + "name": "x", + "directions": 4 + }, + { + "name": "cross", + "directions": 4 + }, + { + "name": "heart", + "directions": 4 + }, + { + "name": "hourglass", + "directions": 4 + }, + { + "name": "nail-and-hammer", + "directions": 4 + }, + { + "name": "star", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..09ac325b300c59c537db371b5f23f7c8562e64ed GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=v7RoDAr*7pURua|z<`J4z!~{D zf;P?9y#tqexT^kbvQGM;e>)kd?tu2)y_0`tuZ^h-ef#cSsHo<|Q?*k(bRM4Tu0LRT p+1AeV`I-Iq6>C|5N}-_P{!RvFR=uSLRXsHzAx~F7mvv4FO#m-4Gjjj{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/slashes.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes.png similarity index 100% rename from Resources/Textures/Mobs/Customization/arachnid.rsi/slashes.png rename to Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes.png diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star.png new file mode 100644 index 0000000000000000000000000000000000000000..04131696907a04a84c2af0d4ebda74d1507ba47a GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=mpxq^Ln`LHy|R(_hyss8;B&VV z5i=VFjTn^!s#(rY*eEbHdR@naqL+LnF6w`;FX`I1fkz3bjiKSa%<;haZ)V>t_fPQPiH4hZty?`Kl2=jZou1*b`Fs!WiBDWvD`>fVUeK=_4O1@N&vV%R+jPcS*@`a@ z?)E2CH+pL-|IK@+w<_xH---J==B)l76Z`B=CCD{M;Ll3)(D2#mSwgwyDR2X^n##LdZ&5E)5GT`Yni)JlSh{Wkg@ zeIGv*z+f;K{+)%+O^FwY=Jnxn(%MH$An_s*mv(C{CAqf9Qnis0Dj1;x0CTzjz zl2Jj)m=P+1y$b-?t~Us>s;+UzLNk$+Ccp?4eS;;k#;y=Dl~<85dN&_>>LKJuC?!-<&_2KKV1$bB wk;XUwheo z1<*RM>EeN+07H!o@gVh0Jlyu(F?NF-0K`6R{6EUPla;Ya>;`$8hbZ%mJoKto>;`%G zJj3Jt1H$wG00^Ia07doH6}iOiAoT&%JOF_39Spf8@A`_1T~chAy&y~vKdaz75c{+$ zh;2^vOAjhT^g9ax0AiQmEn62A-K=YE_L+PYhSC(mcK{Uksm(5^>6ad)j_d|m1oe5) zht>kbZjjf6OO7utPLRu03DZMWh@qU*SAEDL2;YIgR$IUEk~oCi+_W0HAw5KXyJqS6@FL0CdjhZH~vMmk$7{ z`Fu5TQSt#%=4sF9ZR!Jh3(&e#*L+^xZ=vJ^WKdyf7nthnjOPDEK46Hx_1BiIBA7Cn we86hHWIkZ*`TW@WH6z!oPY5A|5JINNH=JdA+x>ix{Qv*}07*qoM6N<$g0_tX5&!@I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/lung-l.png new file mode 100644 index 0000000000000000000000000000000000000000..89444ac5a97b6b2717a4cfe66f867073591e6187 GIT binary patch literal 266 zcmV+l0rmcgP)|h0&4@!3yl*AWjQ{uE zJOn`ygnwqY-E>pGF&lfJDzeUmM`1KIf1E&7WSvS?FX4l^YcPOH74a$tKsTBsTu&CT zcED7vQq{jR5h+yA)USwu_Vbp?4@ThH5YngP=V zfCPF8A6RD~FY91f?df**7VacqB+T=07=7S;hr@wb%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/lung-r.png new file mode 100644 index 0000000000000000000000000000000000000000..102a549238718065793a2f0ab63f925e054b6106 GIT binary patch literal 259 zcmV+e0sQ`nP)Vu@0+sZz3=@b zAP9o+&+NDBE;PnC2U3$pCD2hmlW= zC>^lLtxTV81PL6^CwFcx4FK9`w9(!YUTyk>oj<_+dSjZ*&_)A(V~8>Wo4jgkSG_OM z1gf?Mo>gn3zq^FMTh+eFA;J#8>*=XX(Wm<84E+rSK@fzW@&NWkNCa+FrH}vs002ov JPDHLkV1jS*X-5D6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json index 86e707e8be..6141fd5de8 100644 --- a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json @@ -15,6 +15,35 @@ }, { "name": "tongue" + }, + { + "name": "heart-on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.6 + ] + ] + }, + { + "name": "heart-off" + }, + { + "name": "lung-l" + }, + { + "name": "lung-r" + }, + { + "name": "muscle" + }, + { + "name": "stomach" + }, + { + "name": "web-gland" } ] } diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/muscle.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/muscle.png new file mode 100644 index 0000000000000000000000000000000000000000..468eb5f9f48a6c2f0807570a432aec73e73bf8df GIT binary patch literal 481 zcmV<70UrK|P)$&^^?(3432hT=MM#Ex04xq2OU;*y z`H9@~A#BzS06ZZdv8xF2aFNx?=P%dqx&@}ZSvSaKX8=glqE--Dx(d)P_k?_?a~g?S zlz6y^R#J(FizI5%-wDtzHzit0?HH4&MNz8m-w9xrSu3d|r*3K14a%c0)~?NOS!~^c z_ub!;%c?A|Tv$~wJ`9VA(@k#Xcdh=LAv)w$H;3y7Qfu3O2LgT< zv8xE#@&aSi{Y}M^1%(p3p;p6dRQDfMya|fkG@!k&W_wxfJ!DM%qKSB zcd>SN#*TlMhA!A0Jhv@2vDJdH>3;4nUxAh-Ur|obmyW*mqDphQwI}_Xb#QQS_%pl# X?{dO{l{;eP00000NkvXXu0mjfFSpp; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/stomach.png new file mode 100644 index 0000000000000000000000000000000000000000..5a82071e9423e195f7516ec79fe8563cb192eaba GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyLIFM@t_KbrSZZT+BGTtseb(0{ z9sf_PNjO`-11QT@666=m@E-)KDj)m$#m8gnQ;fEJW25*mw7kb9rB1V{g~J?p$1EmY9v}lyiBgngY472mn|v76USE zfM$`16<}2W08*{E?M&o#JO-%|w1L2yNh%dN$SUa+0GcC5V)vw4ajO9UA8+rGFMfV{ zNhFb~bWDQrI2c5Z-PqcUT*zKxr+}w9awN-BZdM(hmTn~8#;FA2LV>?6`u+78Iz1=* z2lVv(%=dh1fw*v0Q-1H1#A{$80xjL3s;2nX#E~;}!|Q7XZI~wbub-HJ7jG~NUs)=k z)9r?ipQymx{6gSALTUuZy&n1x!_eu-e3mm>x|>k{0Oc;uumf=j}~Jz5@n4ERO&G=l;7ql`T}uQ@FA%;@ReK zcy78EsI#C=p8*19yzIBCiJ5pWva?_Nl32iDafonv1%u{xtDk45S*wBsJYD@<);T3K F0RTb`C|&>n delta 108 zcmeBT>|~svk{aOY;uumf=k3jff(HzEm=C% ztL`sQ52)926 zj^sRR^N<3#c;AX)&vy_8ZpkPDcmNix(a(=8o0000y1Ky4HKPg2*DFz~d)3nypr{*;!;eFpX#+bPXYb|@7v!3&FUEFnw z3OB|~N~!t%Fbq|jaAp2iNw}1fLI^}e6ha^=<@}4>wH@-h?|<^S4tGs!J+*C1Qp(-$ zIOlG?67tFal%G-}&Q>^l1>{9zjGM>zKEK+#eC~bVa09f~leM<--oF$PV;9wdaQcJhBI9{>OV0000000000{<+fOlE>~t1Z2{-p z=7_qMt!(EU5%ISGs{#4)5<-yoepSFYj+~`V8OL$e1n)fwAyzdW#ohwe+9t+GDW#W! xYWx%A{AI&aO4afK00000000000N|5-175}yvfT$x#0&rc002ovPDHLkV1gE-y0QQO diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png index 75963f1f750494d0a17f5d53d6f579f077798581..505fd68dfff1d43de919b97b28c82a9917c10531 100644 GIT binary patch delta 397 zcmV;80doGW1E&L!B!6y6L_t(|obB2%j)O1|1<+v|T8ok+_zb?4J0HLux8e*rf=kO4 z5*1sGMc5@_40w07|4AtlBLA_2Niik@IL%tS{MEdsBzzc##yOXZ@ZO8ZIcuBGbxFr5 zD%?4@7-RDLaU82I!j<_SCE;3YiZK!qQH+ta*7+B?Ydi3`?|<^84zHTEc4^y|wAQ=d zc|0Ds-U&SUSNZcilVmF#z5{sBl+w4?_ddVcyL{<$;P3)iYZvc*6GHe>L`sQ52)926 zj^sRR^N<3#c;AX)&vy_8ZpkPDcmNix(a(=8o0000y1Ky4HKPg2*DFz~d)3nypr{*;!;eFpX#+bPXYb|@7v!3&FUEFnw z3OB|~N~!t%Fbq|jaAp2iNw}1fLI^}e6ha^=<@}4>wH@-h?|<^S4tGs!J+*C1Qp(-$ zIOlG?67tFal%G-}&Q>^l1>{9zjGM>zKEK+#eC~bVa09f~leM<--oF$PV;9wdaQcJhBI9{>OV0000000000{<+fOlE>~t1Z2{-p z=7_qMt!(EU5%ISGs{#4)5<-yoepSFYj+~`V8OL$e1n)fwAyzdW#ohwe+9t+GDW#W! xYWx%A{AI&aO4afK00000000000N|5-175}yvfT$x#0&rc002ovPDHLkV1gE-y0QQO diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_arm.png index 4cc9ae10c882aa587362567e4dfb825050f3077a..248e14fdc27bf883b6428a83afbf7695aa076457 100644 GIT binary patch delta 314 zcmaFNbd_m>O1+Gyi(^Q|oVT|&7Pc4&uwLlbz7W7>s{Z~eXBUti^CT>o=P>q@EYnyvP}S*E+!r?0)L z@pI8dEfe3%TnxFlljfzj2wcg^w~x;G|OF)|!5 z;PLhH+HD3nKf7ydcnYONZj%jqz2SUi z{2-rf!b-(HGYv-Z=}ZMLn}R+RZY-J5 zdFa!T**4`4GprxH`*+@mbN6YXBTNE`vJEQN0SpL^z|d8Kr2b^m3J zrJK4ptY*;sDR5}x2|ppH6M9Y?%M5d;OzJmW^m^A-({QP_M8^7tO*)2s$_xwM|Grug zZmpopr+C1!{Ph#Y1-Z8mS$@C2GWsO5G^@v2`Q)0Qj^`bQ@9IR&&Nm1!Ez4}$`t6#( z{l;rzmrdTCG?g83i31zyA|8ocroS!IkR$+5hUwZ?gWFa?O7ew}R4)=RZX^#yom$-2gFo-$nfy W$4jK9Z+YFr00f?{elF{r5}E)z9haZpN=8qOiTr>!m-Foa)jozd|Gau&vNa>RE38H%Fo^y659P zR`0O?tQ|<;#iOp{vDa?xT&2~)(eS?UNvLS=u{B$ZZ*LQrc$(KoUUMGrDy<+d0l^l5 zZzoDtoIPxDQQ*+3pTBR4ia*%Dr7kRnLGYl7Z*@v#=l1suAkQf&Rk_E5HCTHMQAXF&>`PYPMlpQwiL^K-;X>{n%K@gr}OFVbQ18u19u}$)63t= zH*+C>eSMwnb~~d)mSxs*?nRrQ^s<%Xr1);PyKFWa^Zot(eScCTjLH9x3;BAzhEfUu zpp?RTy*6*e*K{Dcef+i* zJ=iAKS|f@gbDw{AQNosgu~ajwp8@k=SqbmRYddbHv1tpk)&D9h3m7-1MT=G|hkKoms?!w|rCAySs*XkO68 zPvG@{EC0W?3e|OOKJ#G2uloe?w1coKf3F8&S&W2Xh`O#D9#Ge{c>`&hUXmmk ztu*f9=YN9-(C|Q8{z0X1p690Upuy7Ml~Tqi0FWdJ@;o0nykThbYpqSjq0g@Ty#^@D z5^)^=5K4itZRtGE5yvsgvK*|04L^AR8KSQ1h6mX4_ol%h2%xn#K}ZN;tSzMk@cmYV z5CFb|kk%SO5Zqk{bnz2}5Rg(DUV<%uZxHMfLVqq#Z=XlzYrkR68>JLLa}a z_gVJ@|8IC0z~x8ns*8WWxBkBdF83C{EvyaD*Oc_t5hA%`H)XA}z*x`O!WaLb#Sq_# z>3>>fQ50USR_6J!J3_bi1Bjn8feruQ)gX0Ps;c^N@ALB$05G4=hl;aCQ53(*|G)!1 z@D==gb2$g9wh~jH5g3c#stzDhipuoI8<0Ldfpcs&8*m+5`K_(S_vJWzY=~Ur@7f`9 z-6I@rEim?8z*JmLQ{dVb^;EdFJq~#62Y&#~o&XV&0#mic0sLsd@XZqMQy|N-nbsQT z^Vujt3Qds-h@TA3b#dW$ngRe2$FXTkpH3%R-n(%+olI*yj^j=phroIYq-lB)LYQuB z6h&Arm(B{5b6#*LoEJm99Okb0^z`H^vKJ(q zzj&sc0KHQS+8i%aU2+=eMf}mmfDT<)|em?`g(;Pn`M&-Dz`vZ=v zK^i>uDKWJN z(C2%bF?V}FQ52oqRlY&zgMQTm{uKP02mC3xM;E7k0iYRt=*Sx7Y2Vmxx0m^RZc1_< zk0wil-0DII%;$5j>i|M~@LU&{Kx|zJ5`Lrj@xlKe5KEg4?`WI=00000NkvXXu0mjf DE26Jj delta 1426 zcmV;D1#S9>3#1E>B!6p3L_t(|ob6h%it9QMJ$byvU{aVg0d<=)Y~$Wt{wIyQe1N-c z@;~XeceAM2B5HymjZk3>W{bQcjF25CwiL^I?_&=vo7m2r(Reg78VUHtFP=u4rkB5! zZ{|Y&{{BAO?RHv;EX%CrJc~9z>18X&N%7rocS({&fB*RSn19p=WAgvwLcU(FA*BQW zNGY*iuk{=8H62K9AHOXITP;n~OArKDuh(~<;hcN*1RDG!{<^MVGZhAV00~t}b>6>s zeQfmc+s1*x21wKNl4aSfD2f{;lu{^)!h0MT!f!hTor54_3{ezKHh5qBRzIRZQ`a@( zIM&zmJVy`&0Dt_ZL?8TvAEwkJrNm;f!0~w0_g1TwzD_A=x7%IDFb2sn`R~ExA1Z&) zgC=>N=Xia6MHEH)zETQ82*h#hq=XGWa2=?W5=tpVQKY}qJsbXq50T3yNrJ=S004TB zZIE#QV6)kbW&|4i;c(F0U0y)f^E}u5K>w6@m<8y^M1L5^F_cm_3eekleSL-b{8%7) zMNw!j0FD1rN)$!Wcz(zWcxV8!J`r)wQB_sL2&7O|Rayb16p|!yuFmf9Q^cp~XZ|lI zeS&z}L4Vklzt;nlQi$VNFGj*JL{(J{52&h2zkxJOFBB`rKo`F`cmNF#wB;XE3g>yQ z3lADB4PHvAjRIT)C1r!L(B@Z4=@dwxUHN+rAcVkjxx5idfv|1qJkPOQE+K>%tb`3e zc>o!rs;Y(u*z)(L!5|2rl+ryt()F^#uT!&*wwMS%Y)_qx`@4MGt%hKi^!=fvT;<)Mo_7;~u8t$!X) z)AX|0Y#Mv>MN#1G?G4A{agw7lbUbFYTH*8a6O6IOIf29B;OCSW!5lp2TsJ6bDLe&; zD-1($&h-wFOL}x}h)_R1ilRwt0D_bfQ51nOrc)rnW*SDA?z*d2tol3zBWVd9w_5fs+9qx!U*lx3e;RcqH334q2ZO zqG=EWLBsM>6hZs_eg<6AoOwcw%5huw2OL*}GtBseSWqX^Rx$W&O5iOe1pyh{ip~0DflrD z_*3wVE>8ObKr{Hzku}QGzOmhIFZ20am*i$Vnk)^PR%eW1KA(GC2N2qWH+69d#MYG{ g;U|h8AN>CTY21asRrs@S01E&B07*qoM6N<$f;_aQ5dZ)H