diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 3af58fded4..4cbeebabd0 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -40,6 +40,7 @@ public sealed class ClientClothingSystem : ClothingSystem {"id", "IDCARD"}, {"pocket1", "POCKET1"}, {"pocket2", "POCKET2"}, + {"suitstorage", "SUITSTORAGE"}, }; [Dependency] private readonly IResourceCache _cache = default!; diff --git a/Content.Server/Body/Components/InternalsComponent.cs b/Content.Server/Body/Components/InternalsComponent.cs index faef3d32b9..abac2fe892 100644 --- a/Content.Server/Body/Components/InternalsComponent.cs +++ b/Content.Server/Body/Components/InternalsComponent.cs @@ -1,4 +1,5 @@ -namespace Content.Server.Body.Components +using System.Threading; +namespace Content.Server.Body.Components { /// /// Handles hooking up a mask (breathing tool) / gas tank together and allowing the Owner to breathe through it. @@ -8,5 +9,14 @@ { [ViewVariables] public EntityUid? GasTankEntity { get; set; } [ViewVariables] public EntityUid? BreathToolEntity { get; set; } + + /// + /// Toggle Internals delay (seconds) when the target is not you. + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField("delay")] + public float Delay = 3; + + public CancellationTokenSource? CancelToken = null; } } diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs index d7cce25c7b..17d88dd179 100644 --- a/Content.Server/Body/Systems/InternalsSystem.cs +++ b/Content.Server/Body/Systems/InternalsSystem.cs @@ -7,6 +7,12 @@ using Content.Shared.Atmos; using Content.Shared.Inventory; using Robust.Shared.Containers; using Robust.Shared.Prototypes; +using Content.Shared.Verbs; +using Robust.Server.GameObjects; +using Content.Server.Popups; +using Robust.Shared.Player; +using Content.Server.DoAfter; +using System.Threading; namespace Content.Server.Body.Systems; @@ -18,6 +24,8 @@ public sealed class InternalsSystem : EntitySystem [Dependency] private readonly GasTankSystem _gasTank = default!; [Dependency] private readonly HandsSystem _hands = default!; [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private readonly DoAfterSystem _doAfter = default!; public override void Initialize() { @@ -26,6 +34,93 @@ public sealed class InternalsSystem : EntitySystem SubscribeLocalEvent(OnInhaleLocation); SubscribeLocalEvent(OnInternalsStartup); SubscribeLocalEvent(OnInternalsShutdown); + SubscribeLocalEvent>(OnGetInteractionVerbs); + SubscribeLocalEvent(OnToggleOtherInternalsComplete); + SubscribeLocalEvent(OnToggleOtherInternalCanceled); + } + + private void OnGetInteractionVerbs(EntityUid uid, InternalsComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || args.Hands == null) + return; + + if (!EntityManager.TryGetComponent(args.User, out var actor)) + return; + + InteractionVerb verb = new() + { + Act = () => + { + var entManager = IoCManager.Resolve(); + if (!entManager.TryGetComponent(uid, out var internals)) return; + + // Toggle off if they're on + if (AreInternalsWorking(component)) + { + DisconnectTank(component); + return; + } + + // If they're not on then check if we have a mask to use + if (component.BreathToolEntity == null) + { + _popupSystem.PopupEntity(Loc.GetString("internals-no-breath-tool"), args.User, Filter.Entities(args.User)); + return; + } + + var tank = FindBestGasTank(component); + if (tank == null) + { + _popupSystem.PopupEntity(Loc.GetString("internals-no-tank"), args.User, Filter.Entities(args.User)); + return; + } + + // Is the target not you? If yes, use a do-after to give them time to respond. + if (args.User != args.Target) + { + component.CancelToken = new CancellationTokenSource(); + _doAfter.DoAfter(new DoAfterEventArgs(args.User, component.Delay, component.CancelToken.Token, args.Target) + { + BreakOnUserMove = true, + BreakOnDamage = true, + BreakOnStun = true, + BreakOnTargetMove = true, + MovementThreshold = 0.1f, + BroadcastFinishedEvent = new ToggleOtherInternalsCompleteEvent() + { + Component = component, + User = args.User, + Target = args.Target, + Tank = tank + }, + BroadcastCancelledEvent = new ToggleOtherInternalsCancelledEvent() + { + Component = component, + } + }); + return; + } + entManager.EntitySysManager.GetEntitySystem().ConnectToInternals(tank); + }, + Message = Loc.GetString("action-description-internals-toggle"), + IconTexture = "/Textures/Interface/VerbIcons/dot.svg.192dpi.png", + Text = Loc.GetString("action-name-internals-toggle"), + }; + + args.Verbs.Add(verb); + } + + private void OnToggleOtherInternalsComplete(ToggleOtherInternalsCompleteEvent ev) + { + ev.Component.CancelToken = null; + var entManager = IoCManager.Resolve(); + if (ev.Tank != null) + entManager.EntitySysManager.GetEntitySystem().ConnectToInternals(ev.Tank); + } + + private static void OnToggleOtherInternalCanceled(ToggleOtherInternalsCancelledEvent ev) + { + ev.Component.CancelToken = null; } private void OnInternalsStartup(EntityUid uid, InternalsComponent component, ComponentStartup args) @@ -174,4 +269,16 @@ public sealed class InternalsSystem : EntitySystem return null; } + private sealed class ToggleOtherInternalsCompleteEvent : EntityEventArgs + { + public InternalsComponent Component = default!; + public EntityUid User { get; init; } + public EntityUid Target { get; init; } + public GasTankComponent? Tank { get; init; } + } + + private sealed class ToggleOtherInternalsCancelledEvent : EntityEventArgs + { + public InternalsComponent Component = default!; + } } diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 3b1fe2c507..3c696fe83d 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -125,6 +125,9 @@ - type: IngestionBlocker - type: DiseaseProtection protection: 0.10 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskPullableBase @@ -140,6 +143,9 @@ - type: IngestionBlocker - type: DiseaseProtection protection: 0.05 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 1f1be9a010..e6257afee8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1342,6 +1342,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: possum + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -1388,6 +1396,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: possum #close enough + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -1434,6 +1450,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: fox + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -1481,6 +1505,14 @@ - MobMask layer: - MobLayer + - type: Inventory + speciesId: dog + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -1591,6 +1623,9 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: puppy - type: Appearance + - type: Inventory + speciesId: puppy + templateId: pet - type: DamageStateVisuals states: Alive: @@ -1627,6 +1662,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: cat + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -1761,6 +1804,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: sloth + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -1807,6 +1858,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: fox #close enough + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 5b4c6776c9..63b5566f33 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -157,6 +157,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: cat + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -203,6 +211,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: puppy + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: @@ -286,6 +302,14 @@ layer: - MobLayer - type: Appearance + - type: Inventory + speciesId: dog + templateId: pet + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: diff --git a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml new file mode 100644 index 0000000000..91f9ca20f4 --- /dev/null +++ b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml @@ -0,0 +1,26 @@ +- type: inventoryTemplate + id: pet + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank + + diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 4c081ffa4f..c86b500c5b 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -395,6 +395,9 @@ - type: Tag id: PercussionInstrument +- type: Tag + id: PetWearable + - type: Tag id: Pickaxe @@ -473,7 +476,7 @@ - type: Tag id: Smokable - + - type: Tag id: Soap diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-cat.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-cat.png new file mode 100644 index 0000000000..ce6d2fc678 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-cat.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-dog.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-dog.png new file mode 100644 index 0000000000..25a3957296 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-dog.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-fox.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-fox.png new file mode 100644 index 0000000000..cb7a7fdee3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-fox.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-possum.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-possum.png new file mode 100644 index 0000000000..0b73e3a764 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-possum.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-puppy.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-puppy.png new file mode 100644 index 0000000000..5da209c162 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-puppy.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-sloth.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-sloth.png new file mode 100644 index 0000000000..168c64be2c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-sloth.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index 482f6c36d1..11386a974a 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-MASK", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-MASK-vox", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-MASK", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-MASK-dog","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-puppy","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-fox","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-cat","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-sloth","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-possum","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-vox", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-cat.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-cat.png new file mode 100644 index 0000000000..777edc55ba Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-cat.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-dog.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-dog.png new file mode 100644 index 0000000000..25a3957296 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-dog.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-fox.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-fox.png new file mode 100644 index 0000000000..1a1330131a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-fox.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-possum.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-possum.png new file mode 100644 index 0000000000..c2a58b5a1d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-possum.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-puppy.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-puppy.png new file mode 100644 index 0000000000..5da209c162 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-puppy.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-sloth.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-sloth.png new file mode 100644 index 0000000000..b89c5ccf9f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-sloth.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index ff664dffd4..0092de682f 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -14,6 +14,36 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-dog", + "directions": 4, + "delays": [[1.0], [1.0], [1.0], [1.0]] + }, + { + "name": "equipped-MASK-puppy", + "directions": 4, + "delays": [[1.0], [1.0], [1.0], [1.0]] + }, + { + "name": "equipped-MASK-fox", + "directions": 4, + "delays": [[1.0], [1.0], [1.0], [1.0]] + }, + { + "name": "equipped-MASK-cat", + "directions": 4, + "delays": [[1.0], [1.0], [1.0], [1.0]] + }, + { + "name": "equipped-MASK-sloth", + "directions": 4, + "delays": [[1.0], [1.0], [1.0], [1.0]] + }, + { + "name": "equipped-MASK-possum", + "directions": 4, + "delays": [[1.0], [1.0], [1.0], [1.0]] + }, { "name": "up-equipped-MASK", "directions": 4 diff --git a/Resources/Textures/Mobs/Pets/bingus.rsi/bingus.png b/Resources/Textures/Mobs/Pets/bingus.rsi/bingus.png index ee5e7f582f..efb430b1a0 100644 Binary files a/Resources/Textures/Mobs/Pets/bingus.rsi/bingus.png and b/Resources/Textures/Mobs/Pets/bingus.rsi/bingus.png differ diff --git a/Resources/Textures/Mobs/Pets/caracal.rsi/caracal.png b/Resources/Textures/Mobs/Pets/caracal.rsi/caracal.png index 480358988e..b76521b8b5 100644 Binary files a/Resources/Textures/Mobs/Pets/caracal.rsi/caracal.png and b/Resources/Textures/Mobs/Pets/caracal.rsi/caracal.png differ diff --git a/Resources/Textures/Mobs/Pets/caracal.rsi/caracal_flop.png b/Resources/Textures/Mobs/Pets/caracal.rsi/caracal_flop.png index c1897f0268..788c4dcb55 100644 Binary files a/Resources/Textures/Mobs/Pets/caracal.rsi/caracal_flop.png and b/Resources/Textures/Mobs/Pets/caracal.rsi/caracal_flop.png differ diff --git a/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav.png b/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav.png index 51ad076b01..67ce709522 100644 Binary files a/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav.png and b/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav.png differ diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cak.png b/Resources/Textures/Mobs/Pets/cat.rsi/cak.png index 882dbecabc..19e657b7cb 100644 Binary files a/Resources/Textures/Mobs/Pets/cat.rsi/cak.png and b/Resources/Textures/Mobs/Pets/cat.rsi/cak.png differ diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png index 875d8d358c..fd579cb8cd 100644 Binary files a/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png and b/Resources/Textures/Mobs/Pets/cat.rsi/kitten.png differ diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/spacecat.png b/Resources/Textures/Mobs/Pets/cat.rsi/spacecat.png index 15fd940b54..182ceb9909 100644 Binary files a/Resources/Textures/Mobs/Pets/cat.rsi/spacecat.png and b/Resources/Textures/Mobs/Pets/cat.rsi/spacecat.png differ diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/lisa.png b/Resources/Textures/Mobs/Pets/corgi.rsi/lisa.png index 0c517d9530..b641fc046c 100644 Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/lisa.png and b/Resources/Textures/Mobs/Pets/corgi.rsi/lisa.png differ diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png b/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png index 16f7bc8684..41a2622388 100644 Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png and b/Resources/Textures/Mobs/Pets/corgi.rsi/narsian.png differ diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/old_ian.png b/Resources/Textures/Mobs/Pets/corgi.rsi/old_ian.png index 6bdc878a6c..a4042f86c7 100644 Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/old_ian.png and b/Resources/Textures/Mobs/Pets/corgi.rsi/old_ian.png differ diff --git a/Resources/Textures/Mobs/Pets/ferret.rsi/ferret.png b/Resources/Textures/Mobs/Pets/ferret.rsi/ferret.png index 4bc126fb41..88e403cfad 100644 Binary files a/Resources/Textures/Mobs/Pets/ferret.rsi/ferret.png and b/Resources/Textures/Mobs/Pets/ferret.rsi/ferret.png differ diff --git a/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork.png b/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork.png index 4eb691e109..f146ae60df 100644 Binary files a/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork.png and b/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork.png differ diff --git a/Resources/Textures/Mobs/Pets/walter.rsi/walter.png b/Resources/Textures/Mobs/Pets/walter.rsi/walter.png index 29512c22cb..57e15a9b1b 100644 Binary files a/Resources/Textures/Mobs/Pets/walter.rsi/walter.png and b/Resources/Textures/Mobs/Pets/walter.rsi/walter.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..d309bba90a Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..fdb9ad206d Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..c3cf6b3158 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..76a6b65d97 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..13ed406f5d Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..329d6d3381 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json index b032c67d2a..40340fcc5c 100644 --- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json @@ -14,6 +14,36 @@ "name": "equipped-BACKPACK", "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..28b8312c98 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..9fa63e8953 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..86f3bfc35a Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..0c92aed453 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..0a73dc82a5 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..215c52fca9 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json index a88e367a85..2699b67ef2 100644 --- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json @@ -14,6 +14,36 @@ "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..55cd899faf Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..820cf0af75 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..881effe79c Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..34993de6d8 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..423fcfbcd3 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..9bf4168ae8 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json index a88e367a85..2699b67ef2 100644 --- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json @@ -14,6 +14,36 @@ "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..55cd899faf Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..820cf0af75 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..881effe79c Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..34993de6d8 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..423fcfbcd3 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..9bf4168ae8 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json index a88e367a85..2699b67ef2 100644 --- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json @@ -14,6 +14,36 @@ "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..fffc42452e Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..479d367b23 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..5a4e9a8919 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..e08bc22105 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..41b30fa253 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..1efac08bd7 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json index b032c67d2a..40340fcc5c 100644 --- a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json @@ -14,6 +14,36 @@ "name": "equipped-BACKPACK", "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..28b8312c98 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..9fa63e8953 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..86f3bfc35a Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..0c92aed453 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..0a73dc82a5 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..215c52fca9 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json index b032c67d2a..40340fcc5c 100644 --- a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json @@ -14,6 +14,36 @@ "name": "equipped-BACKPACK", "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..b7c2b19048 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..e213a42adb Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..7c6b71baf3 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..4fe4c14b12 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..987f3a8ef2 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..6db3ce69cd Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json index b032c67d2a..40340fcc5c 100644 --- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/red.rsi/meta.json @@ -14,6 +14,36 @@ "name": "equipped-BACKPACK", "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..55cd899faf Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..820cf0af75 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..881effe79c Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..34993de6d8 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..423fcfbcd3 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..9bf4168ae8 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json index b032c67d2a..40340fcc5c 100644 --- a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json @@ -14,6 +14,36 @@ "name": "equipped-BACKPACK", "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-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, { "name": "inhand-left", "directions": 4