From ab719410330a1a85c435710cf20bb6107114bda9 Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sun, 9 Mar 2025 10:38:31 +1100 Subject: [PATCH] Shark Race - Feroxi (#1669) * creating a race, even a base on is a living hell * creating a race, even a base on is a living hell * correcting some things * added damage vauln and resistances (only slightly blunt and cold resistant while slash vaulnerable * thorsty fimshy * A bunch of things, theres an error sitting here with water * BREATHING WATERgit push origin shark-race-realgit push origin shark-race-real * Speech verbs, Typing indicatorm Entities and enabling certain markings * Water Vapour minorly hydrates, much slower than water due to how breathing works over drinking * slightly more damage to the bite, shorm have strong jaw * i hate rsi * i forgot to remove some ======= somewhere when rodentia were added * funny * and now fixing what i did * stuff! * PAIN AGONY RAH! * Tweaks + new organ, setting up for C# * So uh, C# is a bitch, but PROGRESS! WOO! * Emotes stuff * C# time, not 100% working but it does (somewhat) function! * Fixed feroxi dehydration! Now onto more minor things and sprites. With help of Milon and Orks! * shark spriting progress! Please give me tips and tricks for this shit, cause i have no fucking clue with spriting * SHARK TAILS, LETS FUCKING GOOOOOOOOOOOOOOOOOOOOOOO * Shark tails are DONE also some ftl, fuck you localization! I hate making things legible!! * BASE SHARK TEXTURES ARE DONE, Now I just need to do markings. * Minor edit * pushing this before starting miniproject * end of file line Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * untouch Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * cleanup Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * cleanup Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * cleanup Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * spaces Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * whatever milon is yapping about Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * pain * Update speech_verbs.yml Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * cleaning * Cleanup * fix * Update medicine.yml Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * AAAA * a * ow * revert that * Small edit * weh * DeltaV -> _DV for system * wups * Shitmed fixes, Tail tweaks, XML tweaks * WAter TANKS * Sprites for water vapor tanks. * More * Normal water vapor survival boxes work now! * Holy shit am I done (I still need to fix *gnashes) * bleh * Commenting as well as changing the component from Aquatic to Feroxi * hiding feroxi lungs * hiding feroxi lungs * extended tank fix * added a way to get H2O tanks outside of survival boxes * lowercase and removing uneeded files * Sharg wiff da underw ear * Deltaneds review fix * line that wasnt intentional to delete * relicense sprites (i have gained permission from Emily9031 for their part) * forgot this in merge fix * Shark markings! Not just Blitz markings. * scar markings as well as bionics * review fixes * Lyndo dv coment * whitespace fix * 4 tab * forgor --------- Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../_DV/Feroxi/FeroxiDehydrateComponent.cs | 32 ++ .../_DV/Feroxi/FeroxiDehydrateSystem.cs | 48 +++ Content.Shared/Body/Organ/OrganComponent.cs | 6 + .../_Shitmed/Surgery/SharedSurgerySystem.cs | 6 + Resources/Locale/en-US/_DV/chat/emotes.ftl | 1 + .../en-US/_DV/chat/managers/chat_manager.ftl | 6 + .../Locale/en-US/_DV/markings/feroxi.ftl | 143 +++++++ .../Locale/en-US/_DV/phrases/species.ftl | 1 + .../Locale/en-US/_DV/species/species.ftl | 1 + .../deltav/metabolism/metabolizer-types.ftl | 2 + .../Markers/Spawners/Random/maintenance.yml | 4 + .../Mobs/Customization/Markings/gauze.yml | 60 +-- .../Mobs/Customization/Markings/scars.yml | 10 +- .../Mobs/Customization/Markings/tattoos.yml | 4 +- .../Entities/Objects/Tools/blueprint.yml | 1 + Resources/Prototypes/Guidebook/species.yml | 1 + .../Prototypes/Loadouts/loadout_groups.yml | 9 + .../Nyanotrasen/metempsychoticHumanoids.yml | 1 + .../Reagents/Consumable/Drink/drinks.yml | 35 ++ Resources/Prototypes/Reagents/gases.yml | 4 + Resources/Prototypes/Reagents/medicine.yml | 9 + .../Prototypes/Species/species_weights.yml | 1 + .../Prototypes/_DV/Body/Organs/feroxi.yml | 64 +++ .../Prototypes/_DV/Body/Parts/feroxi.yml | 58 +++ .../Prototypes/_DV/Body/Prototypes/feroxi.yml | 49 +++ .../_DV/Catalog/Fills/Boxes/emergency.yml | 135 ++++++ .../_DV/Catalog/Fills/Items/gas_tanks.yml | 75 ++++ .../_DV/Chemistry/metabolizer_types.yml | 10 + .../Prototypes/_DV/Damage/modifier_sets.yml | 7 + .../Mobs/Customization/Markings/feroxi.yml | 389 ++++++++++++++++++ .../Mobs/Customization/Markings/makeup.yml | 6 +- .../Mobs/Customization/Markings/scars.yml | 2 +- .../_DV/Entities/Mobs/Player/feroxi.yml | 5 + .../_DV/Entities/Mobs/Species/feroxi.yml | 105 +++++ .../_DV/Entities/Mobs/Species/harpy.yml | 2 +- .../_DV/Entities/Objects/Tools/gas_tank.yml | 52 +++ .../Prototypes/_DV/Guidebook/species.yml | 5 + .../_DV/Loadouts/Miscellaneous/survival.yml | 104 +++++ .../_DV/QuickPhrases/Species/crew.yml | 9 +- .../QuickPhrases/Species/generic_species.yml | 5 + .../Prototypes/_DV/Recipes/Lathes/misc.yml | 7 + .../_DV/SoundCollections/feroxi.yml | 4 + Resources/Prototypes/_DV/Species/feroxi.yml | 152 +++++++ .../_DV/Voice/speech_emote_sounds.yml | 72 ++++ .../Prototypes/_DV/Voice/speech_emotes.yml | 35 ++ .../Prototypes/_DV/Voice/speech_verbs.yml | 9 + Resources/Prototypes/_DV/typing_indicator.yml | 5 + .../Mobs/Customization/cyberlimbs/comp1.yml | 16 +- .../Mobs/Customization/cyberlimbs/comp2.yml | 16 +- .../Customization/Markings/undershirt.yml | 20 +- .../Mobs/Customization/Markings/underwear.yml | 10 +- .../ServerInfo/Guidebook/Mobs/Species.xml | 1 + .../ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml | 30 ++ .../Effects/creampie.rsi/creampie_feroxi.png | Bin 0 -> 549 bytes .../_DV/Effects/creampie.rsi/meta.json | 38 +- .../_DV/Effects/speech.rsi/feroxi0.png | Bin 0 -> 732 bytes .../_DV/Effects/speech.rsi/feroxi1.png | Bin 0 -> 605 bytes .../_DV/Effects/speech.rsi/feroxi2.png | Bin 0 -> 598 bytes .../Textures/_DV/Effects/speech.rsi/meta.json | 21 +- .../feroxi-arm-stripes-blitz.png | Bin 0 -> 213 bytes .../feroxi-arm-stripes-tiger.png | Bin 0 -> 491 bytes .../feroxi-head-stripes-tiger.png | Bin 0 -> 556 bytes .../feroxi-leg-stripes-blitz.png | Bin 0 -> 226 bytes .../feroxi-leg-stripes-tiger.png | Bin 0 -> 499 bytes .../feroxi-torso-countershading-f.png | Bin 0 -> 378 bytes .../feroxi-torso-countershading-m.png | Bin 0 -> 315 bytes .../feroxi-torso-stripes-blitz.png | Bin 0 -> 218 bytes .../feroxi-torso-stripes-tiger.png | Bin 0 -> 639 bytes .../Feroxi/body_markings.rsi/meta.json | 47 +++ .../ear_markings.rsi/feroxi-ears-inner.png | Bin 0 -> 211 bytes .../ear_markings.rsi/feroxi-ears-tips.png | Bin 0 -> 233 bytes .../Feroxi/ear_markings.rsi/feroxi-ears.png | Bin 0 -> 274 bytes .../Feroxi/ear_markings.rsi/meta.json | 23 ++ .../feroxi-snout-countershading.png | Bin 0 -> 265 bytes .../snout_markings.rsi/feroxi-snout-nurse.png | Bin 0 -> 418 bytes .../feroxi-snout-stripe.png | Bin 0 -> 172 bytes .../snout_markings.rsi/feroxi-snout.png | Bin 0 -> 296 bytes .../Feroxi/snout_markings.rsi/meta.json | 27 ++ .../feroxi-dorsal-stripes.png | Bin 0 -> 216 bytes .../tail_markings.rsi/feroxi-dorsal-tip.png | Bin 0 -> 208 bytes .../tail_markings.rsi/feroxi-dorsal.png | Bin 0 -> 274 bytes .../feroxi-tail-bottom-tip.png | Bin 0 -> 238 bytes .../feroxi-tail-second-dorsal-tip.png | Bin 0 -> 203 bytes .../tail_markings.rsi/feroxi-tail-stripes.png | Bin 0 -> 254 bytes .../tail_markings.rsi/feroxi-tail-top-tip.png | Bin 0 -> 217 bytes .../tail_markings.rsi/feroxi-tail-under.png | Bin 0 -> 2134 bytes .../Feroxi/tail_markings.rsi/feroxi-tail.png | Bin 0 -> 800 bytes .../Feroxi/tail_markings.rsi/meta.json | 48 +++ .../Mobs/Species/Feroxi/parts.rsi/full.png | Bin 0 -> 411 bytes .../Mobs/Species/Feroxi/parts.rsi/head_f.png | Bin 0 -> 346 bytes .../Mobs/Species/Feroxi/parts.rsi/head_m.png | Bin 0 -> 337 bytes .../Mobs/Species/Feroxi/parts.rsi/l_arm.png | Bin 0 -> 256 bytes .../Mobs/Species/Feroxi/parts.rsi/l_foot.png | Bin 0 -> 249 bytes .../Mobs/Species/Feroxi/parts.rsi/l_hand.png | Bin 0 -> 261 bytes .../Mobs/Species/Feroxi/parts.rsi/l_leg.png | Bin 0 -> 226 bytes .../Mobs/Species/Feroxi/parts.rsi/meta.json | 62 +++ .../Mobs/Species/Feroxi/parts.rsi/r_arm.png | Bin 0 -> 266 bytes .../Mobs/Species/Feroxi/parts.rsi/r_foot.png | Bin 0 -> 255 bytes .../Mobs/Species/Feroxi/parts.rsi/r_hand.png | Bin 0 -> 263 bytes .../Mobs/Species/Feroxi/parts.rsi/r_leg.png | Bin 0 -> 226 bytes .../Mobs/Species/Feroxi/parts.rsi/torso_f.png | Bin 0 -> 411 bytes .../Mobs/Species/Feroxi/parts.rsi/torso_m.png | Bin 0 -> 367 bytes .../equipped-BELT.png | Bin 0 -> 634 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 448 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 489 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 443 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 358 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 484 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 459 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 460 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 438 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 448 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 634 bytes .../emergency_double_water_vapor.rsi/icon.png | Bin 0 -> 392 bytes .../inhand-left.png | Bin 0 -> 377 bytes .../inhand-right.png | Bin 0 -> 363 bytes .../meta.json | 75 ++++ .../equipped-BELT.png | Bin 0 -> 430 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 441 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 443 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 425 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 345 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 450 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 449 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 447 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 429 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 444 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 430 bytes .../icon.png | Bin 0 -> 558 bytes .../inhand-left.png | Bin 0 -> 341 bytes .../inhand-right.png | Bin 0 -> 329 bytes .../meta.json | 75 ++++ .../equipped-BELT.png | Bin 0 -> 430 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 441 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 443 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 425 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 345 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 450 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 449 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 447 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 429 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 444 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 430 bytes .../Tanks/emergency_water_vapor.rsi/icon.png | Bin 0 -> 318 bytes .../emergency_water_vapor.rsi/inhand-left.png | Bin 0 -> 341 bytes .../inhand-right.png | Bin 0 -> 329 bytes .../Tanks/emergency_water_vapor.rsi/meta.json | 75 ++++ .../water_vapor.rsi/equipped-BACKPACK.png | Bin 0 -> 432 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 811 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 814 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 801 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 358 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 450 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 449 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 821 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 799 bytes .../equipped-SUITSTORAGE-secdog.png | Bin 0 -> 1108 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 814 bytes .../water_vapor.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 432 bytes .../Objects/Tanks/water_vapor.rsi/icon.png | Bin 0 -> 406 bytes .../Tanks/water_vapor.rsi/inhand-left.png | Bin 0 -> 482 bytes .../Tanks/water_vapor.rsi/inhand-right.png | Bin 0 -> 484 bytes .../Objects/Tanks/water_vapor.rsi/meta.json | 80 ++++ 163 files changed, 2321 insertions(+), 94 deletions(-) create mode 100644 Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs create mode 100644 Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs create mode 100644 Resources/Locale/en-US/_DV/markings/feroxi.ftl create mode 100644 Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl create mode 100644 Resources/Prototypes/_DV/Body/Organs/feroxi.yml create mode 100644 Resources/Prototypes/_DV/Body/Parts/feroxi.yml create mode 100644 Resources/Prototypes/_DV/Body/Prototypes/feroxi.yml create mode 100644 Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml create mode 100644 Resources/Prototypes/_DV/Chemistry/metabolizer_types.yml create mode 100644 Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml create mode 100644 Resources/Prototypes/_DV/Entities/Mobs/Player/feroxi.yml create mode 100644 Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml create mode 100644 Resources/Prototypes/_DV/SoundCollections/feroxi.yml create mode 100644 Resources/Prototypes/_DV/Species/feroxi.yml create mode 100644 Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml create mode 100644 Resources/Textures/_DV/Effects/creampie.rsi/creampie_feroxi.png create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/feroxi0.png create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/feroxi1.png create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/feroxi2.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-tiger.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-head-stripes-tiger.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-tiger.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-f.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-m.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-tiger.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-nurse.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-stripe.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-stripes.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/full.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_f.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_m.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_foot.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_hand.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_foot.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_hand.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_f.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_m.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-secdog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json diff --git a/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs b/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs new file mode 100644 index 0000000000..894e12fd36 --- /dev/null +++ b/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs @@ -0,0 +1,32 @@ +using Content.Shared.Body.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.Feroxi; + +/// +/// Component that allows the switching between s based on thirst +/// +[RegisterComponent, Access(typeof(FeroxiDehydrateSystem))] +public sealed partial class FeroxiDehydrateComponent : Component +{ + /// + /// Defines which to use when over the + /// + [DataField(required: true)] + public ProtoId HydratedMetabolizer; + + /// + /// Defines which to use when below the + /// + [DataField(required: true)] + public ProtoId DehydratedMetabolizer; + + [DataField] + public bool Dehydrated; + + /// + /// Gives the threshold on when to flip between and + /// + [DataField(required: true)] + public float DehydrationThreshold; +} diff --git a/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs new file mode 100644 index 0000000000..f93e7e3fb2 --- /dev/null +++ b/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs @@ -0,0 +1,48 @@ +using Content.Server.Body.Components; +using Content.Server.Body.Systems; +using Content.Shared.Nutrition.Components; + +namespace Content.Server._DV.Feroxi; + +public sealed class FeroxiDehydrateSystem : EntitySystem +{ + [Dependency] private readonly BodySystem _body = default!; + + public override void Update(float frameTime) + { + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var feroxiDehydrate, out var thirst)) + { + var currentThirst = thirst.CurrentThirst; + var shouldBeDehydrated = currentThirst <= feroxiDehydrate.DehydrationThreshold; + + if (feroxiDehydrate.Dehydrated != shouldBeDehydrated) + { + UpdateDehydrationStatus((uid, feroxiDehydrate), shouldBeDehydrated); + } + } + } + + /// + /// Checks and changes the lungs when meeting the threshold for a swap of metabolizer + /// + /// + /// + private void UpdateDehydrationStatus(Entity ent, bool shouldBeDehydrated) + { + ent.Comp.Dehydrated = shouldBeDehydrated; + + foreach (var entity in _body.GetBodyOrganEntityComps(ent.Owner)) + { + if (!TryComp(entity, out var metabolizer) || metabolizer.MetabolizerTypes == null) + { + continue; + } + //Changing the metabolizer to the appropriate value based + var newMetabolizer = shouldBeDehydrated ? ent.Comp.DehydratedMetabolizer : ent.Comp.HydratedMetabolizer; + metabolizer.MetabolizerTypes!.Clear(); + metabolizer.MetabolizerTypes.Add(newMetabolizer); + } + } +} diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs index a675f64111..96e9af1844 100644 --- a/Content.Shared/Body/Organ/OrganComponent.cs +++ b/Content.Shared/Body/Organ/OrganComponent.cs @@ -69,5 +69,11 @@ public sealed partial class OrganComponent : Component, ISurgeryToolComponent // /// [DataField] public bool CanEnable = true; + + /// + /// DeltaV - Can this organ be removed? Used to be able to make organs unremovable by setting it to false. + /// + [DataField] + public bool Removable = true; // Shitmed Change End } diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs index de32ebb4dc..58638bd4df 100644 --- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs +++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs @@ -27,6 +27,7 @@ using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Content.Shared.Body.Organ; namespace Content.Shared._Shitmed.Medical.Surgery; @@ -266,6 +267,11 @@ public abstract partial class SharedSurgerySystem : EntitySystem || ent.Comp.Reattaching && !organs.Any(organ => HasComp(organ.Id)))) args.Cancelled = true; + // Start of DeltaV Additions - Checks if any organ has the removable component set to true, hiding it from the surgery UI + if (!organs.Any(organ => !TryComp(organ.Id, out var organComp) + || organComp.Removable)) + args.Cancelled = true; + // End of DeltaV Additions } else if (!ent.Comp.Inverse) args.Cancelled = true; diff --git a/Resources/Locale/en-US/_DV/chat/emotes.ftl b/Resources/Locale/en-US/_DV/chat/emotes.ftl index 6676ad49b8..1570152200 100644 --- a/Resources/Locale/en-US/_DV/chat/emotes.ftl +++ b/Resources/Locale/en-US/_DV/chat/emotes.ftl @@ -11,3 +11,4 @@ delta-chat-emote-name-snarl = Snarl delta-chat-emote-name-whine = Whine delta-chat-emote-name-howl = Howl delta-chat-emote-name-awoo = Awoo +delta-chat-emote-name-gnash = Gnash diff --git a/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl index f58ade59f6..ddc6df1e2a 100644 --- a/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl +++ b/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl @@ -27,3 +27,9 @@ chat-speech-verb-chitinid-1 = clicks chat-speech-verb-chitinid-2 = chitters chat-speech-verb-chitinid-3 = hisses chat-speech-verb-chitinid-4 = buzzes + +chat-speech-verb-name-feroxi = Feroxi +chat-speech-verb-feroxi-1 = blubs +chat-speech-verb-feroxi-2 = swishes +chat-speech-verb-feroxi-3 = gnashes +chat-speech-verb-feroxi-4 = growls diff --git a/Resources/Locale/en-US/_DV/markings/feroxi.ftl b/Resources/Locale/en-US/_DV/markings/feroxi.ftl new file mode 100644 index 0000000000..f38301b43e --- /dev/null +++ b/Resources/Locale/en-US/_DV/markings/feroxi.ftl @@ -0,0 +1,143 @@ +marking-FeroxiEars = Ears +marking-FeroxiEars-feroxi-ears = Base Ears +marking-FeroxiEars-feroxi-ears-inner = Inner Ear + +marking-FeroxiTailAndDorsal = Tail and Dorsal +marking-FeroxiTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiSnout = Snout +marking-FeroxiSnout-feroxi-snout = Base Snout + +marking-FeroxiHeadStripesTiger = Tiger Stripes +marking-FeroxiHeadStripesTiger-feroxi-head-stripes-tiger = Stripes + +marking-FeroxiEarsTips = Tipped Ears +marking-FeroxiEarsTips-feroxi-ears = Base Ears +marking-FeroxiEarsTips-feroxi-ears-inner = Inner Ear +marking-FeroxiEarsTips-feroxi-ears-tips = Ear Tips + +marking-FeroxiSnoutStripe = Striped Snout +marking-FeroxiSnoutStripe-feroxi-snout = Base Snout +marking-FeroxiSnoutStripe-feroxi-snout-stripe = Stripe + +marking-FeroxiSnoutCountershading = Countershaded Snout +marking-FeroxiSnoutCountershading-feroxi-snout = Base Snout +marking-FeroxiSnoutCountershading-feroxi-snout-Countershading = Countershading + +marking-FeroxiSnoutCountershadingStripe = Striped and Countershaded Snout with +marking-FeroxiSnoutCountershadingStripe-feroxi-snout = Base Snout +marking-FeroxiSnoutCountershadingStripe-feroxi-snout-countershading = Countershading +marking-FeroxiSnoutCountershadingStripe-feroxi-snout-stripe = Stripe + +marking-FeroxiSnoutNurse = Nurse Snout +marking-FeroxiSnoutNurse-feroxi-snout = Base Snout +marking-FeroxiSnoutNurse-feroxi-snout-nurse = Barbels + +marking-FeroxiSnoutNurseCountershading = Countershaded Nurse Snout +marking-FeroxiSnoutNurseCountershading-feroxi-snout = Base Snout +marking-FeroxiSnoutNurseCountershading-feroxi-snout-countershading = Countershading +marking-FeroxiSnoutNurseCountershading-feroxi-snout-nurse = Barbels + +marking-FeroxiTailBlitz = Striped Tail with Fin Tips and Dorsal +marking-FeroxiTailBlitz-feroxi-tail = Base Tail +marking-FeroxiTailBlitz-feroxi-tail-stripes = Tail Stripes +marking-FeroxiTailBlitz-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTailBlitz-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTailBlitz-feroxi-tail-under = Under Tail +marking-FeroxiTailBlitz-feroxi-dorsal = Base Dorsal +marking-FeroxiTailBlitz-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTailBlitzNoDorsal = Striped Tail with Fin Tips +marking-FeroxiTailBlitzNoDorsal-feroxi-tail = Base Tail +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-under = Under Tail + +marking-FeroxiStripedTail = Striped Tail +marking-FeroxiStripedTail-feroxi-tail = Base Tail +marking-FeroxiStripedTail-feroxi-tail-stripes = Tail Stripes + +marking-FeroxiStripedTailAndDorsal = Striped Tail with Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiStripedTailAndDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTail = Tail +marking-FeroxiTail-feroxi-tail = Base Tail + +marking-FeroxiTipTail = Tail with Tips +marking-FeroxiTipTail-feroxi-tail = Base Tail +marking-FeroxiTipTail-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTail-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTail-feroxi-dorsal = Base Dorsal + +marking-FeroxiTipTailAndDorsal = Tail with Tips and Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTipTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip + +marking-FeroxiTwoToneTail = Two Tone Tail +marking-FeroxiTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiTwoToneTailAndDorsal = Two Tone Tail and Dorsal +marking-FeroxiTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiStripeTwoToneTail = Two Tone Tail with Stripes +marking-FeroxiStripeTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiStripeTwoToneTail-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripeTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiStripeTwoToneTailAndDorsal = Two Tone Tail with Stripes and Dorsal +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTipTwoToneTail = Two Tone Tail with Tips +marking-FeroxiTipTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiTipTwoToneTail-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTwoToneTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiTipTwoToneTailAndDorsal = Two Tone Tail with Tips and Dorsal +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip + +marking-FeroxiTorsoStripesBlitz = Small Under Arm Stripes +marking-FeroxiTorsoStripesBlitz-feroxi-torso-stripes-blitz = Stripes + +marking-FeroxiTorsoStripesTiger = Full Stripes +marking-FeroxiTorsoStripesTiger-feroxi-torso-stripes-tiger = Stripes + +marking-FeroxiTorsoCountershadingF = Countershading (Feminine) +marking-FeroxiTorsoCountershadingF-feroxi-torso-countershading-f = Countershading + +marking-FeroxiTorsoCountershadingM = Countershading (Masculine) +marking-FeroxiTorsoCountershadingM-feroxi-torso-countershading-m = Countershading + +marking-FeroxiLegStripesBlitz = Calf Stripes +marking-FeroxiLegStripesBlitz-feroxi-leg-stripes-blitz = Stripes + +marking-FeroxiLegStripesTiger = Full Stripes +marking-FeroxiLegStripesTiger-feroxi-leg-stripes-tiger = Stripes + +marking-FeroxiArmStripesBlitz = Shoulder Stripes +marking-FeroxiArmStripesBlitz-feroxi-arm-stripes-blitz = Stripes + +marking-FeroxiArmStripesTiger = Full Stripes +marking-FeroxiArmStripesTiger-feroxi-arm-stripes-tiger = Stripes diff --git a/Resources/Locale/en-US/_DV/phrases/species.ftl b/Resources/Locale/en-US/_DV/phrases/species.ftl index fef94615ea..5378c4bed7 100644 --- a/Resources/Locale/en-US/_DV/phrases/species.ftl +++ b/Resources/Locale/en-US/_DV/phrases/species.ftl @@ -40,3 +40,4 @@ phrase-species-pest = pest phrase-species-insect = insect phrase-species-pet = pet phrase-species-chicken = chicken +phrase-species-fish = fish diff --git a/Resources/Locale/en-US/_DV/species/species.ftl b/Resources/Locale/en-US/_DV/species/species.ftl index b8cebd93d5..ce488d4fa0 100644 --- a/Resources/Locale/en-US/_DV/species/species.ftl +++ b/Resources/Locale/en-US/_DV/species/species.ftl @@ -4,3 +4,4 @@ species-name-vulpkanin = Vulpkanin species-name-harpy = Harpy species-name-rodentia = Rodentia species-name-chitinid = Chitinid +species-name-feroxi = Feroxi diff --git a/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl new file mode 100644 index 0000000000..67dffabda9 --- /dev/null +++ b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl @@ -0,0 +1,2 @@ +metabolizer-type-feroxi = Feroxi +metabolizer-type-feroxi-dehydrated = Dehydrated Feroxi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 5ada80142a..3415732295 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -205,6 +205,10 @@ children: - id: NitrogenTankFilled - id: DoubleEmergencyNitrogenTankFilled + - !type:GroupSelector # DeltaV - Random water vapor tanks spawn too + children: + - id: WaterVaporTankFilled + - id: DoubleEmergencyWaterVaporTankFilled - id: EmergencyFunnyOxygenTankFilled weight: 0.5 - !type:GroupSelector diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 2f8fba5d7a..a545bba94c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -226,7 +226,7 @@ id: GauzeHead bodyPart: Head markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid, Thaven] # Delta V - Chitinid, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid, Thaven, Feroxi] # Delta V - Chitinid, Thaven, Feroxi coloring: default: type: @@ -312,7 +312,7 @@ id: GauzeMothBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -326,7 +326,7 @@ id: GauzeMothShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -340,7 +340,7 @@ id: GauzeMothStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -354,7 +354,7 @@ id: GauzeMothLeftEyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -368,7 +368,7 @@ id: GauzeMothLeftEyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -382,7 +382,7 @@ id: GauzeMothRightEyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -396,7 +396,7 @@ id: GauzeMothRightEyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -410,7 +410,7 @@ id: GauzeMothUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -424,7 +424,7 @@ id: GauzeMothUpperArmLeft bodyPart: LArm markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -438,7 +438,7 @@ id: GauzeMothUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -452,7 +452,7 @@ id: GauzeMothUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -466,7 +466,7 @@ id: GauzeMothLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -480,7 +480,7 @@ id: GauzeMothLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 822be2893c..68b47030eb 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia] # Delta V - Felinid, Oni, Harpy, Rodentia + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi] # Delta V - Felinid, Oni, Harpy, Rodentia, Feroxi followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -12,7 +12,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia] # Delta V - Felinid, Oni, Harpy, Rodentia + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi] # Delta V - Felinid, Oni, Harpy, Rodentia, Feroxi followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni - DeltaV - Feroxi sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni - DeltaV - Feroxi sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni - DeltaV - Feroxi sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 6310f1b34f..3266acb7fe 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -116,7 +116,7 @@ id: TattooEyeRight bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia coloring: default: type: @@ -130,7 +130,7 @@ id: TattooEyeLeft bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia coloring: default: type: diff --git a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml index 2d7fa79d48..18b91943a9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml @@ -49,3 +49,4 @@ providedRecipes: - DoubleEmergencyOxygenTank - DoubleEmergencyNitrogenTank + - DoubleEmergencyWaterVaporTank # DeltaV - New tank new recipe diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index a5d08ef640..1d83b2c6f9 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -19,6 +19,7 @@ - Rodentia - Chitinid - IPC + - Feroxi # ImpStation additions - Thaven diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index b642dd3dc6..118cd0885b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -88,6 +88,7 @@ - EmergencyOxygen - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVapor # DeltaV - type: loadoutGroup id: GroupEVATank @@ -96,6 +97,7 @@ loadouts: - LoadoutSpeciesEVANitrogen - LoadoutSpeciesEVAOxygen + - LoadoutSpeciesEVAWaterVapor # DeltaV - type: loadoutGroup id: GroupPocketTankDouble @@ -104,6 +106,7 @@ loadouts: - LoadoutSpeciesPocketDoubleNitrogen - LoadoutSpeciesPocketDoubleOxygen + - LoadoutSpeciesPocketDoubleWaterVapor # DeltaV # Command - type: loadoutGroup @@ -540,6 +543,7 @@ - EmergencyOxygenClown - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporClown # DeltaV - type: loadoutGroup id: MimeHead @@ -599,6 +603,7 @@ - EmergencyOxygenMime - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporMime # DeltaV - type: loadoutGroup id: MusicianJumpsuit @@ -905,6 +910,7 @@ - EmergencyOxygenExtended - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporExtended # DeltaV # Science - type: loadoutGroup @@ -1237,6 +1243,7 @@ - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporSecurity # DeltaV - type: loadoutGroup id: SecurityStar @@ -1436,6 +1443,7 @@ - EmergencyOxygenMedical - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporMedical # DeltaV # Wildcards - type: loadoutGroup @@ -1481,6 +1489,7 @@ - EmergencyOxygenSyndicate - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporSyndicate # DeltaV - type: loadoutGroup id: GroupSpeciesBreathTool diff --git a/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml index a4d96c109e..b23b5c6431 100644 --- a/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml +++ b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml @@ -12,3 +12,4 @@ SlimePerson: 0.5 Vulpkanin: 0.5 Rodentia: 0.5 + Feroxi: 0.5 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index ad680a5fbc..f94f6157e0 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -447,6 +447,41 @@ effects: - !type:SatiateThirst factor: 4 + Gas: # DeltaV - Feroxi get to breathe with this too! + effects: + - !type:Oxygenate + conditions: + - !type:OrganType + type: Feroxi + - !type:SatiateThirst + conditions: + - !type:OrganType + type: Feroxi + factor: 2 + - !type:Oxygenate + conditions: + - !type:OrganType + type: FeroxiDehydrated + - !type:SatiateThirst + conditions: + - !type:OrganType + type: FeroxiDehydrated + factor: 2 + # DeltaV Converts H2O into CO2 for Feroxi + - !type:ModifyLungGas + conditions: + - !type:OrganType + type: Feroxi + ratios: # DeltaV no duplicating O2 >:3 + CarbonDioxide: 0.5 + WaterVapor: -1.0 + - !type:ModifyLungGas + conditions: + - !type:OrganType + type: FeroxiDehydrated + ratios: # DeltaV no duplicating O2 >:3 + CarbonDioxide: 0.5 + WaterVapor: -1.0 - type: reagent id: Ice diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 634b2c473e..171226b63b 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -26,6 +26,10 @@ conditions: - !type:OrganType type: Plant + - !type:Oxygenate # DeltaV - Feroxi Still need to breathe + conditions: + - !type:OrganType + type: Feroxi # Convert Oxygen into CO2. - !type:ModifyLungGas conditions: diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index fc866c9b77..0b58294649 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -666,7 +666,16 @@ Drink: effects: - !type:SatiateThirst + conditions: # DeltaV nerf of saline for Feroxi + - !type:OrganType + type: Feroxi + shouldHave: false factor: 6 + - !type:SatiateThirst # DeltaV nerf of saline for Feroxi + conditions: + - !type:OrganType + type: Feroxi + factor: 2 - !type:ModifyBloodLevel amount: 6 diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml index 1a5a0323e4..9c01342573 100644 --- a/Resources/Prototypes/Species/species_weights.yml +++ b/Resources/Prototypes/Species/species_weights.yml @@ -9,5 +9,6 @@ Felinid: 4 # Nyanotrasen - Felinid, see Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml Vulpkanin: 3 # DeltaV - Vulpkanin, see Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml Rodentia: 3 # DeltaV - Rodentia, see Prototypes/_DV/Entities/Mobs/Species/rodentia.yml + Feroxi: 3 # DeltaV - Feroxi, see Prototypes/_DV/Entities/Mobs/Species/feroxi.yml Diona: 2 Chitinid: 3 # DeltaV - Chitinid, see Prototypes/_DV/Entities/Mobs/Species/chitinid.yml diff --git a/Resources/Prototypes/_DV/Body/Organs/feroxi.yml b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml new file mode 100644 index 0000000000..75d8e3eba9 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml @@ -0,0 +1,64 @@ +- type: entity + parent: OrganAnimalStomach + id: OrganFeroxiStomach + name: feroxian stomach + categories: [ HideSpawnMenu ] + components: + - type: Stomach + specialDigestible: + tags: + - ReptilianFood + - Meat + - Pill + - Crayon + - Paper + - type: Metabolizer + maxReagents: 2 + metabolizerTypes: [ Feroxi, Animal ] + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 + +- type: entity + parent: BaseHumanOrgan + id: OrganFeroxiLungs + name: feroxian lungs and gills + description: "A pair of amphibious lungs along with gills, filtering oxygen out of the air continuously." + components: + - type: Sprite + sprite: Mobs/Species/Human/organs.rsi + layers: + - state: lung-l + - state: lung-r + - type: Organ + removable: false + - type: Lung + - type: Metabolizer + removeEmpty: true + solutionOnBody: false + solution: "Lung" + metabolizerTypes: [ Feroxi ] + groups: + - id: Gas + rateModifier: 100.0 + - type: SolutionContainerManager + solutions: + organ: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + maxVol: 100 + canReact: False + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 diff --git a/Resources/Prototypes/_DV/Body/Parts/feroxi.yml b/Resources/Prototypes/_DV/Body/Parts/feroxi.yml new file mode 100644 index 0000000000..f3f958b183 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Parts/feroxi.yml @@ -0,0 +1,58 @@ +- type: entity + parent: [ BasePart ] + abstract: true + id: PartFeroxiBase + name: feroxi body part + components: + - type: Sprite + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + +- type: entity + parent: [ PartFeroxiBase, BaseTorso ] + id: TorsoFeroxi + name: feroxi torso + +- type: entity + parent: [ PartFeroxiBase, BaseHead ] + id: HeadFeroxi + name: feroxi head + +- type: entity + parent: [ PartFeroxiBase, BaseLeftArm ] + id: LeftArmFeroxi + name: left feroxi arm + +- type: entity + parent: [ PartFeroxiBase, BaseRightArm ] + id: RightArmFeroxi + name: right feroxi arm + +- type: entity + parent: [ PartFeroxiBase, BaseLeftHand ] + id: LeftHandFeroxi + name: left feroxi hand + +- type: entity + parent: [ PartFeroxiBase, BaseRightHand ] + id: RightHandFeroxi + name: right feroxi hand + +- type: entity + parent: [ PartFeroxiBase, BaseLeftLeg ] + id: LeftLegFeroxi + name: left feroxi leg + +- type: entity + parent: [ PartFeroxiBase, BaseRightLeg ] + id: RightLegFeroxi + name: right feroxi leg + +- type: entity + parent: [ PartFeroxiBase, BaseLeftFoot ] + id: LeftFootFeroxi + name: left feroxi foot + +- type: entity + parent: [ PartFeroxiBase, BaseRightFoot ] + id: RightFootFeroxi + name: right feroxi foot diff --git a/Resources/Prototypes/_DV/Body/Prototypes/feroxi.yml b/Resources/Prototypes/_DV/Body/Prototypes/feroxi.yml new file mode 100644 index 0000000000..3984c2bbd3 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Prototypes/feroxi.yml @@ -0,0 +1,49 @@ +- type: body + name: species-name-feroxi + id: Feroxi + root: torso + slots: + head: + part: HeadFeroxi + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoFeroxi + organs: + heart: OrganAnimalHeart + lungs: OrganFeroxiLungs + stomach: OrganFeroxiStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + connections: + - right arm + - left arm + - right leg + - left leg + right arm: + part: RightArmFeroxi + connections: + - right hand + left arm: + part: LeftArmFeroxi + connections: + - left hand + right hand: + part: RightHandFeroxi + left hand: + part: LeftHandFeroxi + right leg: + part: RightLegFeroxi + connections: + - right foot + left leg: + part: LeftLegFeroxi + connections: + - left foot + right foot: + part: RightFootFeroxi + left foot: + part: LeftFootFeroxi diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml index f7b8d7db2e..3b45a4edf2 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml @@ -42,3 +42,138 @@ - id: Oilpack1 - id: CableApcStack10 - id: WelderMini + +- type: entity + parent: BoxSurvivalBrigmedic + id: BoxSurvivalBrigmedicWaterVapor + suffix: MedSec H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedicalSecurity + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + # Intentionally wrong picture on the box. NT did not care enough to change it. + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvival + id: BoxSurvivalWaterVapor + suffix: Standard H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalEngineering + id: BoxSurvivalEngineeringWaterVapor + suffix: Extended H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: ExtendedEmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalSecurity + id: BoxSurvivalSecurityWaterVapor + suffix: Security H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSecurity + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalMedical + id: BoxSurvivalMedicalWaterVapor + suffix: Medical H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedical + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxHug + id: BoxHugWaterVapor + suffix: Emergency H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalWaterVapor + id: BoxMimeWaterVapor + suffix: Mime, Emergency H2O + components: + - type: StorageFill + contents: + - id: SpaceMedipen + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalSyndicate + id: BoxSurvivalSyndicateWaterVapor + suffix: Syndicate H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSyndicate + - id: ExtendedEmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml new file mode 100644 index 0000000000..216193e9e1 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml @@ -0,0 +1,75 @@ +- type: entity + id: WaterVaporTankFilled + parent: WaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 31 minutes + volume: 5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 2.051379050 # water vapor + temperature: 293.15 + +- type: entity + id: EmergencyWaterVaporTankFilled + parent: EmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 4 minutes + volume: 0.66 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 0.270782035 # water vapor + temperature: 293.15 + +- type: entity + id: ExtendedEmergencyWaterVaporTankFilled + parent: ExtendedEmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 9 minutes + volume: 1.5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 0.615413715 # water vapor + temperature: 293.15 + +- type: entity + id: DoubleEmergencyWaterVaporTankFilled + parent: DoubleEmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 15 minutes + volume: 2.5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 1.025689525 # water vapor + temperature: 293.15 diff --git a/Resources/Prototypes/_DV/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_DV/Chemistry/metabolizer_types.yml new file mode 100644 index 0000000000..c29cf4b42e --- /dev/null +++ b/Resources/Prototypes/_DV/Chemistry/metabolizer_types.yml @@ -0,0 +1,10 @@ +# If your species wants to metabolize stuff differently, +# you'll likely have to tag its metabolizers with something other than Human. + +- type: metabolizerType + id: Feroxi + name: metabolizer-type-feroxi + +- type: metabolizerType + id: FeroxiDehydrated + name: metabolizer-type-feroxi-dehydrated diff --git a/Resources/Prototypes/_DV/Damage/modifier_sets.yml b/Resources/Prototypes/_DV/Damage/modifier_sets.yml index f88f0adc9a..2aac478438 100644 --- a/Resources/Prototypes/_DV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_DV/Damage/modifier_sets.yml @@ -17,6 +17,13 @@ Slash: 1.15 Piercing: 1.15 +- type: damageModifierSet + id: Feroxi + coefficients: + Cold: 0.9 + Blunt: 0.9 + Slash: 1.1 + - type: damageModifierSet id: StorageTank coefficients: diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml new file mode 100644 index 0000000000..994af53cb1 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -0,0 +1,389 @@ +# Default +- type: marking + id: FeroxiEars + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears-inner + +- type: marking + id: FeroxiTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + +- type: marking + id: FeroxiSnout + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + +# Ears Markings +- type: marking + id: FeroxiEarsTips + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears-inner + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears-tips + +# Snout Markings +- type: marking + id: FeroxiSnoutStripe + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-stripe + +- type: marking + id: FeroxiSnoutCountershading + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + +- type: marking + id: FeroxiSnoutCountershadingStripe + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-stripe + +- type: marking + id: FeroxiSnoutNurse + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-nurse + +- type: marking + id: FeroxiSnoutNurseCountershading + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-nurse + +# Tail Markings +- type: marking + id: FeroxiTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + +- type: marking + id: FeroxiStripedTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + +- type: marking + id: FeroxiStripedTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTipTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + +- type: marking + id: FeroxiTipTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip + +- type: marking + id: FeroxiTailBlitz + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTailBlitzNoDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + +- type: marking + id: FeroxiStripeTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiStripeTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTipTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTipTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip + +# Body Markings +- type: marking + id: FeroxiHeadStripesTiger + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-head-stripes-tiger + +- type: marking + id: FeroxiTorsoStripesBlitz + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-stripes-blitz + +- type: marking + id: FeroxiTorsoCountershadingF + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-countershading-f + +- type: marking + id: FeroxiTorsoCountershadingM + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-countershading-m + +- type: marking + id: FeroxiTorsoStripesTiger + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-stripes-tiger + +# Leg Markings +- type: marking + id: FeroxiLegStripesBlitz + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-leg-stripes-blitz + +- type: marking + id: FeroxiLegStripesTiger + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-leg-stripes-tiger + +# Arm Markings +- type: marking + id: FeroxiArmStripesBlitz + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-arm-stripes-blitz + +- type: marking + id: FeroxiArmStripesTiger + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-arm-stripes-tiger diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml index f5f83ca422..e9374a9d43 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml @@ -16,7 +16,7 @@ id: MakeupBlush bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Harpy, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: MakeupNailPolishRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: MakeupNailPolishLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml index c074ef72b9..6b6d64cfc4 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/feroxi.yml new file mode 100644 index 0000000000..8184ca5b5f --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/feroxi.yml @@ -0,0 +1,5 @@ +- type: entity + save: false + name: Urist McFin + parent: BaseMobFeroxi + id: MobFeroxi diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml new file mode 100644 index 0000000000..ca45e896ae --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml @@ -0,0 +1,105 @@ +- type: entity + parent: BaseMobSpeciesOrganic + id: BaseMobFeroxi + name: Urist McFin + save: false + abstract: true + components: + - type: HumanoidAppearance + species: Feroxi + - type: Hunger + - type: Carriable + - type: Inventory + speciesId: feroxi + - type: Thirst + baseDecayRate: 0.2 + - type: Icon + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: full + - type: Body + prototype: Feroxi + - type: Speech + speechSounds: Tenor + speechVerb: Feroxi + allowedEmotes: [ "Gnash" ] + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 + # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. + # sprite refactor when + state: l_leg + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] # Dynamically generated + sprite: "_DV/Effects/creampie.rsi" + state: "creampie_feroxi" + visible: false + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 30 + animation: WeaponArcBite + damage: + types: + Piercing: 7 # oooh scary extra damage~ + - type: Perishable + - type: Damageable + damageModifierSet: Feroxi + - type: TypingIndicator + proto: feroxi + - type: FeroxiDehydrate + hydratedMetabolizer: Feroxi + dehydratedMetabolizer: FeroxiDehydrated + dehydrationThreshold: 150 + +- type: entity + parent: MobHumanDummy + id: MobFeroxiDummy + name: Feroxi Dummy + save: false + categories: [ HideSpawnMenu ] + description: A dummy feroxi meant to be used in character setup. + components: + - type: HumanoidAppearance + species: Feroxi diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml index 2395e99179..63a9605270 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml @@ -113,7 +113,7 @@ - type: Speech speechSounds: Harpy speechVerb: Harpy - allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw', 'Squish', 'Chitter', 'Squeak', 'Click', ] + allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw', 'Squish', 'Chitter', 'Squeak', 'Click', 'Gnash',] - type: Vocal sounds: Male: SoundsHarpy diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml new file mode 100644 index 0000000000..722b40d895 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml @@ -0,0 +1,52 @@ +- type: entity + parent: OxygenTank + id: WaterVaporTank + name: water vapor tank + description: A standard cylindrical gas tank for water vapor. It can hold 5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/water_vapor.rsi + +- type: entity + parent: EmergencyOxygenTank + id: EmergencyWaterVaporTank + name: emergency water vapor tank + description: An easily portable tank for emergencies. Contains very little water vapor, rated for survival use only. It can hold 0.66 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + +- type: entity + parent: ExtendedEmergencyOxygenTank + id: ExtendedEmergencyWaterVaporTank + name: extended-capacity emergency water vapor tank + description: An emergency tank with extended capacity. Technically rated for prolonged use. It can hold 1.5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + +- type: entity + parent: DoubleEmergencyOxygenTank + id: DoubleEmergencyWaterVaporTank + name: double emergency water vapor tank + description: A high-grade dual-tank emergency life support container. It holds a decent amount of water vapor for its small size. It can hold 2.5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + diff --git a/Resources/Prototypes/_DV/Guidebook/species.yml b/Resources/Prototypes/_DV/Guidebook/species.yml index a5c6c1df24..feb8cd2a37 100644 --- a/Resources/Prototypes/_DV/Guidebook/species.yml +++ b/Resources/Prototypes/_DV/Guidebook/species.yml @@ -27,3 +27,8 @@ id: Chitinid name: species-name-chitinid text: "/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml" + +- type: guideEntry + id: Feroxi + name: species-name-feroxi + text: "/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml" diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index de467628dc..5c88074132 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -1,3 +1,99 @@ +# Species +- type: loadoutEffectGroup + id: WaterBreather + effects: + - !type:SpeciesLoadoutEffect + species: + - Feroxi + +# Basic +- type: loadout + id: EmergencyWaterVapor + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalWaterVapor + +# Clown +- type: loadout + id: EmergencyWaterVaporClown + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxHugWaterVapor + +# Mime +- type: loadout + id: EmergencyWaterVaporMime + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxMimeWaterVapor + +# Engineering / Extended +- type: loadout + id: EmergencyWaterVaporExtended + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalEngineeringWaterVapor + +# Medical +- type: loadout + id: EmergencyWaterVaporMedical + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalMedicalWaterVapor + +# Security +- type: loadout + id: EmergencyWaterVaporSecurity + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalSecurityWaterVapor + +# Syndicate +- type: loadout + id: EmergencyWaterVaporSyndicate + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalWaterVapor + +# Full EVA Tank, Any Species +- type: loadout + id: LoadoutSpeciesEVAWaterVapor + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + suitstorage: WaterVaporTankFilled + +# Species-appropriate Double Emergency Tank in Pocket 1 +- type: loadout + id: LoadoutSpeciesPocketDoubleWaterVapor + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + pocket1: DoubleEmergencyWaterVaporTankFilled + # Corpsman - type: loadout id: EmergencyOxygenCorpsman @@ -17,6 +113,14 @@ back: - BoxSurvivalBrigmedicNitrogen +- type: loadout + id: EmergencyWaterVaporCorpsman + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + mask: BoxSurvivalBrigmedicWaterVapor + - type: loadout id: LoadoutSpeciesBreathToolCorpsman effects: diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml index a93c664b83..a99603cdb2 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml @@ -63,8 +63,13 @@ id: SpeciesVoxPhrase parent: BaseCrewSpeciesPhrase text: species-name-vox - + - type: quickPhrase id: SpeciesRodentiaPhrase parent: BaseCrewSpeciesPhrase - text: species-name-rodentia + text: species-name-rodentia + +- type: quickPhrase + id: SpeciesFeroxiPhrase + parent: BaseCrewSpeciesPhrase + text: species-name-feroxi diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml index 6a12736cc6..1d51e1e438 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml @@ -53,3 +53,8 @@ id: SpeciesPetPhrase parent: BaseGenericSpeciesPhrase text: phrase-species-pet + +- type: quickPhrase + id: SpeciesFishPhrase + parent: BaseGenericSpeciesPhrase + text: phrase-species-fish diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml b/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml index 574b240bce..53ae0cfc79 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml @@ -47,3 +47,10 @@ materials: Silver: 500 Diamond: 100 + +- type: latheRecipe + id: DoubleEmergencyWaterVaporTank + result: DoubleEmergencyWaterVaporTank + completetime: 4 + materials: + Steel: 250 diff --git a/Resources/Prototypes/_DV/SoundCollections/feroxi.yml b/Resources/Prototypes/_DV/SoundCollections/feroxi.yml new file mode 100644 index 0000000000..67e8c474b8 --- /dev/null +++ b/Resources/Prototypes/_DV/SoundCollections/feroxi.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: FeroxiGnashes + files: + - /Audio/Effects/bite.ogg diff --git a/Resources/Prototypes/_DV/Species/feroxi.yml b/Resources/Prototypes/_DV/Species/feroxi.yml new file mode 100644 index 0000000000..3c85d0e437 --- /dev/null +++ b/Resources/Prototypes/_DV/Species/feroxi.yml @@ -0,0 +1,152 @@ +- type: species + id: Feroxi + name: species-name-feroxi + roundStart: true + prototype: MobFeroxi + sprites: MobFeroxiSprites + defaultSkinTone: "#8DB9D6" + markingLimits: MobFeroxiMarkingLimits + dollPrototype: MobFeroxiDummy + skinColoration: Hues + maleFirstNames: names_first_male + femaleFirstNames: names_first_female + lastNames: names_last + +- type: speciesBaseSprites + id: MobFeroxiSprites + sprites: + Head: MobFeroxiHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobFeroxiTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobHumanoidAnyMarking + Eyes: MobHumanoidEyes + LArm: MobFeroxiLArm + RArm: MobFeroxiRArm + LHand: MobFeroxiLHand + RHand: MobFeroxiRHand + LLeg: MobFeroxiLLeg + RLeg: MobFeroxiRLeg + LFoot: MobFeroxiLFoot + RFoot: MobFeroxiRFoot + +- type: markingPoints + id: MobFeroxiMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Head: + points: 3 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ FeroxiEars ] + Snout: + points: 1 + required: true + defaultMarkings: [ FeroxiSnout ] + Chest: + points: 3 + required: false + Arms: + points: 1 + required: false + Legs: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ FeroxiTailAndDorsal ] + +- type: humanoidBaseSprite + id: MobFeroxiHead + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobFeroxiHeadMale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobFeroxiHeadFemale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobFeroxiTorso + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobFeroxiTorsoMale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobFeroxiTorsoFemale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobFeroxiLLeg + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobFeroxiLHand + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobFeroxiLArm + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobFeroxiLFoot + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobFeroxiRLeg + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobFeroxiRHand + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobFeroxiRArm + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobFeroxiRFoot + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml index 1a250450e8..9aa8c54ca6 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml @@ -276,3 +276,75 @@ collection: MaleGasp DefaultDeathgasp: collection: MothDeathGasp + +- type: emoteSounds + id: MaleFeroxi + params: + variation: 0.125 + sounds: + Scream: + collection: MaleScreams + Laugh: + collection: MaleLaugh + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh + Hew: + collection: Hew + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Yawn: + collection: MaleYawn + Gnash: + collection: FeroxiGnashes + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MaleDeathGasp + +- type: emoteSounds + id: FemaleFeroxi + params: + variation: 0.125 + sounds: + Scream: + collection: FemaleScreams + Laugh: + collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + Yawn: + collection: FemaleYawn + Snore: + collection: Snores + Honk: + collection: CluwneHorn + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh + Hew: + collection: Hew + Gnash: + collection: FeroxiGnashes + Gasp: + collection: FemaleGasp + DefaultDeathgasp: + collection: FemaleDeathGasp diff --git a/Resources/Prototypes/_DV/Voice/speech_emotes.yml b/Resources/Prototypes/_DV/Voice/speech_emotes.yml index be396f03cd..8485bc47ec 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emotes.yml @@ -215,3 +215,38 @@ - awoos - awooing - awooed + +# Feroxi +- type: emote + id: Gnash + name: delta-chat-emote-name-gnash + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [gnashes.] + chatTriggers: + - gnash + - gnashes + - gnashing + - gnashed + - gnash teeth + - gnashes teeth + - gnashing teeth + - gnashed teeth + - gnashes their teeth + - gnashes her teeth + - gnashes his teeth + - gnashes its teeth + - gnashing their teeth + - gnashing her teeth + - gnashing his teeth + - gnashing its teeth + - gnashed their teeth + - gnashed her teeth + - gnashed his teeth + - gnashed its teeth diff --git a/Resources/Prototypes/_DV/Voice/speech_verbs.yml b/Resources/Prototypes/_DV/Voice/speech_verbs.yml index e5c4b72724..ecb6fb7404 100644 --- a/Resources/Prototypes/_DV/Voice/speech_verbs.yml +++ b/Resources/Prototypes/_DV/Voice/speech_verbs.yml @@ -42,3 +42,12 @@ - chat-speech-verb-chitinid-2 - chat-speech-verb-chitinid-3 - chat-speech-verb-chitinid-4 + +- type: speechVerb + id: Feroxi + name: chat-speech-verb-name-feroxi + speechVerbStrings: + - chat-speech-verb-feroxi-1 + - chat-speech-verb-feroxi-2 + - chat-speech-verb-feroxi-3 + - chat-speech-verb-feroxi-4 diff --git a/Resources/Prototypes/_DV/typing_indicator.yml b/Resources/Prototypes/_DV/typing_indicator.yml index 6958106dde..ae5e758193 100644 --- a/Resources/Prototypes/_DV/typing_indicator.yml +++ b/Resources/Prototypes/_DV/typing_indicator.yml @@ -21,3 +21,8 @@ spritePath: /Textures/_DV/Effects/speech.rsi typingState: thaven0 offset: -0.2, 0.1 # 0625 + +- type: typingIndicator + id: feroxi + spritePath: /Textures/_DV/Effects/speech.rsi + typingState: feroxi0 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml index de00242f59..cced8c038f 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingComp1LArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_arm-primary @@ -15,7 +15,7 @@ id: CyberLimbsMarkingComp1LHand bodyPart: LHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_hand @@ -24,7 +24,7 @@ id: CyberLimbsMarkingComp1LLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_leg-primary @@ -36,7 +36,7 @@ id: CyberLimbsMarkingComp1LFoot bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_foot @@ -47,7 +47,7 @@ id: CyberLimbsMarkingComp1RArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_arm-primary @@ -61,7 +61,7 @@ id: CyberLimbsMarkingComp1RHand bodyPart: RHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_hand @@ -70,7 +70,7 @@ id: CyberLimbsMarkingComp1RLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_leg-primary @@ -82,7 +82,7 @@ id: CyberLimbsMarkingComp1RFoot bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_foot diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml index fd9b42cfd7..9057f654fb 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingComp2LArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_arm-1 @@ -13,7 +13,7 @@ id: CyberLimbsMarkingComp2LHand bodyPart: LHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_hand-1 @@ -24,7 +24,7 @@ id: CyberLimbsMarkingComp2LLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_leg-1 @@ -36,7 +36,7 @@ id: CyberLimbsMarkingComp2LFoot bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_foot-1 @@ -49,7 +49,7 @@ id: CyberLimbsMarkingComp2RArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_arm-1 @@ -61,7 +61,7 @@ id: CyberLimbsMarkingComp2RHand bodyPart: RHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_hand-1 @@ -73,7 +73,7 @@ id: CyberLimbsMarkingComp2RLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_leg-1 @@ -85,7 +85,7 @@ id: CyberLimbsMarkingComp2RFoot bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_foot-1 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml index 5161d4cb9b..0bf010543b 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml @@ -2,7 +2,7 @@ id: UndershirtDefault bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -16,7 +16,7 @@ id: UndershirtRolled bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: UndershirtSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: UndershirtRolledSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -58,7 +58,7 @@ id: UndershirtGrossSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -72,7 +72,7 @@ id: UndershirtNanotrasen bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -86,7 +86,7 @@ id: UndershirtBinder bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -100,7 +100,7 @@ id: UndershirtBraClassic bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -114,7 +114,7 @@ id: UndershirtBraSports bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -128,7 +128,7 @@ id: UndershirtBraStrapless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml index f3bf745377..b8199e4b43 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml @@ -2,7 +2,7 @@ id: UnderwearDefault bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -16,7 +16,7 @@ id: UnderwearBriefs bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: UnderwearLowriders bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: UnderwearSatin bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -58,7 +58,7 @@ id: UnderwearTanga bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index 212eac983c..06a6cde246 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -26,6 +26,7 @@ + diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml new file mode 100644 index 0000000000..161b636cd3 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml @@ -0,0 +1,30 @@ + + # Feroxi + + + + + + The Feroxi (fer-ox-i) are a race of humanoid shark-like beings. Carnivourous in nature with a strong bite force. + + ## Diet + + - Can ONLY eat meat. + - Will get poisoned by Theobromine (Chocolate, Tea, Coffee) and Allicin (Onion, Garlic). + + ## Benefits + + - Uses their jaws to do piercing damage, and harder than other species, rivaling Oni. + - Their cartilaginous skeleton allows them to resist blunt force trauma more easily. + - Their adaptation to native environments allows them to resist the cold more easily. + - Their biology allow them to breathe water vapour. + + ## Drawbacks + + - They take 10% more Slash damage. + - Gets thirsty 100% faster. That's faster than a Diona! + - When thirst falls to "Parched" they begin to suffocate. Have water handy! + - Saline is too salty! It hydrates you much less! + - Your lungs are unremovable as theyre intergrated with your gills. + + diff --git a/Resources/Textures/_DV/Effects/creampie.rsi/creampie_feroxi.png b/Resources/Textures/_DV/Effects/creampie.rsi/creampie_feroxi.png new file mode 100644 index 0000000000000000000000000000000000000000..c3c34b6e50389dab61c6646c60ff92e7e904c9f8 GIT binary patch literal 549 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z{y&)Z`OdTt7mIH!RtJjdF24T@NU@d#`33(60*2q)_=14~oCO|{ z#S9F5he4R}c>anMprAyFYeY$Kep*R+Vo@qXKw@TIiJqTph=Qq}p`Ow2J4Tx04UFukvU5PQ51zg6E|Wcg%%PlQm9xch=N#31Z|>462YyRnQTIqVP=8^ zTfxR6U?JML75)Ql1zQC{Py`W6Yqv&Zye|nPh!(!#&HXrU&gH%{;E807oZUPLxx8aV zXTqU{#idZ&Gah^dXeFo_wmBP{j`QdGxTQ(en_<<9|E-Qh(l(%}U3lCuEk{_UA+qL} zinoNjjf|EMJ`f(VWI*9drR!CGQk<^xn_?>-oszq$o}qLD>kVvVteo(ma9=K4G-~sx zoA{IY`Iyw8>|Si5%n&AoPLWlzI1Ee8OJ=|OMk>BJ3gR*3ZBoJ#N1BXyheRz(*QC^x z=t+69lvM6N^R!cAqt)*IFtj|n?rT4^ZNpdDbw3YX_v;9}4{)BZ`wNoO#JlL_y4JT3 zfekplsB8KToNYqSy{TDRMe@q_q*Cy50-cM{bq&7dYF4##j_)A8F2CpscK2XFz7MQ? z1JOBW^w>}-VE_OC32;bRa{vGf5dZ)S5dnW>Uy%R+0S!q+K~#8N?b=HY!Y~X)(Uwio z{SOeVs^mp>2sRLRj#+Sf zFCrF^ny(YE+kW=Iz1qc6^Zg3cp#ITZtqk0R#C!k%00000008jwrs)lQ#k;l*?aVX) O00004Tx04UFukvmHRK@^2QqY}|*3N1t|Qm9xch=OP*5lj;;Vgz5!W|B>WJeJ)A z3ATcbMZiL|@m2T_v=wX>1VIr*EUkSt64pCLNDwWYW%hoY*>kyb7Chm!$~X-Zkjdul zNGKSXUsw!ypYYI(k2b~)E%xdOfIn@xRp)PdEzdnuJG{W#@%u8p5l2 zOY^31he{c7;eFu&TLu)q(0Z)GkD8Mee${M8Ba?DB-7}D^;aCl;l${ao7w*ZV3+j6w zeG^|IJ2xw}OLjL75kdqB5Tn2fY4Qw8%}Qp!`-Z-JGvvgh$^ndrT9akD+w|+OME_sgl+AIY+k;U6WsQ2|K&cC*S** zKLH;QXc(2}e-How010qNS#tmY3lRVS3lRZ-WM7d00050iL_t(oN9~e94uv2LM8Qkx z{TIf6D(q{DA9M?DoR>6(&SEBooc4Tx04UFukvmHRK@^2QqY}|*3N1t|Qm9xch=OP*5lj;;Vgz5!W|B>WJeJ)A z3ATcbMZiL|@m2T_v=wX>1VIr*EUkSt64pCLNDwWYW%hoY*>kyb7Chm!$~X-Zkjdul zNGKSXUsw!ypYYI(k2b~)E%xdOfIn@xRp)PdEzdnuJG{W#@%u8p5l2 zOY^31he{c7;eFu&TLu)q(0Z)GkD8Mee${M8Ba?DB-7}D^;aCl;l${ao7w*ZV3+j6w zeG^|IJ2xw}OLjL75kdqB5Tn2fY4Qw8%}Qp!`-Z-JGvvgh$^ndrT9akD+w|+OME_sgl+AIY+k;U6WsQ2|K&cC*S** zKLH;QXc(2}e-How010qNS#tmY3lRVS3lRZ-WM7d0004$bL_t(oN9~e94uBvG1i??q z{|^RVg8YO%ZbACX|38=puwMY|2(byhiREB`@!EX@+IwUX*ao_2eCYM$ kgCPhZgb+dqA%7;N3n%O}6Y_e;rT_o{07*qoM6N<$f=cT9qyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Effects/speech.rsi/meta.json b/Resources/Textures/_DV/Effects/speech.rsi/meta.json index eb055d9d57..9193b20805 100644 --- a/Resources/Textures/_DV/Effects/speech.rsi/meta.json +++ b/Resources/Textures/_DV/Effects/speech.rsi/meta.json @@ -1,11 +1,11 @@ -{ +{ "version": 1, "size": { "x": 32, "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Felinid sprites made by Adrian16199 (Github), Rodentia sprites made by portfiend", + "copyright": "Felinid sprites made by Adrian16199 (Github), Rodentia sprites made by portfiend, Feroxi sprites made by BlitzTheSquishy", "states": [ { "name": "felinid0", @@ -74,6 +74,23 @@ 0.3 ] ] + }, + { + "name": "feroxi0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5 + ] + ] + }, + { + "name": "feroxi1" + }, + { + "name": "feroxi2" } ] } diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png new file mode 100644 index 0000000000000000000000000000000000000000..eb2b8391b7dcd49b29a2b23ebc594090e0b01c7f GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFw4`$F{C2y?X82nhZT4j9Ck4!8!}He;5Rl9 z(+&u{7%#tak%q>u-#4b^++?-@s{i1unY!iLF)jX?e~a^`F2A!^9w-O`au2pXO5A!) yF!|3D&87RFumA8@{>9$*IiJPM8G*7JmJ8fl9H?j|eb3$rq}tQf&t;ucLK6T|K17)S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-tiger.png new file mode 100644 index 0000000000000000000000000000000000000000..195377a94a9bc2a55943a1c05f89ef3bdb53ae8c GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~f)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7 zdPcwZFmD5@*_ImNnda%K#lQjNurf$7vNA9NSzbUa4P}E|qru1w7H0yo4H=mj1b}oD z5NEctfW@nu389}32$^ev_z|Oz|RB2#jY{0kxVk*c+)&&rgrU2O>zyvgx z39K^6(gMhW>M}Gi0Ld=b*thPt=)pHY<}6Pa$B>G+x3_i+HXHCT1f;VbOAv9p#L%-O zP@-9MjvlL}#o^XwmG@JvUSD1@$s1_bgIJdb+cy?Hy!`}h0YJzw7b1lh*G@MqF-qYbJ`S@*v$eZ9+w=kU5an^V)~KHuqc zIpkQOP5n0OyLaE2aMwRParU2&{BM4sjsx>6n6^)ey}QRshp00i_>zopr0L4Cw Ax&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-head-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-head-stripes-tiger.png new file mode 100644 index 0000000000000000000000000000000000000000..2083785e8677513e0f57e399eedd7af27fc75f14 GIT binary patch literal 556 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#jDP+qP}Vk|k57OaY4Z2EWSzQmiFGe!>5NfZ_KxzF?pLXMsm# zF#`kNVGw3Kp1&dmC@4|l8c`CQpH@Eaj?;r@1-qtIam9_Fekpd zt}Q;x_xkO=B`m56sv3-%j+`A_XG}QHY(3+vf1l(1bG5)3QTwZ>vxzyFv>d(mqrH$* zMt7evpZ^8n35H!?e*I&Kymqon#e31@C0>hcy#knmnuI0@?by%I_s{ObP0l+XkKKC_?7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae825cc12a86b1f781dc3ca27f89923afb60c9d GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!E#R*$B>G+x3@O(GAr`125jOpHsoYB;50Vi zO5SkDwa;mCNM})(U)B1bZHLPEIe|KWpdvWiR;l{^@pa0N_q;x_+2z0CvE+NN|Lm}@ zwu2~Oh`I81ru@zKA1t4Tc>P>;eEpIA4O_!z6)(GXE54j@o!V0CPxFl<6xIeD1*!LR L^>bP0l+XkKm%~lq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-tiger.png new file mode 100644 index 0000000000000000000000000000000000000000..f23df762ac856233f0028ca4e69364f05eef3367 GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwZriqP$&w{iRaHQN#d7z*fz*`*`33*~|DVA@YvmUppR>RtvY3H^ z?+^$xifVW@00kvVTq8}~ z1<-Ra8qHD$pwt9*1{R=710!Pt#sv^lK{m23fS5D|$OZu>pt($7l|hykKo(S&p@9KN zw$J)t_+{}uen4iGr;B4qg!|iRj(iOYJS?Zb{jWFcmdj9fxwyj6T6~iU5AXD(I>FP@ z=@T88lp0xFns&2>JEp2`3_Ivx^DJ*Q>k|y^ep?b-8s~JvAoEN_Wy+Lo+qP9zRn^zmFZnO{2`I`|666=m@E-)KDj)m< zid^+{aSW-L^Y-#yz9s_!_78DyeHJI0X58o%b7$wYTem*p3FDs!tSvj5rP3Wdc|803 z%~Y&T^2)xe%lvOH(y?p-`&q2{Mn4 zRdRMsIV-uJ-C;{kB-5#fZNHTG4K^rDd4A=b6Uzy;uc-&Zo{2SId*#Sq$1;um%J;HR z1)lg>#;=1|&xQWm`|fiDv%>y|wyzw@4>v95v3be!MX@v?W3jGZInSNH8Er;A%EreU zmb$Fl+V7b9N72GL`Y&e%vuBC3<5h`0#y}79rABzB`T8k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zE?Kf<%9JVFwr#7bssf7HWSvw2QmiFGe!>5NfZ_KxzF?pLXMsm# zF#`kN5fEmas?8@26kOuz;usR){&wm?K4wJ@m-L4J|DUzx@N2x5dbKpS;<#YEfl#Y# zljVv_O=1>{8C1GYMd&FpxTvH=s~vPbvCW0?{%^@mx`#XMGZI8%bf-wo$Xj^tz<fOjmdGH|G}!hnn^`}Wo{h)xBIA$2FPChlcjdm@7EQS0^Q5t>FVdQ&MBb@0P{R_ AlK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png new file mode 100644 index 0000000000000000000000000000000000000000..ee93064e4a523bcf72ebfd09df1b1391b1f3d4e7 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFyGU~F{C2y?akf1hYfgG9jbVzO1Ud%GW0Gf z49Vh^=Il{Ooujnz;qJDaA1~v9>KX2w-E_VGO4Ri!K~Lr^p7Lqd+r8_Pdu9~7Wxu^} zPWfN0JV*@?=)GF4^LOI$_iry(hyC|X|H;h2(2(7EgMn+F3iDNG`$mu&Pgg&ebxsLQ E0R5FpYybcN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-tiger.png new file mode 100644 index 0000000000000000000000000000000000000000..71474ed3019c1bd771de4b96ea865d180137d6d1 GIT binary patch literal 639 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#jCkS+ZoxlquV`Z3Buq6j&StQmiFGe!>5NfZ_KxzF?pLXMsm# zF#`i1P?GN;tX-Wcrlc58x++uFVL^B%MMn!i4NmNAlPRr#jf->Z&9eVy!A z5c{m$QD?WVma#%($BpuqRt>wjzY}zCFr{*DbNK0a@K1_0e+E1Ett$bKKfY%T z(uukwlDLqKojvrxbHA4G7O^}Y#dAz+C#383$uWv-nV@jM+hM`Z=Um-Ro$+~!kpc@? x6ef6n;;yOh(A7EAbn>mU9%gjMIiJ^A$gwA<$A=T`^c{qMVz38FUKBa>;BkNzCy Re?mvv4FO#s5QP}l$f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png new file mode 100644 index 0000000000000000000000000000000000000000..8a4ca1aa0ee2fbed69a3b767b2a153a81a10b9f0 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yR#jDP+qMnJ`;om*2S_oO1o;L3|Icv!6faOM180FpWHAE+-$4*& z+%YlxEl{x8)5S3)!u{91uv@z1D6JaNB~2f>VyZ|4>-z)u3Yzopr0B5vaY5)KL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json new file mode 100644 index 0000000000..4f0707b4c9 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "feroxi-ears", + "directions": 4 + }, + { + "name": "feroxi-ears-inner", + "directions": 4 + }, + { + "name": "feroxi-ears-tips", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png new file mode 100644 index 0000000000000000000000000000000000000000..ac58aa3e010ac85283aeb1c69855009cd440c865 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xPMI=g+qP|0RaHxtEa~a#0qJ>q{ST00D+%%o{tp5SoA)o-4;0}n z@Q5sCVBk9d!i-thIyr%Yd7dtgArbCxuR8KIIB+-zauxm8o~_4j$d;b$^MBJt@tDk= zGp{DjYT##TTe-vTePN6K>Ey3Ww|75qWnwX4WSYUi_-1>9>HduUm0S3DUN9{1Tf@k7 wm(hkXa66yD_iulFzCSZwcN(J5$Ke_0tLgsL4^J(d1+Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-nurse.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-nurse.png new file mode 100644 index 0000000000000000000000000000000000000000..d01ad85758c1836431cde510ce88ff055435e717 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zp3(0;%-eu!wxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;YB0U#X( z#F_0ZVDT&<8wB>3F*3YhM$l-MG61C}ursg#RT>x>8!#?_m$Nv;eZ8x(p2rK(c(crI%W|;Y_N(dPSmrssl%ACwESy9l$n?q%eV0ttA!`njxgN@xNA Dy3H*U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png new file mode 100644 index 0000000000000000000000000000000000000000..a46c41813db8276184524300324e60e5257243b7 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xZriqP$&w{iRaH}_OzG+A0SfnbbISuMwvr&f;Qt`NuzCNI{Xh}U z0*}aI1_r)^Ak4U9V)k30V6Uf(V@QPi+i4s5ju>z__gen@Ki$71t7ECguBUAFrJdaV zQ*eRqwwR6@ISxsPKN{(Xg3!xP_jV$BYQ`a%E{~i#s471p00i_>zopr0Hwi3 AIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4cea1fdcf43f1ce4a6927c4edd11fb298b16c1 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFxAt=F{C2y?X8Wx4F)_c4u>TqO_@`g&de}% zn0QG^MWFR)Z1VK{?PWlv2ma@*UKX5f>!oRUtm9hLEz7u>-VwS$2@v>jVbA{W_b%Ui ukp6AAd{gaJ@6XK2tIynIWMKH=cZBoOJ4w}k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zPMI>Ls;X++wrxw6ECGsDUb$ulq*zOW{DS`j0mJWYe8E5g&H|6f zVg?4jLm%*5d|I_snFHdAKR^&QY|Mcjej=O8r zjxsP@_{ZMz*|TBBF_UW97oiJ88F#*0-YCGpAO%LZmN$HOb9cK;X~QoGvnaVr<`ti3 zm?ep;6}(H|cYu{yD)rrgdJ`UxHQ8nN^gkvtFk~>CYB<68KGeQ@+1si1KxZ&`y85}S Ib4q9e0CqcK!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png new file mode 100644 index 0000000000000000000000000000000000000000..624f4b4d3556371018722f07500feb5d4b65737c GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;V6&%-V@O5Z+gk^DnG^+B1GeyZEoJap%FCOU zbZ4qG+x3?U*4k+-jIJ_*bNwT{y^dTbS zU`58lFR47H?w@9IcH5uHws-2Ts#ME5&B)KQoKY~f p^4P4u%kS9ARC%Aj*=XJJfpPv(FQ(ebRTL zu=_)7a^OGbbSa=R28R~IV?XCc_NBM|YCor=xTisK+xLHS@;=Y`D|G1Xfu~K(AVmxe zmRkDi>EE`>t&cc#ZV%UrZS&_x-nZux&97fQN0uSuEz_p;8iJl#oZ29@p00i_>zopr E0Q|8=j{pDw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png new file mode 100644 index 0000000000000000000000000000000000000000..471867639c5e69ec56f50fe7411777f91a133087 GIT binary patch literal 2134 zcmcIld2G{G7&nYbE9WSqV=y+$P$+1Q?Zk0nt7!*Gj|fsi6H1xH@$&o zG!P()7%H%JfEdTb7$7L;LySF6>qJy*0QH-CT>)-d@!S}^mr`#flR#Oza-R-p7Nw*sDD?vmMSxxi5 z8I=q_U$bL@Zj;? zCH<}qt=m*b3AO89{j%I&ynK)1V4xZB zr+2Ndzva%(DQdVkzMydJ)}iwoUgg`>-#3yg+I9M3gr#qN*4dp48vCE`I;XTTzxe6k zZH@EWwav{s_u2iQFKfGM_s`zunF%hb82x#UuTm4etal+8?f+cf5+I z?h&mTcH}_MZ709}W8a!f-KTgnJ%d(WyzSkgWYmV2hIgDi)0ETq37a{xdi0+2Iogkz z6Mopey{vJeZ3SY#FEge1BkQOZ*5hI9pUG#4&qIOX?4BD=EOSMwhUx$aZSf#L1MV`tcFRUzsqDK-*F-%28g`vV^h^PUE6Gf3>jf~MqV+0)=AJ#ye4##>WNt$UKCwpzu;vmX!29^nh^r#c)n3gvVJ2%JjR&>leK8l!P z6pNIr5ao?SVXarnU4|{b(Q-AI$U=q;3Zf8(#qe%i%T@(Wm%9b6XB|*N(S!$9xCNyt z{(rT3BOd*iMEI%Av0Dq@8^~0iIuMH?IU=xJkH_h-QTnEm9D#}~C0?P?XyyDqfwlmd zqj>@AZiTFmW{nV-{0Ins8K!ug;g|-(5a~Ra*`Qz&iy6tH46HP7=8ZHjA`=Y&5NYJ+ zWGEnLg|eLTAEGL_^+53Tcyt~a^YA|2%=v&oLo2@VR>4PGW!XoI5V5>yHClMHK#?+( z@*`>p;F2jJ5I{^c9H2;DS!saVX`_q=wt49e0?m)1Hp&GcImFX!_9`Ld(SWWTCzv@4 z&+`@me=H`x8Bv1N7;Y_{i(?HY%%=-4;n=Z)K<_&2n#f49s|aWj)f@T2cZqxm65|Ls-D15sn4n0K#V$w@cEZ zyrm?fD9F4SSZHAM;gTW~qOCkD(41@*SyAM98RC*A{bLcoRsmErAb_*ON#O2CBtd2+ zW$Tv$R*XfuCM-Uitcm6XFDFPwt7Nj$tVLq6O3eS0jLGNc%%Z^2P_RInhdxLH(PW~b zAM!{r@iNC5Q!)OhWXv>c_OeFF%u6QWZOLRa`jmOSTG`Co3Y)~eHl31_FX4?xA6{X< z)HKysEfX1qaYAj~z^ z?^?b2e&@8_M0z37doGdP_1hB%^O@^Sri?w}#3>C|#T%apC9S$z(+uWfTj%Tnt*LzQ6vr=kVhpBlcDcWt*6@J3Btsy3}7= dzO?3}=dW_VJXZI?MEwuMnOEdkH*n0ihrz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png new file mode 100644 index 0000000000000000000000000000000000000000..00570d0e22dee61d063e538dc831afdfb24fb843 GIT binary patch literal 800 zcmV+*1K<3KP)4Tx04UFukvT{MK^TQU*N7sDg(*Z7wooerq9T?W1rZ{I7$F{oyBiaQ>>73> zHkN{Iz`~>PDr~H^wXhWg!2`t7%1Y5jWc?=zBnS~480O>6yvNKN&<-<}?FIV4c5-fP zBCIE7=k)p)>Ik6G35MlmN2AdQRmbNYHEO*LsVx3Cnv+YO1vR?xh?RA7!i&N~>$$Ar zUE!d$Y$S!xgnM1Npzwpz%_6@lP8V2HnL#%m8xsx+>*)$ME7)3gZQ()TuB7cqzLqF* zQt^gjJF{k$?x|kbwB*c8D_v#>6HGEi6djW_R>+VeB&#EeM@;s^Rs8J*e^gwixK^;l zG0rMBM!}EzgWuhHse%4tQd1b}o_+tl8|t^=JMa5nN521k47E>i>6HDehcNshdcLf6 z9YD(_oL`kSa|bTApzSehxJE&$m8qpt@OCQSGz+aa&^TZ0t+da{J;bG}$TjTkLr+?= z7plCwp|ZC>&y@Q60n;dQXL*;aMF0Q*4^T{0MS6OAwzjsUq@AI|e;NBz`m4;cxzt@@$~H&y3maInp2v zh%`t8A`Pa0+EaX)7R%5OJsg&;P6bEcIWVEoJjc_Mg(aoH#`x eivEh1a^eFVD?B;^{1plS00003 z!RuemZV^xO+h4GB`rbUCa6&1;$cZO@!jbjI*%*0_N-cDDw2OGp<;}{pXg!O8PtG%S z#-8^R=c_JA2$-=dlkwY%F7G{O8h<+3Pn%XLr?j;fOX_XR-_BVZMZoI>O zTB)V|(29>=W0M3TnnmYv2Iw)FOTK5h+j8%iuR~!nKUZt5X9zdDUX7{Gr1hbf(+q5m z3+-u%ocz4@vihE$)9p?>=5bAEIO?c4XYU-AZ3p&myMLo{rb-#-d$EL1Diw+Ord+nd x4EGmz`W;x?wLy9Afkf+tyj4OnsY2JkGAo7&Slkm)Rs@CvgQu&X%Q~loCIFe%p{@V` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_f.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_f.png new file mode 100644 index 0000000000000000000000000000000000000000..04ffbcbe87664a7d581006be7e0ef439f35fdbe9 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yR#jDP+qP}WlqvuJ|6j6XNl#A?P-cpKj1Q1vFA4Gs28sg#gOoS3 z8&HU|z$3Dlfr0NZ2s0kfUy%Y7-0kV&7!u+BcA6s}vm%EpG_z7#Tl<|U4Jz7ZFZP(fnfk;xEMvxJJ#!|vE9xR18aM8U z=|poppMLP^x<}zg`aAD8h}SrBdM%i;fW-?)Sv21Hzw*E3;(h8T;w(*?7E-eB-_^>bP0l+XkKhuMLr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_m.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_m.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9f32e9b142e58d386dd8ec2d2de0b9999a3967 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yR#jDP+qP}WlqvuJ|6j6XNl#A?P-cpKj1Q1vFA4Gs28sg#gOoS3 z8&HU|z$3Dlfr0NZ2s0kfUy%Y7+~n!v7!u+B_S!){Wx&NFatXMR_Wjb~ zGiEm@M8-Wj8B{-GKXXS>;rq8fXXbFW-|IQzIxpfvt^S(HUqa^v{CKnb9z$ zBj3t0idqWlxz?2jSF8TM^qaZj0nqLX3=9hx85|xn?ED{G^!}|!>i*r=UR({kbE>Al zr}qERNx}P>mmYJFm5*VVbP0l+XkKGkl5k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_arm.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..90352d9f23a6acda9805b9ac3565ee244d270949 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwR#jDP+qP}Vk|jWa)xtYVKpuWQyT@NQ`Eaggqi=;_hV?EWPo4z!rT)78&qol`;+0JN4>Q2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_foot.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..7a40a74ec1c9b02344cc899ad7be4964b55deb96 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwR#jCkS+Zo?wrxNG&npu`K-$9ZS}671WP?_oH|c&_)JNS3j3^P6k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#jDP+qP}Vk|k57OaY4Z2EWSzQmiFGe!>5NfZ_KxzF?pLXMsm# zF#`kNVGw3Kp1&dmD46Hz;usR){`Q(9SAzkM%SDrC|I(+eyen~hQqY|fe|n8hEZ&{9 zaV7(!M+3tb-h{PJ=lX<~lyd#3*n8an0n3M0;TGF;qpxw#s+d?57?~z8FuquSz~}6B ylfU02{HKLCyyV=&;Nxx2_1eL!fnf`$%bYv``@H^lV&y=a89ZJ6T-G@yGywokSY8$Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_leg.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..a3bc415fc05f3dd3212673473e70df447e63a26c GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwR#jCkS+Zo?wrxNG&npu`Kk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwR#jDP+qP}Vk|jWa)xtYVKR9JQ*IiC~WcTLr`s+gM4C)pKHqQR@ZbnBmLx!3}!M{ISV%cKY85-EYD2!`QdD?@% z_iG(~xNr;nUnI%#N4clVe*()oCI$!Q32ZKMEg|}uo+_&=fKFiWboFyt=akR{0A>eU ARR910 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_foot.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..d5e1985ef5986ec27bbd3ffb5736c158d63fe317 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwR#jDP+qP}Vk|jWa)xtYVK2>W7`PZ57%eWe|F_wt r|B@@=H{Twv@^B93oFCEG-(E9wuGWu!+|_6Yw3ort)z4*}Q$iB};dfM0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_hand.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..0d5957e191fa210d03e54a60d2d4dc9f21f102ae GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#jDP+qP}Vk|k57OaY4Z2EWSzQmiFGe!>5NfZ_KxzF?pLXMsm# zF#`kNVGw3Kp1&dmC|Ka>;usR){`Q(9UxNaV%f+DT|HiXBb-Z#L*uvBPxe34Iw$?6_ zU}WlGVEiJfu=Z{AzYWY=_OH7va^Vo~7v33f&hxixCug#7C@`@IFfzT!Z}|UOZRvd_ zgJ_|3|75rhlz2wmU$9NZ=Bm0A3&#TI18>+eR@>*9ycYNkw41@x)z4*}Q$iB}^N?Cx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_leg.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..a17d4299060b2728e4f4d9dd80b9d3e85da36abd GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwR#jDP+qP}Vk|jWa)xtYVK$i<+*!*Vd=-~aTzMqFH4D>g){U!M0fje&uS!GUoP zTg0j2^F>_l4DF3e85l$u8kiUY+8cL87w)+A>ua@u#J_q5of7E+{S+a6<)7hPKY>Ow Nc)I$ztaD0e0su{1MrZ&4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_f.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_f.png new file mode 100644 index 0000000000000000000000000000000000000000..8bfe93d38680720494663d7e96c5c188acd749fb GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xR#jCkS+ZoxlquV`ZL6=Z2MW)UnVXXXXmjQgAzp04I#xKZQA z;2Y54{X=v9f!?JSmu4Rg3~PG++d=K1{y~m~`;w=eE4Z+w$(-Sq+fGJ>X>&EIuRhXX zebLGox{oF8kJQooi{3Zub)O5$=e9eyZv|@v!&N4ohF7T#-|ovPeeIB+%l-WRzVJy8 zkNy4A_S|XK1cnbvYusltz6)!Z?{6%}>cctneZtxKOa-j2(kCytTYU|ie9Zg6-_{jd z6)HG+4XWZeogK0TayUv(&3JNtD?>fQjqm&)MZAn_oVgTe~DWM4fBZ{Lv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_m.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_m.png new file mode 100644 index 0000000000000000000000000000000000000000..396a20064e65f70ceaa1eb3676dbdc88dfe4cb57 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xR#jCkS+ZoxlquV`ZL6=Z2MW)UnVJsPYf<2FxxMKB|I@dbW;?uG&{=ITyYJYA zGd~_Q1X;;zF>)IG6>&JCbf{&)Gx7KQtW$$#M9w#Cys~!U$?^s@mLFVBwU=kqI&D~IJOPa%w2VyN(stl|3CbTG5MM`wX*$l z;jd*v6BvS-gc7PG9qM;i<<4+S&^h$~-wL?{%Zsh|Kinz6CiKCsfh|Vfa^==pJdCAm zcj8xMaT~2KV0?4W{E%3Hbc-EJl#uw(Y}E(+49|ZuUXAjSJ0>CZ9_T*?Pgg&ebxsLQ E0EirofdBvi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..26672b7c9d7e806188306c29e091f7b6b756aaa2 GIT binary patch literal 634 zcmV-=0)_pFP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tn#0RWtHn5GE;n9XLD?BSh@i`UX6r{%ui?^>26 zT-OzrWeGnBy2twFGY72zUDsh421cXNUe}k=-kV_U<2!7(TL>ZK)M;xp8sd2}5!u+j zx)Pq}?cKn#(d59-v|6q6YPEX(>G2U^7~(VM`10_8!C>$~o_lO^y}{{px=WG-Q4}Ff zQv^W(P0Q80(#zEVynOn?Fhm^3ST2`Xtyc1s)8{yj_;DnJ5JCtcgb+dqA%qY@$p3{g zCKzMFvMiDPJ^qta*U0^6=vUh9HaO?7Z5y0(Ijx-P8igA$9*<#~CN`T5Y}=O8N_9FN zO?8dJ4ZzEpf!%H=hm{)+hlw2fr?RsG&1UoanE`o@YOd=ltx;$N7>0rOcXu!h18;9{ zQK{ABDWzAa0RS+c&mn}sVzH1@%6Xo5CZ3+~Jeeq41qU~PF=oVZj3|l_$1&FHwelTW z*6a1sI8E{9=0;8(tk5Yh$8k&m>m*5DX`1%c_x(cm%cEYepX<85{TsCiA%vW|Z;4gM UH8N*c?*IS*07*qoM6N<$g4*>S3;+NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000000000000000000000000000000000..1a477780f7abca57e089623cc4050e3e79d807f2 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{CQ(d&EKa^ zJ()clsAHeh{F6Y6za+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`$g3;5(F(ktM z?X-(|hZT5Sdz)ACYX1MfQ@F>#N6qNSmiErYUY>Ve2fMFi5)g0PXK-39$MMm6Rt7eQ zuRdIh98Fdks52zEX<=%>CsWV+d)mRh$&T_~oWJ-Ld>S*y-G9)!< zLk;(X6ECNEI==aL;&YR9^aj>W-5X6u?1dUy6qJNq_HVT=atPXHHjR1X_cLeaWtxb5 zOn;?aCMz@7M{>EjfK+zwsSlCU+qDYv!zFwY`oy1{*?lbQm({_#rx}bp%G9^-lMwto z-J;4MwK{mw(kl%=jhCH&G5_#3T#|3%)9!iMN4+gY2{3k>fYrg3jm b_{hlf>LyRjl80A-A;jS6>gTe~DWM4fP2sd^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc2615cc096fada80d7fe605dc9dbf4b39056d3 GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p1o(uws;a6=NJyBNm^eB*rlh2}ySvxc*7|rSwYRr>czC40+MJh{7Z(?2 zWMrhJrS<3h`OwhN{QUgir%u_~*%@nUKAAn+;Mq)|VN zfND4kJR*x382Ao>Fr%o3R|C+YY@RNTArbCxrzPe$D+simf4%F~En&YmKmPwOX;ge# za8PhoT}DOHqIvIalT4UyxGCsgxx^a#pkgaS0)v3W$zC{7*4VRBg>U0HF6>-$W z9lLDO31pqQUb<)EiV&`Zuw9-Gv!q$i+)<0Ta!D+|o_2H;Y}2KXR#?^Ym;1-lZ&GqG#GD=ePeC zJmI0{u(9D+x2EJik44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{CQ(d&EKa^ zJ()clsAHeh{F6Y6za+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`G{_%8i42f`m zJMDE}ivo|E_fj8jzW4ukNJpe-<`r=KSDQ0q#n;CX`hg01Otp#AbZ;~r5zBE*3SvlL zxH7}j(WJvo^chP+Ph-cbEAMQW+Ev-xwYFNH-=i~m#i=C>YvP4DbjuXZ>`~!ZZr{Ah zhijTXql~3(N|3;A@yfV@WbSPW8(E_#{7_=_;80R>{1U!fnO!CI^?^-F-{#G{Y1}(Y z>7Vc4qwA(Fo~-%!3yV|oT3<=K*Y6i{-MKBwCOhLXtL5i)8)xk^+wi}53q#E2$+ve% z2!3{yv7KSGSMy>})`2}eFO7ed{OELWw_;qyd8J;)_jl*JCVA-{u59IRjQ2TwV4kFX W)8Xwwk9c4>FnGH9xvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xN=Qf;85xC!hUVwzYiViyIe-4i?Adm9cB-nXKqVI5T?Rmkt0c%T z_&*FVY&xTJ9w^FL;1OBOz`%D1gc(IOyc&RlyFFbTLn7SYPCLkVSb?KWkmc>~{T~i( zTFP-&CX(O!L+q;kKW0`rTGX-BOjycNugP(cE&Tq1wT;TJVw+mBA9S$0JavD>Xz8fF zY@eH?|_y?>D l4+u_sFP;K6?2bYO!v*0!)sC6I@j!1dc)I$ztaD0e0sxX@f=2)V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..0b5ffd48560a4b15693bfb8cbe8557c36ac65d78 GIT binary patch literal 484 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0J2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*#*8>k)NM$WMq_`o&D$h`HYMV zGcz+|P0in@PCc1D+u+$upl%HfR&F3AToU9L{2v1_Y^uG(0hHz}@Q5sCVBk9h!i=IC zUJXD;iF&#?hD5l(oq9L#umX?U+5EQ~C-!}>zrh*BBq7wfakl52*(TqPb1I5DM6gsO zPSd^7bi!VkfrG&;$xEPRO4C#|7OoZnfh9qurA`74naK+!?bJE=d)p#%y*@0wJL|z^ zopTSk1;bfR$-n!c-R<#GwC=wob42n_hBE!s>hmxDotT?24`ilTj^mT}EDraC1uGv( zm%C;K`%EkRnRUU^#ijjOQJCQrqtF+7qKX%IM$|RU=U7|n^B}P7xzYyz-_MHJoNArD zY`j;reAd62e^;_$&+G4pFU|b$=+|k7lObCt$LzI?W}Emcv$^cF#s!~pkrfi#Zhx=c z{*E#K`~v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..91dabfcb3d08686f68792f1c8d6fa9368bf29b94 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{CQ(d&EKa^ zJ()clsAHeh{F6Y6za+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`$g2&UvF(ktM z?X}IOLa&8%D`0&GLswhdN#5A4`4`OI5Nla zV4^^;Mi1u!31;@LAnP5hX0L5>7G2?cR~b>Hqt(o`A<^$Z-X>C_iuIDX=cOys_;qLv3Vqt&N%FBa(NVA|;ytT`=s z{f)|xdFsAhE%&M{w6-Y3@Zxg;ofy-CtP zp=$nRGWlLxrbrpo|9a8$$MTPhg0fe`BZjYiYcuT^iq+gcp!(@{(>Y;_oiht>H}Ui^0>?&t;ucLK6UXqqgDz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..5048181bff92fd7cc335bc3e60108becf3726484 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y8W|ZGYig>hs)mM!=I7`CIe%VDOY8TkQ+9TC5)u*~9v%kIWs-apxl#Td z3l7*a7QFn;dXOzE<`(BVBi3LAkOTgE8oc`7mQeTN>fwLuCo0X6uVY>OZ@p#H&xe{4 zU+R5L>}}#JF8nvW_-Dbsh&v!U!M^gsf5vde>Sw?0A8-Xc_+|g#8T+5?dpZZi@90Uq ib71EVD4404@s|73lIw1XJ-VRqWbkzLb6Mw<&;$Ti$G&3# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000000000000000000000000000000000..6b5deece8cebcaea15d43a6230bed349f936c037 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZHL+1VL9n;9A!YGh=TpPz56srmcVsXyn> zKbbunsAJvqRmXr7e@T#E@P8D*aOKX7g+M9J0*}aI1_r)EAj~ML;ne^X{O;-E7!u+B zcG|^t%?dni-mP0*pZ~Uh=V@NJ%~-jmyZEwxcia9Cy}rU+zf~SI2RaEbsj?^ru(2+< zair&$ijSFuu!Glz#l2@%ueGoMW|ATY)-+^>DHy4*cpa5%q%q?jWj}6{Xg0lpMHJnVn?Sx zUp$|GQ9g37_~7;Dhf8;@zuUBbmr4AdL`TyMi80Kl-Jbc{4 RUk?}r44$rjF6*2UngHPWwSoWu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb17c0a0a2607794c41f42cf5ceaff680fe2610 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{Q2LfP8n-z zKAAlmsAJoX+SNdcza+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`$g3;5(F(ktM z?X-uh4lD4uC9g6IeE!@1UBH^_H@f#ey3ya=?sWal=}fP7zDG(I#M5pz>3Y;eGb~_m zIln|f%SDx|m?^-^(IqfTU#`(vn!8Lydc+cVquNeF(P zZc$~Jnyr5^DCgDPlXB_h{;s0ZCK=)JT!3VrCXUcm(UdeIn a$$z-!#t&V-N(W#FF?hQAxvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tn#0RWtHn5GE;n9XLD?BSh@i`UX6r{%ui?^>26 zT-OzrWeGnBy2twFGY72zUDsh421cXNUe}k=-kV_U<2!7(TL>ZK)M;xp8sd2}5!u+j zx)Pq}?cKn#(d59-v|6q6YPEX(>G2U^7~(VM`10_8!C>$~o_lO^y}{{px=WG-Q4}Ff zQv^W(P0Q80(#zEVynOn?Fhm^3ST2`Xtyc1s)8{yj_;DnJ5JCtcgb+dqA%qY@$p3{g zCKzMFvMiDPJ^qta*U0^6=vUh9HaO?7Z5y0(Ijx-P8igA$9*<#~CN`T5Y}=O8N_9FN zO?8dJ4ZzEpf!%H=hm{)+hlw2fr?RsG&1UoanE`o@YOd=ltx;$N7>0rOcXu!h18;9{ zQK{ABDWzAa0RS+c&mn}sVzH1@%6Xo5CZ3+~Jeeq41qU~PF=oVZj3|l_$1&FHwelTW z*6a1sI8E{9=0;8(tk5Yh$8k&m>m*5DX`1%c_x(cm%cEYepX<85{TsCiA%vW|Z;4gM UH8N*c?*IS*07*qoM6N<$g4*>S3;+NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..38b79ca0e778e2369b5d7bbac81b436ea162abf9 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbURaI3bBqTgMJaTe!OiWCoqM{6*&9t(z%FoZYv$M0%)eQ{|{e9}x zpY!L9H8r2io(k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E2l#}znwXfVs;WvzNZ8rgnVFesX=&x>=ZA)dhJ}UY<>gsfS$TMPfXtJ7 zp9G|MOM?7@|04kg+ZRf0KnczQkH}&M2EIce%qXhi)c_Pcj9ruzOTQ>wL~kS-+6IaVCXzq;oq)_qLcWYckP(Pz_fz%K|bS^os5UgFZ|qi*k#S? z%@Gbq7$@mP2?VsRS*26{#>v5AYT${b4{F&3{Jiy_s9OG(Q?SYDS*|FzK+iG$q@Z|( zIU`GeumgiB;~#?uR~|HKMs*bM|C9B(c&LZE4EnkNf8WeZ%1C>gTe~DWM4f DWYCCR literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..90b5b348d1abc116e4955e2f1e2980918bfdbd25 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ynwXfVs;WvzNZ8rg85tRAX=&x>=f}mxg@%S&Sy=&9`F`H_4oGpA z1o;L3hXV#Lf5uNhVa@`N$YKTtzC$3)D5~Mr02JKg>Eaj?;r@2oZN9?_91glxyFdPy z-xHC|)Ub%fNp$xn-vUN*Dr@qED?7W1H~iCa#6he~o&Yt0!aRsp>`jhrWbPVhMA zJAvmf$NHf7o2;70f7ZD~6dQ*)R?Yq;sJL$TLaqZh{H<-fZ#v75Cw5mj&rM_b%I8wBPbGs* sX-0(56ecq!OMm5mO`_s|96qp?OV7QzZ2kFopg$NqUHx3vIVCg!0P>uHN&o-= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json new file mode 100644 index 0000000000..8b865f4e29 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTHeSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..0da6de00a074346da4242702006d657e776a614a GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engR`fLV@O5Z+gpZRtp*~j7hX3gG)o6aYjb-a zy!NhHdq(dWzcfj`165`VxII!+6K5wRKMXNj|Kowbz~|@lKDGY%pq2TFK?wvlUHx9G zo?ZT3k=yLlrYTEr7fUttOElc7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbe6010c8ec82c78cc7db77610bdbd28d3afae6 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDm-qYBsXyn> z8*6GlnLQh*DQltcA0Q=A666>B9~Ce>P>z)Z%5fHWL>4nJ@ErnSMo|r~2B6?KPZ!6K z2=}+sUh_38@VI&JjQDWq_x`s`j826I1*iRuurLgKeLcBXjj2v3gL|>gK_QkpT?PS$ zHR%BlSQjO<8ZvSy9#Gc4s@~raa;qU_>8~d&Sy|SblFj&zYvq zu$VVrQsl=oXF2gZ5lyNbAd~)iFnrt6sdn(h%*)e`ZBed$(XsemfQ#O;KB3dr&bt?P zJmlu+3(`ut0LwF@&T}kIc>>1aol{Hf4tzTw$UGrjeY@Rz!N;y|_RiR{$Ma&y zsslT|W*Yw~`_b9pF2%Ts^@??hY2AX#2ge!nCgyWn7P2mI6nz9!@+AoVw Q14Dqp)78&qol`;+0I?LXeEk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4#ko-U3d z5$D5GAmEDTwT0y%Qnr@YY{g! z->&u3*wwIrLow-CRcsx9=mNc|l0FB1FlrWGjqsh${N}%mE<2rEQ7>}@uG?7oY=PUeBw&us}G*tkB+CT~mNR?`1DgTe~DWM4fhK#E{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c88309b1ce458621194cb67167b2f07e86a16a GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xN=Zo>8ykm&gyiMrX=`i$K6UEP`SW&mc4}&BKqYTZ7GwY^u96_X z;Quhdu<4A>d7vm~fk$L90|Vb75M~tB@M-`GuJd$p42f`md-Wn;vjR`+!%NIg_y4y} z*HgQ+iFJ16_J8JCt@_8LJ?eV?C`2)FX4G@&yqMj!)?2&>bwAeEYX4xBixAr}?fQA9^=lR9x0A0@D>FVdQ&MBb@026hCssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..232f2c9b3e51f8dd972844cea9714f4e8b95f9ab GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKXO5dC-A{ZKiGhEp1m*wQ-bm?7C#To zh?UL@6j~Z4dp*6%*Vr88u~_1sdcpdm6H>S8F}kr%b7MU=L$EPwdu_D4nBks7-{)U+ zocxUW#@;DUZ5RJi4sWVkmcV5LGV(rWLU?tMT2WHc*36halWzJp1vaxzPNGwqQn{_JoT$)8AKbo5z|uT{j}bjw@pF`X6U+u<#c+iYA1-^}29c#HaB& ZvuMEeubGjhw!koA@O1TaS?83{1OTK7uz~;p literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..23a6da6f4481adce983f2c5291fdb667304727c7 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKU7;BnQTYP6v5|NouRvI!Y?4+worEI-uQ8Ki$)$d~1~!iCnjWe?=J7??XO=QbS{ zkPLhwd_bbP*=41S$-$(XiGoXuE<8)LWevgKK?1_66;HQcg_iA>Xu*qgk#NDeoK1vP0cNNWy89~ zedkUbzv$0mw1`E;Ea3h|k+<_#u$oKnaIK3DsATRu)|19<_2D~9RgE+ImmRY;e{dWW Z=X-x6=7Y*ALtqdwc)I$ztaD0e0sy%9v$X&K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e61db129e66c54d1cad2718377199f92be9301 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y8Uul*rka{sNJvOtUf!Sc=e4!9f1f&KXJ;oRCFSAaVeo9`li9OP zO-+G1mfdl<2&DK+g8YL2qX330cV;XEN^ur=L>4nJ@ErnSMo|r~2B0GtJY5_^BHZ6j zyUW*Pz~gq@Dq+Fh-}dVy4I=-WxUBQ>-*aJ`rC-`7(<${KF z-kOFyYrS865neLakkQ!1_@qaWW{Jov>5k@SH4u1^wD)j%i;7i=WP1xv|(`HE^c=AQhM-odCR@bkRDZ|48kYb+aNcEl#!YhV?RImWtl a4}(eN_4u$Z9|>RpF?hQAxvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNt=`Ln7SY zPP@q0tia>y&B*=g&;RqWR*t$-o`(;|Rc+c)z@2X4tC7>}Ae~{@$SEN_qal#1VPdDm z*TNSm3xperH!SQqvV#4Gz`@fVJ-d7w7x_$Kk`Q%~5?x}VcH;A#)I}mZ_nD5|SQEgt z?V0N}?z|ZXSb8{p4$N@Sjo_+W$$i>fXXmwbpYxX-nzdrxo%K_$1+8jLcj9ny$y`=- zK*Vv0Wnrs^nQqU4pPWjcE&Wz#J;->T%g(TMzh#=~|D$c&H^27EoFH)C?&XX)r#H6Z ze`@{KUA}!w`Ny@TTaT*$N&Vd;vLNT7TxQ+k;^Vdd^nWn5I^106s^pai^f`m4tDnm{ Hr-UW|9iXlq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000000000000000000000000000000000..07e69b227209e94d7d8e377ecec2d683f60589bb GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4%4o-U3d z5$1ol)FkvcyP}A@Mqk+o{llk66ylzc=yJ zl7vd8fS`-hJRM)iJ*hm{t9zsAgxH^{3_Zp(^&B-M)3cK8GAd8CTwT0y%Qnr@YY~c7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ea10d61fdedc5cabd1804217b666377b29a13150 GIT binary patch literal 558 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STRaI3bBqTgMJaTe!OiWCoqN42V>_S6B4W7-kva&KVGK!0f%g@gT zD({~E`yi0wD+%%o{*Me8To2qi0hHk^@Q5r1DmVnfjG`J|4M0JO64!{5;QX|b^2DN4 zhJeJ(yb?V>*AN9$JwrXC-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7*q zWCn{f0ojI(Obh}*Itqw0+gZTkSwJ=jd@5sPcmWIq7>#Br15j!LI|B<)rGb&L0pkLQ zsURC!7eGv!0%U^#6VO~Hu*x7y3m^-s%h138B->|wF#NLk9zP(n*VDx@#KQmXC2zjN z3Op?D(P!PU~&PtPzXa(>ZoHjQ{*&KR?cdBN$#k8A~83Ykx|52$iZ zpK+r>MWFreMkY%K)s#KSj1`T)8uSDY%$zy(&z7{6GgsaGF02t6`uwvnM>V@wcNO!~ zb>Hh64(%|%@b2&Tdk(6L@9kaKy7&H}dg0jyUp~t};Jwk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}znwpxbsi{dxNri-j7#kaFYirxt+2!Ts0p;cA_Rj%QoFzei!T+Iv zA=tk{2qakG5n0T@z;_6Q8AUa`8i0c9JY5_^BHZ6jJIHrffydc7A@|?^Zf%FlE=k*0 zm(5(YXR)FG(~$1J9X}rEX?i%Sv-XQF=wUj=nldLsEKq)~AZwaSK&^p8Q(lH%*0)1( z8U}a2UA^$C@4ay2%WdDbPWtV`FwY^OX}zZ-mlasMzt{u`nU;irB|kERwmWmMtzzOo zP}X3(c>kpxvJ)0;4fy?FJG0ORO@oWOa@Z9f+_#V1&LnU_^TV@GoZCGP+H>%oI9s>) TDwh%?(B%xCu6{1-oD!Mk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwnwpxbsi{dxN!i)i85iJ zy^%mM&H|6fVg?4jLmx!Ml?Z_BnFpO=mfMVVl7*j{y6N+$`||Z{E(yyY?sbP%_ZP44$rj JF6*2UngG+la#{cY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json new file mode 100644 index 0000000000..12f077963a --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..0da6de00a074346da4242702006d657e776a614a GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engR`fLV@O5Z+gpZRtp*~j7hX3gG)o6aYjb-a zy!NhHdq(dWzcfj`165`VxII!+6K5wRKMXNj|Kowbz~|@lKDGY%pq2TFK?wvlUHx9G zo?ZT3k=yLlrYTEr7fUttOElc7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbe6010c8ec82c78cc7db77610bdbd28d3afae6 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDm-qYBsXyn> z8*6GlnLQh*DQltcA0Q=A666>B9~Ce>P>z)Z%5fHWL>4nJ@ErnSMo|r~2B6?KPZ!6K z2=}+sUh_38@VI&JjQDWq_x`s`j826I1*iRuurLgKeLcBXjj2v3gL|>gK_QkpT?PS$ zHR%BlSQjO<8ZvSy9#Gc4s@~raa;qU_>8~d&Sy|SblFj&zYvq zu$VVrQsl=oXF2gZ5lyNbAd~)iFnrt6sdn(h%*)e`ZBed$(XsemfQ#O;KB3dr&bt?P zJmlu+3(`ut0LwF@&T}kIc>>1aol{Hf4tzTw$UGrjeY@Rz!N;y|_RiR{$Ma&y zsslT|W*Yw~`_b9pF2%Ts^@??hY2AX#2ge!nCgyWn7P2mI6nz9!@+AoVw Q14Dqp)78&qol`;+0I?LXeEk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4#ko-U3d z5$D5GAmEDTwT0y%Qnr@YY{g! z->&u3*wwIrLow-CRcsx9=mNc|l0FB1FlrWGjqsh${N}%mE<2rEQ7>}@uG?7oY=PUeBw&us}G*tkB+CT~mNR?`1DgTe~DWM4fhK#E{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c88309b1ce458621194cb67167b2f07e86a16a GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xN=Zo>8ykm&gyiMrX=`i$K6UEP`SW&mc4}&BKqYTZ7GwY^u96_X z;Quhdu<4A>d7vm~fk$L90|Vb75M~tB@M-`GuJd$p42f`md-Wn;vjR`+!%NIg_y4y} z*HgQ+iFJ16_J8JCt@_8LJ?eV?C`2)FX4G@&yqMj!)?2&>bwAeEYX4xBixAr}?fQA9^=lR9x0A0@D>FVdQ&MBb@026hCssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..232f2c9b3e51f8dd972844cea9714f4e8b95f9ab GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKXO5dC-A{ZKiGhEp1m*wQ-bm?7C#To zh?UL@6j~Z4dp*6%*Vr88u~_1sdcpdm6H>S8F}kr%b7MU=L$EPwdu_D4nBks7-{)U+ zocxUW#@;DUZ5RJi4sWVkmcV5LGV(rWLU?tMT2WHc*36halWzJp1vaxzPNGwqQn{_JoT$)8AKbo5z|uT{j}bjw@pF`X6U+u<#c+iYA1-^}29c#HaB& ZvuMEeubGjhw!koA@O1TaS?83{1OTK7uz~;p literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..23a6da6f4481adce983f2c5291fdb667304727c7 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKU7;BnQTYP6v5|NouRvI!Y?4+worEI-uQ8Ki$)$d~1~!iCnjWe?=J7??XO=QbS{ zkPLhwd_bbP*=41S$-$(XiGoXuE<8)LWevgKK?1_66;HQcg_iA>Xu*qgk#NDeoK1vP0cNNWy89~ zedkUbzv$0mw1`E;Ea3h|k+<_#u$oKnaIK3DsATRu)|19<_2D~9RgE+ImmRY;e{dWW Z=X-x6=7Y*ALtqdwc)I$ztaD0e0sy%9v$X&K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e61db129e66c54d1cad2718377199f92be9301 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y8Uul*rka{sNJvOtUf!Sc=e4!9f1f&KXJ;oRCFSAaVeo9`li9OP zO-+G1mfdl<2&DK+g8YL2qX330cV;XEN^ur=L>4nJ@ErnSMo|r~2B0GtJY5_^BHZ6j zyUW*Pz~gq@Dq+Fh-}dVy4I=-WxUBQ>-*aJ`rC-`7(<${KF z-kOFyYrS865neLakkQ!1_@qaWW{Jov>5k@SH4u1^wD)j%i;7i=WP1xv|(`HE^c=AQhM-odCR@bkRDZ|48kYb+aNcEl#!YhV?RImWtl a4}(eN_4u$Z9|>RpF?hQAxvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNt=`Ln7SY zPP@q0tia>y&B*=g&;RqWR*t$-o`(;|Rc+c)z@2X4tC7>}Ae~{@$SEN_qal#1VPdDm z*TNSm3xperH!SQqvV#4Gz`@fVJ-d7w7x_$Kk`Q%~5?x}VcH;A#)I}mZ_nD5|SQEgt z?V0N}?z|ZXSb8{p4$N@Sjo_+W$$i>fXXmwbpYxX-nzdrxo%K_$1+8jLcj9ny$y`=- zK*Vv0Wnrs^nQqU4pPWjcE&Wz#J;->T%g(TMzh#=~|D$c&H^27EoFH)C?&XX)r#H6Z ze`@{KUA}!w`Ny@TTaT*$N&Vd;vLNT7TxQ+k;^Vdd^nWn5I^106s^pai^f`m4tDnm{ Hr-UW|9iXlq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000000000000000000000000000000000..07e69b227209e94d7d8e377ecec2d683f60589bb GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4%4o-U3d z5$1ol)FkvcyP}A@Mqk+o{llk66ylzc=yJ zl7vd8fS`-hJRM)iJ*hm{t9zsAgxH^{3_Zp(^&B-M)3cK8GAd8CTwT0y%Qnr@YY~c7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d83da2df0e45accba6ae6dd277dd9826023104e3 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?ST)zs9aq@+ANJhHR1O-)TBBO|r7we9TeLPA0ep3O8iHqOh-i;ay1 zDmPeo<}#4tD+%%o{*Me8To2qi0hHk^@Q5r1DmVnfjG`J|4M4$WPZ!4!3;(AV5Arc7 z@~~XcJYA-B;{X437mr*h%ifdSZ_FRWbZxpL-={x%4gC5H5tm|SG4e4kd2hiu=h9aZ zb)yOEt~`6^;UJaK^2S!_0Phy@h#*E8FVjz#jgN=S%6wrfarw-pO8!@M%?CG?Klpd& u|0QdKlZ*JRLuxBre?0ph5;?=3kw2JE|3mZZE02KAVeoYIb6Mw<&;$Uv+;=tr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..901127b514fbe60cebc1f3c4394c81e7fac7ff5a GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}znwpxbsi{dxNri-j7#kaFYirxt+2!Ts0p;cA_Rj%QoFzei!T+Iv zA=tk{2qakG5n0T@z;_6Q8AUa`8i0c9JY5_^BHZ6jJIHrffydc7A@|?^Zf%FlE=k*0 zm(5(YXR)FG(~$1J9X}rEX?i%Sv-XQF=wUj=nldLsEKq)~AZwaSK&^p8Q(lH%*0)1( z8U}a2UA^$C@4ay2%WdDbPWtV`FwY^OX}zZ-mlasMzt{u`nU;irB|kERwmWmMtzzOo zP}X3(c>kpxvJ)0;4fy?FJG0ORO@oWOa@Z9f+_#V1&LnU_^TV@GoZCGP+H>%oI9s>) TDwh%?(B%xCu6{1-oD!Mk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwnwpxbsi{dxN!i)i85iJ zy^%mM&H|6fVg?4jLmx!Ml?Z_BnFpO=mfMVVl7*j{y6N+$`||Z{E(yyY?sbP%_ZP44$rj JF6*2UngG+la#{cY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json new file mode 100644 index 0000000000..ac29190538 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..a77c79467016a98ed252a9a98dedfda3844a344c GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;a7*n3#BYcxY&7NJvN+sH+&`>Qct+=?j zKj+Vfg@pk%)kVZe0V#o!Aiv=MsDR;ta;zj!jEaj? z;r@1-w@|YJkAtvxuvF&W|GCx+7PTy?d$sCtw1?d}X*C^&HhIQK3ol_4$0Y(ioo}!F zy3SSb_3DLR)44Wyd#6ioU}kCA6wh%)EAY2F%l1rD*5Vx5=3Dlgn9J3bn%bkq`R6o! z_D_4Z@BQ_*Pa+J~mQPv5;}VYunGUjSc+c%S1$9^fcwP$;zHqXH#cxt zEU~Z?d^SsEpIneYgkZ(I!?{~zd7hN4Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1kfk;3`R@2Sn$I8 zzwH76LUF+nmi<^bF;VN+V~r*PeiCR4qb$J^1b!_55CE)aP~ZikV1+RO2qC~DE7d2D zfK=LmWTpD#nN5+ltTHG7<>mxd>si6<1pBei31%k%qYZBv6!_*t9v9qLf+Ywn!4d@i zNC5V4Tx04UFukv&MmKpe$iQ>CI6K?{mFWT=8*K~%(1t5Adrp;l;qmz@Ois^Fr;eVrB%~%ZZiNv$aFm2)u;^|G> z;Ji;9VtH95J|`YC>4LwAiI9>Klt6Pm7SdMl7dm7{l#%UhJnB?P^&o3_p#&DP5}QiaHTi=r7AGizuyT%vNGdkTGA0000mP)t-sCMG5t8X7e~(TmB;n;gxh229(SK0|MZp9pBA6ChbYy@NO7 sN4f`o9N-rDwqWoE3iBOfwqOe)FZq<{Q<6^UrT_o{07*qoM6N<$f*|f^?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000000000000000000000000000000000..c466744d3a88b1f505d9a0840dbc61ea7613d0fc GIT binary patch literal 801 zcmV++1K#|JP)4Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1k5P*5Jt!G(x~P8KklNd z;@Dy<{tFL5IenhA0)?;$^o3crU<)E!umzDx0e}EteI^A#APQEP6Mzr`0UWV9!pFnj~SQA))O`MNw*fw@d(FajYDNSUj~ zYPwutzjCwyl-)^Yp7SJ00000NkvXXu0mjfkY8RA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..bdc52b7f90d7b39fd1694ab73cc5e23503d31580 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ys;a6Q85xC!hQ`IkX=!QY=jZ=Eb?VRg^LBQ25)u+XRb1P(cL6Ex zk|4j}|8T(I<4?LrugR?J7lnR!AK*1R_-nCD8AGLpLy}R~f?4YyI0*;?=Z;49obYx0h~x-TWYYhhk2iMl_?i!UHjf lcV9m{Y+(_aAXLFn!5DgMp2&3eevlU!JYD@<);T3K0RXivfkOZQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..12ba6b71923d0d168826388bd4f8d0063fb6cdfc GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKO=u<5X=vX`myRJzX3_BHZ6j zy~x+BAiyI2L1V?!|MuG*T^=|Hd&SQ((7(1j)g^}^PvC=-ey{=SJbPgVrUd0(EPfuE z5i6Y+D6}+8_Ii4iudzAGW3j|N^@8$TQQM`HKOmCfO7{H@viF@h)?5l ZX3>D_Uo#_1ZGmCL;OXk;vd$@?2>^(fuxJ1P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..0c1e5d6c94fe22f55b40c09c42394ae50484d5e5 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UK_H z(%^y>{5#_dlDU>WNCDy}%`6<*9V=QCQm;)=KPLS9?*0c}!4D*E73<8E$)Be`=Z*tM z!dhG7y3_mHbqf5&SC%A9V_$d1`1q%wORO*L-8mMc&R|!D=qO!?i9tppv=sSWg=?EwDJG| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..8f5fe6a29d02b1c47ba6fbd6fc646fdb2edaec03 GIT binary patch literal 821 zcmV-51Iqk~P)4Tx04UFukv&MmKpe$iQ>CJn4t5Z62w0sgh>D1lR-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwM<*vm7b)?7Nufok;K6Y}-ralLy#s_=iD_2H7@+C4 znT*H8bY@iyyrKtwgfN34nOVl1Bqh*xeBHyx*Sjds!v99Enzb0<6NzV;VcNtS#8aEL z!FiuJ%nGtfd`>)S(glehxvqHp#yRh@z%#>UDmhOaCKmH8th6vIm>TgUaYWU0$`{fe ztDLtuYo!Wn+>^gBnAKO7xlVHsaV%m95=1DdpokJ|L}}GYv5=(wSR4O<>zBx-kgEtr zjs=vVL3aJ%fAG6oD>pIjB?V(Z=ZoWf3 zEBngIK0ZDg8X8DQNHFG^PY+pTPT6-?e34O8$c&Z-SJnhjEk> zx8pUY?bSo+N&!wVWE%yme*8*GD^yS*z5x*J`vuAcwurV6T*U+?D44(mg?|$C@}HsX z4|Tem{|se+cnf;@&rtS4Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1Mej70000FbW%=J|NsC0|NsC0|NsC0|Nj8g z+?b&N000SaNLh0L01FcU01FcV0GgZ_0002)Nkls#?Pztu@Mb-;$n7{;#2~5D4KrL7bd8rG_ zH!Qi|@QmTb#LI^}eX{LI>6hWjpafK*0EsVhV2_o}3PN*v2XyfPDQCGYp+^1z? z3E?B*F+&b0e693&onI8E>-?eEh=k_Au6laYEgWxQEo0<_M}>X4Y)NaJN8QAe%rAwd z4$2(DBt!r|UgDHkCrgoWsd>rlZ{I}Cw@5)en*4Rj7~)8i5$~9&CFz=!ni4%JUzW1U z{db;bYHG6H-Qx%6vt_*xgKHP670dcQwyf$2IG*4#-}DzGr?LV0)kDGH2k|KQ0sIu=r$`LF0wh2JBtQZrKmsH{0wh2J{~>{uxYz7#-geh+q()`D z|L`$XO`)7eSuS}}c=*7*d(V;P;dfbEy{6QB`|?>n9e#~vJytmHAH8z73y)kp0RVy^ zPxkhd4HNKc80V6GMN-u+YxI3i9|w5rINtfj@SZN`SV+9wVGry8D(*8Gh+R-p}+l6c-Y^6 z8(7>!0wh2JBtQZrKmsH{0wh2JBtQZrKmsH{0wh2JBtQZ&ClJ^d!2j;4^^KWIESJlH zv1SSq!l_s+&eRJ${&5u8Gnm*NM)8H+$Ex$ziLiE zo8vf2TRNSVZnrz83v0MvsZ<2oyfIPRL;%>;@AqM(Ua!kwFwnu&8s1KWE5BbS$D{RS zPmt@~+XMANuI-&IUrIDgp|98L`RG|YXzxp_>*cXPoD$aQD)mK?m? zl2z}V!1*F^oy+BX>sB(%{@XH8vm{$2i1WI1>}guHpS3j;m~-oZb8a*>nDaTq25;Aiv<>!N?p>`x+pyWJ4@e+k z6b>apgKhC)VU77;O42a}XBYEmv3>&1(#Lyd4d7((GcuLWqs1CPWU8kS5+DH*AORAv aCh!*kgyTYeTv5;f00004Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1k7jl3`S$T)LZNO zzwJ;|j2(93*pK01&^7&XmeHbxun6>pS+-ycBEJ>@FaXjsDF_Uak;0q+7-JBSl-iR= zfD5UBlTv%~%ptTiq%tW0Vb=sk%2mPQ1kRt{k;+*U(UwU;=pN*G!Hq50g2)#9 zl>m%0nJz&n8E0x^K4^K$gw>;=w6-aA)>t_x?X6BIx_MHB5HVxDE=yw-s7qxA6EJ>2 z%3L*8)8z~Ht7Z#8*_m&BAt0uUIJz-;YtPYKYQXdv(`V?<;U@wb=>$k#9^S#5@gvk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;a7*n3#BYcxY&7NJvN+sH+&`>Qct+=?j zKj+Vfg@pk%)kVZe0V#o!Aiv=MsDR;ta;zj!jEaj? z;r@1-w@|YJkAtvxuvF&W|GCx+7PTy?d$sCtw1?d}X*C^&HhIQK3ol_4$0Y(ioo}!F zy3SSb_3DLR)44Wyd#6ioU}kCA6wh%)EAY2F%l1rD*5Vx5=3Dlgn9J3bn%bkq`R6o! z_D_4Z@BQ_*Pa+J~mQPv5;}VYunGUjSc+c%S1$9^fcwP$;zHqXH#cxt zEU~Z?d^SsEpIneYgkZ(I!?{~zd7hNYiWqiTU} z%x7c9tXdTYnG7xo4g*DobLtnFbS&0$izO>O*dsKns7>qwgK%SGxx7~cyMeLbqef-M zWnYiJOyk-;_mA5K>G&VZ6P`Y~b82tE_wqgBF%K`j&&qz@oNk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}znwXfVs;WvzNO*X7*xA`>X=xcen;9A!YGh;-7Z;bGpKqY9{`=Ia zKj+UsnLS%fNC>EJJztVHkP<8j@(cct1{hS=&P)PIau#?*7BevL9R^{>*%2%*8B+vc%o0f{A&Aj)5Ztw+^oB%`|c3h zkdvCP7njiZuJpgboG<5Dyh`IuAO5!&s5t|)-HOOA?FD`)zX;mnczY zV%s6R;K4qFqYvs2-98vEtE1#|K0Jl>9$&zLLvLQQ-QtTlAo=xS*@33XcDMKf3O=cs z?|R$7(pk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}znwXfVs;WvzNO*X77(AP)rKM$OXBQe8YGh;-7Z;bGpKqY9{`=Ia zKj+UsnLS%fNC>EpdE@ujKuWMA$S?Rm8emXeJ2MF=$ywkLSEi|d*d1Y8oM)0b}D_5c4?^N6*xMY+E0`*FZVKz63EL-Mhc_D|PbT*ddI zVa003x&tpeKA&5C+e(w+ZpST7t^#?7dt2W*ot2;A==3Yo?QlhmHiN{9&Ta)6mc2CELazI=v?d1BUYyQgKQ zX*j5CdEz?FcE9|ii2eVzXVmkqmA~gHdx0?!gr~EptXVVrgR$yC>-t%{PVJgG>4EG; z-Jj35HI#T3oD*)_T^N3I<;zJ9P6={7yH7C{sWvjSnJ(5*h!)aV!0{taNMj1a(n$_E zb5}42=y7^BF-`Gy>RPugAW%q%rMBa&s^Y6JQqfl#!x{cCmUI1ZGc1eq1cn}ir>mdK II;Vst0Opv&k^lez literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json new file mode 100644 index 0000000000..f34881842b --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Suit and back storages drawn by Ubaser. equipped-SUITSTORAGE-secdog taken from generic.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-secdog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}