From 74541e23a46a827d55de91943b9595f2c05d7a4e Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Wed, 19 Sep 2018 18:54:04 +0200
Subject: [PATCH] Equipment & inhands. (#110)

* Equipment WiP

* Equipment's starting to work.

* Equipment works properly 100% now.

* Inhands work.

Also more clothes.
---
 Content.Client/Content.Client.csproj          |   4 +-
 Content.Client/EntryPoint.cs                  |   6 +-
 .../Components/Clothing/ClothingComponent.cs  |  27 +++
 .../Inventory/ClientInventoryComponent.cs     | 156 ++++++++++++-----
 .../Components/Items/ClientHandsComponent.cs  | 144 ++++++++++++++--
 .../Components/Items/ItemComponent.cs         |  60 +++++++
 Content.Client/UserInterface/HandsGui.cs      |   4 +
 Content.Server/EntryPoint.cs                  |  11 +-
 .../Components/GUI/InventoryComponent.cs      |  62 ++++---
 Content.Shared/Content.Shared.csproj          |   2 +-
 .../Inventory/EquipmentSlotDefinitions.cs     |   3 +
 .../Inventory/InventoryTemplates.cs           |  47 +++++-
 .../Inventory/SharedInventoryComponent.cs     |  22 +--
 Resources/Prototypes/Entities/Clothing.yml    | 159 +-----------------
 .../Prototypes/Entities/Clothing/IDs.yml      |  13 ++
 .../Entities/Clothing/backpacks.yml           |  19 +++
 .../Prototypes/Entities/Clothing/belts.yml    |  26 +++
 .../Prototypes/Entities/Clothing/ears.yml     |  16 ++
 .../Prototypes/Entities/Clothing/eyes.yml     |  39 +++++
 .../Prototypes/Entities/Clothing/gloves.yml   |  39 +++++
 .../Prototypes/Entities/Clothing/helmets.yml  |  16 ++
 .../Prototypes/Entities/Clothing/masks.yml    |  35 ++++
 .../Prototypes/Entities/Clothing/shoes.yml    |  43 +++++
 .../Prototypes/Entities/Clothing/suits.yml    |  43 +++++
 .../Prototypes/Entities/Clothing/uniforms.yml |  76 +++++++++
 Resources/Prototypes/Entities/Mobs.yml        |  24 ++-
 Resources/Scenes/Inventory/StorageSlot.tscn   |   2 +-
 .../Textures/Clothing/armor.rsi/armor.png     | Bin 0 -> 441 bytes
 .../armor.rsi/equipped-OUTERCLOTHING.png      | Bin 0 -> 660 bytes
 .../Clothing/armor.rsi/inhand-left.png        | Bin 0 -> 526 bytes
 .../Clothing/armor.rsi/inhand-right.png       | Bin 0 -> 508 bytes
 .../Textures/Clothing/armor.rsi/meta.json     |   1 +
 .../Clothing/backpack.rsi/backpack.png        | Bin 0 -> 378 bytes
 .../backpack.rsi/equipped-BACKPACK.png        | Bin 0 -> 638 bytes
 .../Clothing/backpack.rsi/inhand-left.png     | Bin 0 -> 465 bytes
 .../Clothing/backpack.rsi/inhand-right.png    | Bin 0 -> 455 bytes
 .../Textures/Clothing/backpack.rsi/meta.json  |   1 +
 .../belt_utility.rsi/equipped-BELT.png        | Bin 0 -> 294 bytes
 .../Clothing/belt_utility.rsi/meta.json       |   1 +
 .../Clothing/belt_utility.rsi/utilitybelt.png | Bin 0 -> 463 bytes
 .../Clothing/gloves_black.rsi/black.png       | Bin 0 -> 456 bytes
 .../gloves_black.rsi/equipped-HAND.png        | Bin 0 -> 261 bytes
 .../Clothing/gloves_black.rsi/inhand-left.png | Bin 0 -> 205 bytes
 .../gloves_black.rsi/inhand-right.png         | Bin 0 -> 214 bytes
 .../Clothing/gloves_black.rsi/meta.json       |   1 +
 .../gloves_yellow.rsi/equipped-HAND.png       | Bin 0 -> 280 bytes
 .../gloves_yellow.rsi/inhand-left.png         | Bin 0 -> 221 bytes
 .../gloves_yellow.rsi/inhand-right.png        | Bin 0 -> 232 bytes
 .../Clothing/gloves_yellow.rsi/meta.json      |   1 +
 .../Clothing/gloves_yellow.rsi/yellow.png     | Bin 0 -> 351 bytes
 .../Clothing/headset.rsi/equipped-EARS.png    | Bin 0 -> 165 bytes
 .../Textures/Clothing/headset.rsi/headset.png | Bin 0 -> 298 bytes
 .../Textures/Clothing/headset.rsi/meta.json   |   1 +
 .../helmet_sec.rsi/equipped-HELMET.png        | Bin 0 -> 644 bytes
 .../Clothing/helmet_sec.rsi/helmet.png        | Bin 0 -> 378 bytes
 .../Clothing/helmet_sec.rsi/meta.json         |   1 +
 .../Clothing/mask_breath.rsi/breath.png       | Bin 0 -> 307 bytes
 .../mask_breath.rsi/equipped-MASK.png         | Bin 0 -> 378 bytes
 .../Clothing/mask_breath.rsi/meta.json        |   1 +
 .../meson_scanners.rsi/equipped-EYES.png      | Bin 0 -> 286 bytes
 .../Clothing/meson_scanners.rsi/meson.png     | Bin 0 -> 329 bytes
 .../Clothing/meson_scanners.rsi/meta.json     |   1 +
 .../Clothing/shoes_black.rsi/black.png        | Bin 0 -> 324 bytes
 .../shoes_black.rsi/equipped-FEET.png         | Bin 0 -> 374 bytes
 .../Clothing/shoes_black.rsi/meta.json        |   1 +
 .../shoes_white.rsi/equipped-FEET.png         | Bin 0 -> 424 bytes
 .../Clothing/shoes_white.rsi/meta.json        |   1 +
 .../Clothing/shoes_white.rsi/white.png        | Bin 0 -> 259 bytes
 .../Clothing/sunglasses.rsi/equipped-EYES.png | Bin 0 -> 187 bytes
 .../Clothing/sunglasses.rsi/meta.json         |   1 +
 .../Textures/Clothing/sunglasses.rsi/sun.png  | Bin 0 -> 226 bytes
 .../Clothing/sunglasses.rsi/sunglasses.png    | Bin 0 -> 226 bytes
 .../uniform_assistant.rsi/assistant.png       | Bin 0 -> 426 bytes
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 1209 bytes
 .../Clothing/uniform_assistant.rsi/meta.json  |   1 +
 .../uniform_engineering.rsi/engine.png        | Bin 0 -> 446 bytes
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 1469 bytes
 .../uniform_engineering.rsi/inhand-left.png   | Bin 0 -> 509 bytes
 .../uniform_engineering.rsi/inhand-right.png  | Bin 0 -> 532 bytes
 .../uniform_engineering.rsi/meta.json         |  74 ++++++++
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 993 bytes
 .../Clothing/uniform_grey.rsi/grey.png        | Bin 0 -> 394 bytes
 .../Clothing/uniform_grey.rsi/inhand-left.png | Bin 0 -> 487 bytes
 .../uniform_grey.rsi/inhand-right.png         | Bin 0 -> 507 bytes
 .../Clothing/uniform_grey.rsi/meta.json       |  74 ++++++++
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 1636 bytes
 .../uniform_janitor.rsi/inhand-left.png       | Bin 0 -> 513 bytes
 .../uniform_janitor.rsi/inhand-right.png      | Bin 0 -> 561 bytes
 .../Clothing/uniform_janitor.rsi/janitor.png  | Bin 0 -> 456 bytes
 .../Clothing/uniform_janitor.rsi/meta.json    |  74 ++++++++
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 757 bytes
 .../Clothing/vest_hazard.rsi/hazard.png       | Bin 0 -> 448 bytes
 .../Clothing/vest_hazard.rsi/meta.json        |   1 +
 Resources/Textures/Mob/human.rsi/male.png     | Bin 0 -> 1705 bytes
 Resources/Textures/Mob/human.rsi/meta.json    |  29 ++++
 SpaceStation14Content.sln.DotSettings         |   2 +
 engine                                        |   2 +-
 97 files changed, 1094 insertions(+), 273 deletions(-)
 create mode 100644 Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
 create mode 100644 Content.Client/GameObjects/Components/Items/ItemComponent.cs
 create mode 100644 Resources/Prototypes/Entities/Clothing/IDs.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/backpacks.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/belts.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/ears.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/eyes.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/gloves.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/helmets.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/masks.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/shoes.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/suits.yml
 create mode 100644 Resources/Prototypes/Entities/Clothing/uniforms.yml
 create mode 100644 Resources/Textures/Clothing/armor.rsi/armor.png
 create mode 100644 Resources/Textures/Clothing/armor.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/armor.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/armor.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/armor.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/backpack.rsi/backpack.png
 create mode 100644 Resources/Textures/Clothing/backpack.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/Clothing/backpack.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/backpack.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/backpack.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/belt_utility.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/Clothing/belt_utility.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/belt_utility.rsi/utilitybelt.png
 create mode 100644 Resources/Textures/Clothing/gloves_black.rsi/black.png
 create mode 100644 Resources/Textures/Clothing/gloves_black.rsi/equipped-HAND.png
 create mode 100644 Resources/Textures/Clothing/gloves_black.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/gloves_black.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/gloves_black.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/gloves_yellow.rsi/equipped-HAND.png
 create mode 100644 Resources/Textures/Clothing/gloves_yellow.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/gloves_yellow.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/gloves_yellow.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/gloves_yellow.rsi/yellow.png
 create mode 100644 Resources/Textures/Clothing/headset.rsi/equipped-EARS.png
 create mode 100644 Resources/Textures/Clothing/headset.rsi/headset.png
 create mode 100644 Resources/Textures/Clothing/headset.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/helmet_sec.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/helmet_sec.rsi/helmet.png
 create mode 100644 Resources/Textures/Clothing/helmet_sec.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/mask_breath.rsi/breath.png
 create mode 100644 Resources/Textures/Clothing/mask_breath.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/mask_breath.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/meson_scanners.rsi/equipped-EYES.png
 create mode 100644 Resources/Textures/Clothing/meson_scanners.rsi/meson.png
 create mode 100644 Resources/Textures/Clothing/meson_scanners.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/shoes_black.rsi/black.png
 create mode 100644 Resources/Textures/Clothing/shoes_black.rsi/equipped-FEET.png
 create mode 100644 Resources/Textures/Clothing/shoes_black.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/shoes_white.rsi/equipped-FEET.png
 create mode 100644 Resources/Textures/Clothing/shoes_white.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/shoes_white.rsi/white.png
 create mode 100644 Resources/Textures/Clothing/sunglasses.rsi/equipped-EYES.png
 create mode 100644 Resources/Textures/Clothing/sunglasses.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/sunglasses.rsi/sun.png
 create mode 100644 Resources/Textures/Clothing/sunglasses.rsi/sunglasses.png
 create mode 100644 Resources/Textures/Clothing/uniform_assistant.rsi/assistant.png
 create mode 100644 Resources/Textures/Clothing/uniform_assistant.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/uniform_assistant.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/uniform_engineering.rsi/engine.png
 create mode 100644 Resources/Textures/Clothing/uniform_engineering.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/uniform_engineering.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/uniform_engineering.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/uniform_engineering.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/uniform_grey.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/uniform_grey.rsi/grey.png
 create mode 100644 Resources/Textures/Clothing/uniform_grey.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/uniform_grey.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/uniform_grey.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/uniform_janitor.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/uniform_janitor.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/uniform_janitor.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/uniform_janitor.rsi/janitor.png
 create mode 100644 Resources/Textures/Clothing/uniform_janitor.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/vest_hazard.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/vest_hazard.rsi/hazard.png
 create mode 100644 Resources/Textures/Clothing/vest_hazard.rsi/meta.json
 create mode 100644 Resources/Textures/Mob/human.rsi/male.png
 create mode 100644 Resources/Textures/Mob/human.rsi/meta.json
 create mode 100644 SpaceStation14Content.sln.DotSettings

diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index b84a414408..e53fbe21b1 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -68,7 +68,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="EntryPoint.cs" />
+    <Compile Include="GameObjects\Components\Clothing\ClothingComponent.cs" />
     <Compile Include="GameObjects\Components\Inventory\ClientInventoryComponent.cs" />
+    <Compile Include="GameObjects\Components\Items\ItemComponent.cs" />
     <Compile Include="GameObjects\Components\Power\ApcBoundUserInterface.cs" />
     <Compile Include="GameObjects\Components\Storage\ClientStorageComponent.cs" />
     <Compile Include="Input\ContentContexts.cs" />
@@ -121,4 +123,4 @@
     <Compile Include="Construction\ConstructionPlacementHijack.cs" />
     <Compile Include="GameObjects\Components\IconSmoothing\IconSmoothComponent.cs" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index 6e96ce1976..2a2f4ee15d 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -1,4 +1,5 @@
 using Content.Client.GameObjects;
+using Content.Client.GameObjects.Components.Clothing;
 using Content.Client.GameObjects.Components.Construction;
 using Content.Client.GameObjects.Components.Power;
 using Content.Client.GameObjects.Components.SmoothWalling;
@@ -24,7 +25,6 @@ namespace Content.Client
             var factory = IoCManager.Resolve<IComponentFactory>();
             var prototypes = IoCManager.Resolve<IPrototypeManager>();
 
-            factory.RegisterIgnore("Item");
             factory.RegisterIgnore("Interactable");
             factory.RegisterIgnore("Damageable");
             factory.RegisterIgnore("Destructible");
@@ -48,7 +48,6 @@ namespace Content.Client
             factory.RegisterIgnore("MeleeWeapon");
 
             factory.RegisterIgnore("Storeable");
-            factory.RegisterIgnore("Clothing");
 
             factory.RegisterIgnore("Material");
             factory.RegisterIgnore("Stack");
@@ -61,6 +60,9 @@ namespace Content.Client
             factory.Register<ConstructorComponent>();
             factory.Register<ConstructionGhostComponent>();
             factory.Register<IconSmoothComponent>();
+            factory.Register<ClothingComponent>();
+            factory.Register<ItemComponent>();
+            factory.RegisterReference<ClothingComponent, ItemComponent>();
 
             factory.RegisterIgnore("Construction");
             factory.RegisterIgnore("Apc");
diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
new file mode 100644
index 0000000000..6deb653030
--- /dev/null
+++ b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
@@ -0,0 +1,27 @@
+using Content.Shared.GameObjects.Components.Inventory;
+using SS14.Client.Graphics;
+
+namespace Content.Client.GameObjects.Components.Clothing
+{
+    public class ClothingComponent : ItemComponent
+    {
+        public override string Name => "Clothing";
+
+        public (RSI rsi, RSI.StateId stateId)? GetEquippedStateInfo(EquipmentSlotDefines.SlotFlags slot)
+        {
+            if (RsiPath == null)
+            {
+                return null;
+            }
+
+            var rsi = GetRSI();
+            var stateId = EquippedPrefix != null ? $"{EquippedPrefix}-equipped-{slot}" : $"equipped-{slot}";
+            if (rsi.TryGetState(stateId, out _))
+            {
+                return (rsi, stateId);
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/Content.Client/GameObjects/Components/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/Inventory/ClientInventoryComponent.cs
index 6b3b85761d..04a03b8473 100644
--- a/Content.Client/GameObjects/Components/Inventory/ClientInventoryComponent.cs
+++ b/Content.Client/GameObjects/Components/Inventory/ClientInventoryComponent.cs
@@ -6,46 +6,118 @@ using SS14.Client.Interfaces.Input;
 using SS14.Client.UserInterface;
 using SS14.Client.UserInterface.Controls;
 using SS14.Client.UserInterface.CustomControls;
-using SS14.Shared.ContentPack;
 using SS14.Shared.GameObjects;
 using SS14.Shared.Input;
 using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.Network;
 using SS14.Shared.IoC;
-using SS14.Shared.Log;
-using SS14.Shared.Maths;
 using SS14.Shared.Serialization;
 using SS14.Shared.Utility;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Content.Client.GameObjects.Components.Clothing;
+using SS14.Shared.Interfaces.Reflection;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;
-using static Content.Shared.GameObjects.SharedInventoryComponent.ServerInventoryMessage;
 
 namespace Content.Client.GameObjects
 {
     public class ClientInventoryComponent : SharedInventoryComponent
     {
-        private InventoryWindow Window;
-        private string TemplateName = "HumanInventory"; //stored for serialization purposes
+        private Dictionary<Slots, IEntity> _slots = new Dictionary<Slots, IEntity>();
+
+        private InventoryWindow _window;
+        private string _templateName = "HumanInventory"; //stored for serialization purposes
 
         private InputCmdHandler _openMenuCmdHandler;
+        private Inventory _inventory;
+
+        private ISpriteComponent _sprite;
 
         public override void OnRemove()
         {
             base.OnRemove();
 
-            Window.Dispose();
+            _window.Dispose();
+        }
+
+        public override void OnAdd()
+        {
+            base.OnAdd();
+
+            _openMenuCmdHandler = InputCmdHandler.FromDelegate(session => { _window.AddToScreen(); _window.Open(); });
+        }
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            var reflectionManager = IoCManager.Resolve<IReflectionManager>();
+            var type = reflectionManager.LooseGetType(_templateName);
+            DebugTools.Assert(type != null);
+            _inventory = (Inventory)Activator.CreateInstance(type);
+
+            _window = new InventoryWindow(this);
+            _window.CreateInventory(_inventory);
+
+            if (Owner.TryGetComponent(out _sprite))
+            {
+                foreach (var mask in _inventory.SlotMasks.OrderBy(s => _inventory.SlotDrawingOrder(s)))
+                {
+                    if (mask == Slots.NONE)
+                    {
+                        continue;
+                    }
+                    _sprite.LayerMapReserveBlank(mask);
+                }
+            }
+
+            // Component state already came in but we couldn't set anything visually because, well, we didn't initialize yet.
+            foreach (var (slot, entity) in _slots)
+            {
+                _setSlot(slot, entity);
+            }
         }
 
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
 
-            Window = new InventoryWindow(this);
-            _openMenuCmdHandler = InputCmdHandler.FromDelegate(session => { Window.AddToScreen(); Window.Open(); });
-            serializer.DataField(ref TemplateName, "Template", "HumanInventory");
-            Window.CreateInventory(TemplateName);
+            serializer.DataField(ref _templateName, "Template", "HumanInventory");
+        }
+
+        public override void HandleComponentState(ComponentState state)
+        {
+            base.HandleComponentState(state);
+            var cast = (InventoryComponentState) state;
+
+            var doneSlots = new HashSet<Slots>();
+
+            var entityManager = IoCManager.Resolve<IEntityManager>();
+
+            foreach (var (slot, entityUid) in cast.Entities)
+            {
+                if (_slots.ContainsKey(slot))
+                {
+                    _slots.Remove(slot);
+                    _clearSlot(slot);
+                }
+
+                var entity = entityManager.GetEntity(entityUid);
+                _slots[slot] = entity;
+                _setSlot(slot, entity);
+                doneSlots.Add(slot);
+            }
+
+            foreach (var slot in _slots.Keys.ToList())
+            {
+                if (!doneSlots.Contains(slot))
+                {
+                    _clearSlot(slot);
+                    _slots.Remove(slot);
+                }
+            }
         }
 
         public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
@@ -53,18 +125,6 @@ namespace Content.Client.GameObjects
             var inputMgr = IoCManager.Resolve<IInputManager>();
             switch (message)
             {
-                //Updates what we are storing in UI slots
-                case ServerInventoryMessage msg:
-                    if (msg.Updatetype == ServerInventoryUpdate.Addition)
-                    {
-                        Window.AddToSlot(msg);
-                    }
-                    else if (msg.Updatetype == ServerInventoryUpdate.Removal)
-                    {
-                        Window.RemoveFromSlot(msg);
-                    }
-                    break;
-
                 case PlayerAttachedMsg _:
                     inputMgr.SetInputCommand(ContentKeyFunctions.OpenCharacterMenu, _openMenuCmdHandler);
                     break;
@@ -75,6 +135,34 @@ namespace Content.Client.GameObjects
             }
         }
 
+        private void _setSlot(Slots slot, IEntity entity)
+        {
+            if (_sprite != null && entity.TryGetComponent(out ClothingComponent clothing))
+            {
+                var flag = SlotMasks[slot];
+                var data = clothing.GetEquippedStateInfo(flag);
+                if (data == null)
+                {
+                    _sprite.LayerSetVisible(slot, false);
+                }
+                else
+                {
+                    var (rsi, state) = data.Value;
+                    _sprite.LayerSetVisible(slot, true);
+                    _sprite.LayerSetRSI(slot, rsi);
+                    _sprite.LayerSetState(slot, state);
+                }
+            }
+
+            _window?.AddToSlot(slot, entity);
+        }
+
+        private void _clearSlot(Slots slot)
+        {
+            _window?.RemoveFromSlot(slot);
+            _sprite?.LayerSetVisible(slot, false);
+        }
+
         public void SendUnequipMessage(Slots slot)
         {
             var unequipmessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Unequip);
@@ -109,14 +197,10 @@ namespace Content.Client.GameObjects
             }
 
             /// <summary>
-            /// Creates a grid container filled with slot buttons loaded from an inventory template
+            ///     Creates a grid container filled with slot buttons loaded from an inventory template
             /// </summary>
-            /// <param name="TemplateName"></param>
-            public void CreateInventory(string TemplateName)
+            public void CreateInventory(Inventory inventory)
             {
-                Type type = AppDomain.CurrentDomain.GetAssemblyByName("Content.Shared").GetType("Content.Shared.GameObjects." + TemplateName);
-                Inventory inventory = (Inventory)Activator.CreateInstance(type);
-
                 elements_x = inventory.Columns;
 
                 GridContainer = (GridContainer)Contents.GetChild("PanelContainer").GetChild("CenterContainer").GetChild("GridContainer");
@@ -151,14 +235,11 @@ namespace Content.Client.GameObjects
             /// <summary>
             /// Adds the item we have equipped to the slot texture and prepares the slot button for removal
             /// </summary>
-            /// <param name="message"></param>
-            public void AddToSlot(ServerInventoryMessage message)
+            public void AddToSlot(Slots slot, IEntity entity)
             {
-                InventoryButton button = InventorySlots[message.Inventoryslot];
-                var entity = IoCManager.Resolve<IEntityManager>().GetEntity(message.EntityUid);
+                var button = InventorySlots[slot];
 
-                button.EntityUid = message.EntityUid;
-                var container = button.GetChild("CenterContainer");
+                button.EntityUid = entity.Uid;
                 button.GetChild<Button>("Button").OnPressed += RemoveFromInventory;
                 button.GetChild<Button>("Button").OnPressed -= AddToInventory;
 
@@ -187,10 +268,9 @@ namespace Content.Client.GameObjects
             /// <summary>
             /// Remove element from the UI and update its button to blank texture and prepare for insertion again
             /// </summary>
-            /// <param name="message"></param>
-            public void RemoveFromSlot(ServerInventoryMessage message)
+            public void RemoveFromSlot(Slots slot)
             {
-                InventoryButton button = InventorySlots[message.Inventoryslot];
+                var button = InventorySlots[slot];
                 button.GetChild<SpriteView>("SpriteView").Sprite = null;
                 button.EntityUid = EntityUid.Invalid;
                 button.GetChild<Button>("Button").OnPressed -= RemoveFromInventory;
diff --git a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
index cd23649a67..55c8bae380 100644
--- a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
+++ b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
@@ -6,19 +6,60 @@ using SS14.Shared.GameObjects;
 using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.IoC;
 using System.Collections.Generic;
+using System.Linq;
+using SS14.Client.GameObjects;
+using SS14.Client.Interfaces.GameObjects.Components;
+using SS14.Shared.Interfaces.Network;
+using SS14.Shared.Serialization;
+using SS14.Shared.Utility;
 using SS14.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects
 {
     public class HandsComponent : SharedHandsComponent, IHandsComponent
     {
-        private readonly Dictionary<string, IEntity> hands = new Dictionary<string, IEntity>();
-        [ViewVariables]
-        public string ActiveIndex { get; private set; }
+        private HandsGui _gui;
+        private IUserInterfaceManager _userInterfaceManager;
+
+        [ViewVariables] private readonly Dictionary<string, IEntity> _hands = new Dictionary<string, IEntity>();
+
+        [ViewVariables] public string ActiveIndex { get; private set; }
+
+        [ViewVariables] private ISpriteComponent _sprite;
+
+        public override void OnAdd()
+        {
+            base.OnAdd();
+
+            _userInterfaceManager = IoCManager.Resolve<IUserInterfaceManager>();
+        }
+
+        public override void OnRemove()
+        {
+            base.OnRemove();
+
+            _gui?.Dispose();
+        }
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            _userInterfaceManager = IoCManager.Resolve<IUserInterfaceManager>();
+
+            if (Owner.TryGetComponent(out _sprite))
+            {
+                foreach (var slot in _hands.Keys)
+                {
+                    _sprite.LayerMapReserveBlank($"hand-{slot}");
+                    _setHand(slot, _hands[slot]);
+                }
+            }
+        }
 
         public IEntity GetEntity(string index)
         {
-            if (hands.TryGetValue(index, out var entity))
+            if (_hands.TryGetValue(index, out var entity))
             {
                 return entity;
             }
@@ -28,31 +69,104 @@ namespace Content.Client.GameObjects
 
         public override void HandleComponentState(ComponentState state)
         {
-            var cast = (HandsComponentState)state;
-            hands.Clear();
-            foreach (var hand in cast.Hands)
+            var cast = (HandsComponentState) state;
+            foreach (var (slot, uid) in cast.Hands)
             {
                 IEntity entity = null;
                 try
                 {
-                    entity = Owner.EntityManager.GetEntity(hand.Value);
+                    entity = Owner.EntityManager.GetEntity(uid);
                 }
                 catch
                 {
                     // Nothing.
                 }
-                hands[hand.Key] = entity;
+
+                _hands[slot] = entity;
+                _setHand(slot, entity);
+            }
+
+            foreach (var slot in _hands.Keys.ToList())
+            {
+                if (!cast.Hands.ContainsKey(slot))
+                {
+                    _hands[slot] = null;
+                    _setHand(slot, null);
+                }
             }
 
             ActiveIndex = cast.ActiveIndex;
-            // Tell UI to update.
-            var uiMgr = IoCManager.Resolve<IUserInterfaceManager>();
-            if (!uiMgr.StateRoot.TryGetChild<HandsGui>("HandsGui", out var control))
+
+            _gui?.UpdateHandIcons();
+        }
+
+        private void _setHand(string hand, IEntity entity)
+        {
+            if (_sprite == null)
             {
-                control = new HandsGui();
-                uiMgr.StateRoot.AddChild(control);
+                return;
+            }
+
+            if (entity == null)
+            {
+                _sprite.LayerSetVisible($"hand-{hand}", false);
+                return;
+            }
+
+            var item = entity.GetComponent<ItemComponent>();
+            var maybeInhands = item.GetInHandStateInfo(hand);
+            if (!maybeInhands.HasValue)
+            {
+                _sprite.LayerSetVisible($"hand-{hand}", false);
+            }
+            else
+            {
+                var (rsi, state) = maybeInhands.Value;
+                _sprite.LayerSetVisible($"hand-{hand}", true);
+                _sprite.LayerSetState($"hand-{hand}", state, rsi);
+            }
+        }
+
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+
+            if (!serializer.Reading)
+            {
+                return;
+            }
+
+            foreach (var slot in serializer.ReadDataFieldCached("hands", new List<string>()))
+            {
+                _hands.Add(slot, null);
+            }
+        }
+
+        public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
+            IComponent component = null)
+        {
+            base.HandleMessage(message, netChannel, component);
+
+            switch (message)
+            {
+                case PlayerAttachedMsg _:
+                    if (_gui == null)
+                    {
+                        _gui = new HandsGui();
+                    }
+                    else
+                    {
+                        _gui.Parent?.RemoveChild(_gui);
+                    }
+
+                    _userInterfaceManager.StateRoot.AddChild(_gui);
+                    _gui.UpdateHandIcons();
+                    break;
+
+                case PlayerDetachedMsg _:
+                    _gui.Parent?.RemoveChild(_gui);
+                    break;
             }
-            control.UpdateHandIcons();
         }
 
         public void SendChangeHand(string index)
diff --git a/Content.Client/GameObjects/Components/Items/ItemComponent.cs b/Content.Client/GameObjects/Components/Items/ItemComponent.cs
new file mode 100644
index 0000000000..b3bb4e84b7
--- /dev/null
+++ b/Content.Client/GameObjects/Components/Items/ItemComponent.cs
@@ -0,0 +1,60 @@
+using Content.Shared.GameObjects.Components.Inventory;
+using SS14.Client.Graphics;
+using SS14.Client.Interfaces.ResourceManagement;
+using SS14.Client.ResourceManagement;
+using SS14.Shared.GameObjects;
+using SS14.Shared.GameObjects.Components.Renderable;
+using SS14.Shared.IoC;
+using SS14.Shared.Serialization;
+using SS14.Shared.Utility;
+using SS14.Shared.ViewVariables;
+
+namespace Content.Client.GameObjects
+{
+    public class ItemComponent : Component
+    {
+        public override string Name => "Item";
+
+        [ViewVariables] protected ResourcePath RsiPath;
+
+        private string _equippedPrefix;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public string EquippedPrefix
+        {
+            get => _equippedPrefix;
+            set => _equippedPrefix = value;
+        }
+
+        public (RSI rsi, RSI.StateId stateId)? GetInHandStateInfo(string hand)
+        {
+            if (RsiPath == null)
+            {
+                return null;
+            }
+
+            var rsi = GetRSI();
+            var stateId = EquippedPrefix != null ? $"{EquippedPrefix}-inhand-{hand}" : $"inhand-{hand}";
+            if (rsi.TryGetState(stateId, out _))
+            {
+                return (rsi, stateId);
+            }
+
+            return null;
+        }
+
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+
+            serializer.DataFieldCached(ref RsiPath, "sprite", null);
+            serializer.DataFieldCached(ref _equippedPrefix, "prefix", null);
+        }
+
+        protected RSI GetRSI()
+        {
+            var resourceCache = IoCManager.Resolve<IResourceCache>();
+            return resourceCache.GetResource<RSIResource>(SharedSpriteComponent.TextureRoot / RsiPath).RSI;
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs
index 011977d279..3800ca58d8 100644
--- a/Content.Client/UserInterface/HandsGui.cs
+++ b/Content.Client/UserInterface/HandsGui.cs
@@ -119,6 +119,10 @@ namespace Content.Client.UserInterface
 
         public void UpdateHandIcons()
         {
+            if (Parent == null)
+            {
+                return;
+            }
             UpdateDraw();
 
             if (!TryGetHands(out IHandsComponent hands))
diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index bd303d0684..efd45c2f13 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -33,6 +33,7 @@ using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Mobs;
 using Content.Server.Players;
 using Content.Server.GameObjects.Components.Interactable;
+using Content.Shared.GameObjects.Components.Inventory;
 
 namespace Content.Server
 {
@@ -233,7 +234,15 @@ namespace Content.Server
 
         IEntity SpawnPlayerMob()
         {
-            return entityManager.ForceSpawnEntityAt(PlayerPrototypeName, SpawnPoint);
+            var entity = entityManager.ForceSpawnEntityAt(PlayerPrototypeName, SpawnPoint);
+            var shoes = entityManager.SpawnEntity("ShoesItem");
+            var uniform = entityManager.SpawnEntity("UniformAssistant");
+            if (entity.TryGetComponent(out InventoryComponent inventory))
+            {
+                inventory.Equip(EquipmentSlotDefines.Slots.INNERCLOTHING, uniform.GetComponent<ClothingComponent>());
+                inventory.Equip(EquipmentSlotDefines.Slots.SHOES, shoes.GetComponent<ClothingComponent>());
+            }
+            return entity;
         }
     }
 }
diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
index ef43a7f7e0..3575c9018b 100644
--- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
+++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
@@ -1,5 +1,4 @@
-using SS14.Server.GameObjects;
-using SS14.Server.GameObjects.Components.Container;
+using SS14.Server.GameObjects.Components.Container;
 using System;
 using System.Collections.Generic;
 using Content.Shared.GameObjects;
@@ -8,19 +7,22 @@ using SS14.Shared.GameObjects;
 using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.Network;
 using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;
-using static Content.Shared.GameObjects.SharedInventoryComponent.ServerInventoryMessage;
 using SS14.Shared.IoC;
 using SS14.Server.Interfaces.Player;
 using SS14.Shared.ContentPack;
 using System.Linq;
 using SS14.Shared.Serialization;
 using SS14.Shared.Interfaces.GameObjects.Components;
+using SS14.Shared.Utility;
+using SS14.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects
 {
     public class InventoryComponent : SharedInventoryComponent
     {
+        [ViewVariables]
         private Dictionary<Slots, ContainerSlot> SlotContainers = new Dictionary<Slots, ContainerSlot>();
+
         string TemplateName = "HumanInventory"; //stored for serialization purposes
 
         public override void ExposeData(ObjectSerializer serializer)
@@ -36,13 +38,14 @@ namespace Content.Server.GameObjects
 
         private void CreateInventory(string TemplateName)
         {
-            Type type = AppDomain.CurrentDomain.GetAssemblyByName("Content.Shared").GetType("Content.Shared.GameObjects." + TemplateName);
-            Inventory inventory = (Inventory)Activator.CreateInstance(type);
+            Type type = AppDomain.CurrentDomain.GetAssemblyByName("Content.Shared")
+                .GetType("Content.Shared.GameObjects." + TemplateName);
+            Inventory inventory = (Inventory) Activator.CreateInstance(type);
             foreach (Slots slotnames in inventory.SlotMasks)
             {
                 if (slotnames != Slots.NONE)
                 {
-                    var newslot = AddSlot(slotnames);
+                    AddSlot(slotnames);
                 }
             }
         }
@@ -54,6 +57,7 @@ namespace Content.Server.GameObjects
             {
                 RemoveSlot(slot);
             }
+
             base.OnRemove();
         }
 
@@ -90,11 +94,13 @@ namespace Content.Server.GameObjects
         {
             if (clothing == null)
             {
-                throw new ArgumentNullException(nameof(clothing), "Clothing must be passed here. To remove some clothing from a slot, use Unequip()");
+                throw new ArgumentNullException(nameof(clothing),
+                    "Clothing must be passed here. To remove some clothing from a slot, use Unequip()");
             }
 
             if (clothing.SlotFlags == SlotFlags.PREVENTEQUIP //Flag to prevent equipping at all
-                || (clothing.SlotFlags & SlotMasks[slot]) == 0) //Does the clothing flag have any of our requested slot flags
+                || (clothing.SlotFlags & SlotMasks[slot]) == 0
+            ) //Does the clothing flag have any of our requested slot flags
             {
                 return false;
             }
@@ -107,15 +113,7 @@ namespace Content.Server.GameObjects
 
             clothing.EquippedToSlot(inventorySlot);
 
-            var UIupdatemessage = new ServerInventoryMessage()
-            {
-                Inventoryslot = slot,
-                EntityUid = clothing.Owner.Uid,
-                Updatetype = ServerInventoryUpdate.Addition
-            };
-
-            SendNetworkMessage(UIupdatemessage);
-
+            Dirty();
             return true;
         }
 
@@ -149,19 +147,12 @@ namespace Content.Server.GameObjects
                 return false;
             }
 
-            var UIupdatemessage = new ServerInventoryMessage()
-            {
-                Inventoryslot = slot,
-                EntityUid = item.Owner.Uid,
-                Updatetype = ServerInventoryUpdate.Removal
-            };
-            SendNetworkMessage(UIupdatemessage);
-
             item.RemovedFromSlot();
 
             // TODO: The item should be dropped to the container our owner is in, if any.
             var itemTransform = item.Owner.GetComponent<ITransformComponent>();
             itemTransform.LocalPosition = Owner.GetComponent<ITransformComponent>().LocalPosition;
+            Dirty();
             return true;
         }
 
@@ -192,6 +183,7 @@ namespace Content.Server.GameObjects
                 throw new InvalidOperationException($"Slot '{slot}' already exists.");
             }
 
+            Dirty();
             return SlotContainers[slot] = ContainerManagerComponent.Create<ContainerSlot>(GetSlotString(slot), Owner);
         }
 
@@ -212,10 +204,12 @@ namespace Content.Server.GameObjects
             if (GetSlotItem(slot) != null && !Unequip(slot))
             {
                 // TODO: Handle this potential failiure better.
-                throw new InvalidOperationException("Unable to remove slot as the contained clothing could not be dropped");
+                throw new InvalidOperationException(
+                    "Unable to remove slot as the contained clothing could not be dropped");
             }
 
             SlotContainers.Remove(slot);
+            Dirty();
         }
 
         /// <summary>
@@ -259,7 +253,8 @@ namespace Content.Server.GameObjects
             }
         }
 
-        public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
+        public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
+            IComponent component = null)
         {
             base.HandleMessage(message, netChannel, component);
 
@@ -275,5 +270,18 @@ namespace Content.Server.GameObjects
                     break;
             }
         }
+
+        public override ComponentState GetComponentState()
+        {
+            var list = new List<KeyValuePair<Slots, EntityUid>>();
+            foreach (var (slot, container) in SlotContainers)
+            {
+                if (container.ContainedEntity != null)
+                {
+                    list.Add(new KeyValuePair<Slots, EntityUid>(slot, container.ContainedEntity.Uid));
+                }
+            }
+            return new InventoryComponentState(list);
+        }
     }
 }
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index dabe444b29..2601de9536 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -110,4 +110,4 @@
     <Compile Include="Construction\ConstructionPrototype.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs
index 3def6e14c6..1e627fa1d5 100644
--- a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs
+++ b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs
@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using SS14.Shared.Serialization;
 
 namespace Content.Shared.GameObjects.Components.Inventory
 {
     public static class EquipmentSlotDefines
     {
+        [Serializable, NetSerializable]
         public enum Slots
         {
             NONE,
@@ -30,6 +32,7 @@ namespace Content.Shared.GameObjects.Components.Inventory
             EXOSUITSLOT2
         }
 
+        [Serializable, NetSerializable]
         [Flags]
         public enum SlotFlags
         {
diff --git a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs
index 0e7950d52d..5c6a4c861f 100644
--- a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs
+++ b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs
@@ -5,21 +5,50 @@ namespace Content.Shared.GameObjects
 {
     public abstract class Inventory
     {
-        abstract public int Columns { get; }
+        public abstract int Columns { get; }
 
-        abstract public List<Slots> SlotMasks { get; }
+        public abstract IReadOnlyList<Slots> SlotMasks { get; }
+
+        /// <summary>
+        ///     Gets the drawing order of a slot.
+        /// </summary>
+        /// <returns>
+        ///     An int that can be used for sorting relative to other drawing orders.
+        ///     The value returned does not mean anything else.
+        /// </returns>
+        public abstract int SlotDrawingOrder(Slots slot);
     }
 
     public class HumanInventory : Inventory
     {
         public override int Columns => 3;
 
-        public override List<Slots> SlotMasks => new List<Slots>()
-            {
-                Slots.EYES, Slots.HEAD, Slots.EARS,
-                Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING,
-                Slots.BACKPACK, Slots.BELT, Slots.GLOVES,
-                Slots.NONE, Slots.SHOES, Slots.IDCARD
-            };
+        private static Dictionary<Slots, int> _slotDrawingOrder = new Dictionary<Slots, int>
+        {
+            {Slots.HEAD, 10},
+            {Slots.MASK, 9},
+            {Slots.EARS, 8},
+            {Slots.BACKPACK, 7},
+            {Slots.EYES, 6},
+            {Slots.OUTERCLOTHING, 5},
+            {Slots.BELT, 4},
+            {Slots.GLOVES, 3},
+            {Slots.SHOES, 2},
+            {Slots.IDCARD, 1},
+            {Slots.INNERCLOTHING, 0}
+        };
+
+        public override IReadOnlyList<Slots> SlotMasks { get; } = new List<Slots>()
+        {
+            Slots.EYES, Slots.HEAD, Slots.EARS,
+            Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING,
+            Slots.BACKPACK, Slots.BELT, Slots.GLOVES,
+            Slots.NONE, Slots.SHOES, Slots.IDCARD
+        };
+
+        public override int SlotDrawingOrder(Slots slot)
+        {
+            return _slotDrawingOrder.TryGetValue(slot, out var val) ? val : 0;
+        }
     }
 }
diff --git a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
index 985b35faa1..40335e9749 100644
--- a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
+++ b/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
@@ -1,6 +1,7 @@
 using SS14.Shared.GameObjects;
 using SS14.Shared.Serialization;
 using System;
+using System.Collections.Generic;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
 namespace Content.Shared.GameObjects
@@ -8,26 +9,17 @@ namespace Content.Shared.GameObjects
     public abstract class SharedInventoryComponent : Component
     {
         public sealed override string Name => "Inventory";
-
-        public override uint? NetID => ContentNetIDs.STORAGE;
-
+        public sealed override uint? NetID => ContentNetIDs.STORAGE;
+        public sealed override Type StateType => typeof(InventoryComponentState);
 
         [Serializable, NetSerializable]
-        public class ServerInventoryMessage : ComponentMessage
+        protected class InventoryComponentState : ComponentState
         {
-            public Slots Inventoryslot;
-            public EntityUid EntityUid;
-            public ServerInventoryUpdate Updatetype;
+            public List<KeyValuePair<Slots, EntityUid>> Entities { get; }
 
-            public ServerInventoryMessage()
+            public InventoryComponentState(List<KeyValuePair<Slots, EntityUid>> entities) : base(ContentNetIDs.STORAGE)
             {
-                Directed = true;
-            }
-
-            public enum ServerInventoryUpdate
-            {
-                Removal = 0,
-                Addition = 1
+                Entities = entities;
             }
         }
 
diff --git a/Resources/Prototypes/Entities/Clothing.yml b/Resources/Prototypes/Entities/Clothing.yml
index cef7bf3a2c..9bce815c0b 100644
--- a/Resources/Prototypes/Entities/Clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing.yml
@@ -2,170 +2,13 @@
   name: "Clothing"
   id: Clothing
   parent: BaseItem
+  abstract: true
   components:
   - type: Clothing
     Size: 5
 
-- type: entity
-  parent: Clothing
-  id: ShoesItem
-  name: Shoes
-  description: Don't take them off at your office Christmas party
-  components:
-  - type: Sprite
-    texture: Objects/shoes.png
 
-  - type: Icon
-    texture: Objects/shoes.png
 
-  - type: Clothing
-    Slots:
-    - shoes
 
-- type: entity
-  parent: Clothing
-  id: JanitorUniform
-  name: Janitor Jumpsuit
-  description: The jumpsuit for the poor sop with a mop
-  components:
-  - type: Sprite
-    texture: Objects/janitorsuit.png
 
-  - type: Icon
-    texture: Objects/janitorsuit.png
 
-  - type: Clothing
-    Slots:
-    - innerclothing
-
-- type: entity
-  parent: Clothing
-  id: SecurityVestClothing
-  name: Security Vest
-  description: Bulletproof vest, more or less
-  components:
-  - type: Sprite
-    texture: Clothing/armorvest.png
-  - type: Icon
-    texture: Clothing/armorvest.png
-  - type: Clothing
-    Slots:
-    - outerclothing
-
-- type: entity
-  parent: Clothing
-  id: UtilityBeltClothing
-  name: Utility Belt
-  description: Belt for holding all your usual tools
-  components:
-  - type: Sprite
-    texture: Clothing/belt_utility.png
-  - type: Icon
-    texture: Clothing/belt_utility.png
-    Size: 30
-  - type: Clothing
-    Slots:
-    - belt
-  - type: Storage
-    Capacity: 30
-
-- type: entity
-  parent: Clothing
-  id: BackpackClothing
-  name: Backpack
-  description: A convenient storage pack
-  components:
-  - type: Sprite
-    texture: Clothing/backpack.png
-  - type: Icon
-    texture: Clothing/backpack.png
-    Size: 9999
-  - type: Clothing
-    Slots:
-    - back
-  - type: Storage
-    Capacity: 100
-
-- type: entity
-  parent: Clothing
-  id: MesonGlasses
-  name: Optical Meson Scanners
-  description: The pinnacle of modern science, wallhacks in real life
-  components:
-  - type: Sprite
-    texture: Clothing/glasses_meson.png
-  - type: Icon
-    texture: Clothing/glasses_meson.png
-  - type: Clothing
-    Slots:
-    - eyes
-
-- type: entity
-  parent: Clothing
-  id: YellowGloves
-  name: Insulated Gloves
-  description: Electrical gloves that keep you from frying
-  components:
-  - type: Sprite
-    texture: Clothing/gloves_yellow.png
-  - type: Icon
-    texture: Clothing/gloves_yellow.png
-  - type: Clothing
-    Slots:
-    - gloves
-
-- type: entity
-  parent: Clothing
-  id: HelmetSecurity
-  name: Security Helmet
-  description: "A slick logo covers the ear: \"Concussions are better than holes!\""
-  components:
-  - type: Sprite
-    texture: Clothing/helmet_sec.png
-  - type: Icon
-    texture: Clothing/helmet_sec.png
-  - type: Clothing
-    Slots:
-    - head
-
-- type: entity
-  parent: Clothing
-  id: GasMaskClothing
-  name: Gas Mask
-  description: Regulations require these to be stocked after the fourth coolant leak
-  components:
-  - type: Sprite
-    texture: Clothing/gasmask.png
-  - type: Icon
-    texture: Clothing/gasmask.png
-  - type: Clothing
-    Slots:
-    - mask
-
-- type: entity
-  parent: Clothing
-  id: IDCardStandard
-  name: Identification Card
-  description: A card necessary to access various areas aboard the station
-  components:
-  - type: Sprite
-    texture: Clothing/idcard_standard.png
-  - type: Icon
-    texture: Clothing/idcard_standard.png
-  - type: Clothing
-    Slots:
-    - idcard
-
-- type: entity
-  parent: Clothing
-  id: RadioHeadsetEars
-  name: Headset Radio
-  description: The radio to keep up to date in real time with fun onboard station activities
-  components:
-  - type: Sprite
-    texture: Clothing/ears_headset.png
-  - type: Icon
-    texture: Clothing/ears_headset.png
-  - type: Clothing
-    Slots:
-    - ears
diff --git a/Resources/Prototypes/Entities/Clothing/IDs.yml b/Resources/Prototypes/Entities/Clothing/IDs.yml
new file mode 100644
index 0000000000..137e135216
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/IDs.yml
@@ -0,0 +1,13 @@
+- type: entity
+  parent: Clothing
+  id: IDCardStandard
+  name: Identification Card
+  description: A card necessary to access various areas aboard the station
+  components:
+  - type: Sprite
+    texture: Clothing/idcard_standard.png
+  - type: Icon
+    texture: Clothing/idcard_standard.png
+  - type: Clothing
+    Slots:
+    - idcard
diff --git a/Resources/Prototypes/Entities/Clothing/backpacks.yml b/Resources/Prototypes/Entities/Clothing/backpacks.yml
new file mode 100644
index 0000000000..fd7e691c49
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/backpacks.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: Clothing
+  id: BackpackClothing
+  name: Backpack
+  description: A convenient storage pack
+  components:
+  - type: Sprite
+    sprite: Clothing/backpack.rsi
+    state: backpack
+  - type: Icon
+    sprite: Clothing/backpack.rsi
+    state: backpack
+  - type: Clothing
+    Size: 9999
+    Slots:
+    - back
+    sprite: Clothing/backpack.rsi
+  - type: Storage
+    Capacity: 100
diff --git a/Resources/Prototypes/Entities/Clothing/belts.yml b/Resources/Prototypes/Entities/Clothing/belts.yml
new file mode 100644
index 0000000000..b023279c80
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/belts.yml
@@ -0,0 +1,26 @@
+- type: entity
+  parent: Clothing
+  id: BeltBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [belt]
+
+
+- type: entity
+  parent: BeltBase
+  id: UtilityBeltClothing
+  name: Utility Belt
+  description: Belt for holding all your usual tools
+  components:
+  - type: Sprite
+    sprite: Clothing/belt_utility.rsi
+    state: utilitybelt
+  - type: Icon
+    sprite: Clothing/belt_utility.rsi
+    state: utilitybelt
+  - type: Clothing
+    Size: 30
+    sprite: Clothing/belt_utility.rsi
+  - type: Storage
+    Capacity: 30
diff --git a/Resources/Prototypes/Entities/Clothing/ears.yml b/Resources/Prototypes/Entities/Clothing/ears.yml
new file mode 100644
index 0000000000..18500c6fb0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/ears.yml
@@ -0,0 +1,16 @@
+- type: entity
+  parent: Clothing
+  id: RadioHeadsetEars
+  name: Headset Radio
+  description: The radio to keep up to date in real time with fun onboard station activities
+  components:
+  - type: Sprite
+    sprite: Clothing/headset.rsi
+    state: headset
+  - type: Icon
+    sprite: Clothing/headset.rsi
+    state: headset
+  - type: Clothing
+    Slots:
+    - ears
+    sprite: Clothing/headset.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/eyes.yml b/Resources/Prototypes/Entities/Clothing/eyes.yml
new file mode 100644
index 0000000000..b79f273749
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/eyes.yml
@@ -0,0 +1,39 @@
+- type: entity
+  parent: Clothing
+  id: GlassesBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [eyes]
+
+
+- type: entity
+  parent: GlassesBase
+  id: MesonGlasses
+  name: Optical Meson Scanners
+  description: The pinnacle of modern science, wallhacks in real life
+  components:
+  - type: Sprite
+    sprite: Clothing/meson_scanners.rsi
+    state: meson
+  - type: Icon
+    sprite: Clothing/meson_scanners.rsi
+    state: meson
+  - type: Clothing
+    sprite: Clothing/meson_scanners.rsi
+
+
+- type: entity
+  parent: GlassesBase
+  id: SunGlasses
+  name: Sun Glasses
+  description: Useful both for security and cargonia
+  components:
+  - type: Sprite
+    sprite: Clothing/sunglasses.rsi
+    state: sunglasses
+  - type: Icon
+    sprite: Clothing/sunglasses.rsi
+    state: sunglasses
+  - type: Clothing
+    sprite: Clothing/sunglasses.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/gloves.yml b/Resources/Prototypes/Entities/Clothing/gloves.yml
new file mode 100644
index 0000000000..186bdcb56a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/gloves.yml
@@ -0,0 +1,39 @@
+- type: entity
+  parent: Clothing
+  id: GlovesBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [gloves]
+
+
+- type: entity
+  parent: GlovesBase
+  id: YellowGloves
+  name: Insulated Gloves
+  description: Electrical gloves that keep you from frying
+  components:
+  - type: Sprite
+    sprite: Clothing/gloves_yellow.rsi
+    state: yellow
+  - type: Icon
+    sprite: Clothing/gloves_yellow.rsi
+    state: yellow
+  - type: Clothing
+    sprite: Clothing/gloves_yellow.rsi
+
+
+- type: entity
+  parent: GlovesBase
+  id: BlackGloves
+  name: Insulated Gloves
+  description: Regular gloves that do not keep you from frying
+  components:
+  - type: Sprite
+    sprite: Clothing/gloves_black.rsi
+    state: black
+  - type: Icon
+    sprite: Clothing/gloves_black.rsi
+    state: black
+  - type: Clothing
+    sprite: Clothing/gloves_black.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/helmets.yml b/Resources/Prototypes/Entities/Clothing/helmets.yml
new file mode 100644
index 0000000000..da9a4460e8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/helmets.yml
@@ -0,0 +1,16 @@
+- type: entity
+  parent: Clothing
+  id: HelmetSecurity
+  name: Security Helmet
+  description: "A slick logo covers the ear: \"Concussions are better than holes!\""
+  components:
+  - type: Sprite
+    sprite: Clothing/helmet_sec.rsi
+    state: helmet
+  - type: Icon
+    sprite: Clothing/helmet_sec.rsi
+    state: helmet
+  - type: Clothing
+    Slots:
+    - head
+    sprite: Clothing/helmet_sec.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/masks.yml b/Resources/Prototypes/Entities/Clothing/masks.yml
new file mode 100644
index 0000000000..ffda280bc1
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/masks.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: Clothing
+  id: MasksBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [mask]
+
+
+- type: entity
+  parent: MasksBase
+  id: GasMaskClothing
+  name: Gas Mask
+  description: Regulations require these to be stocked after the fourth coolant leak
+  components:
+  - type: Sprite
+    texture: Clothing/gasmask.png
+  - type: Icon
+    texture: Clothing/gasmask.png
+
+
+- type: entity
+  parent: MasksBase
+  id: BreathMaskClothing
+  name: Breath Mask
+  description: Might as well keep this on 24/7
+  components:
+  - type: Sprite
+    sprite: Clothing/mask_breath.rsi
+    state: breath
+  - type: Icon
+    sprite: Clothing/mask_breath.rsi
+    state: breath
+  - type: Clothing
+    sprite: Clothing/mask_breath.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/shoes.yml b/Resources/Prototypes/Entities/Clothing/shoes.yml
new file mode 100644
index 0000000000..94adc7c0e9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/shoes.yml
@@ -0,0 +1,43 @@
+- type: entity
+  parent: Clothing
+  id: ShoesBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [shoes]
+
+
+- type: entity
+  parent: ShoesBase
+  id: ShoesItem
+  name: Black Shoes
+  description: Don't take them off at your office Christmas party
+  components:
+  - type: Sprite
+    sprite: Clothing/shoes_black.rsi
+    state: black
+
+  - type: Icon
+    sprite: Clothing/shoes_black.rsi
+    state: black
+
+  - type: Clothing
+    sprite: Clothing/shoes_black.rsi
+
+
+- type: entity
+  parent: ShoesBase
+  id: WhiteShoes
+  name: White Shoes
+  description: Don't take them off at your office Christmas party
+  components:
+  - type: Sprite
+    sprite: Clothing/shoes_white.rsi
+    state: white
+
+  - type: Icon
+    sprite: Clothing/shoes_white.rsi
+    state: white
+
+  - type: Clothing
+    sprite: Clothing/shoes_white.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/suits.yml b/Resources/Prototypes/Entities/Clothing/suits.yml
new file mode 100644
index 0000000000..070bbced28
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/suits.yml
@@ -0,0 +1,43 @@
+- type: entity
+  parent: Clothing
+  id: SuitBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [outerclothing]
+
+
+- type: entity
+  parent: SuitBase
+  id: SecurityVestClothing
+  name: Security Vest
+  description: Bulletproof vest, more or less
+  components:
+  - type: Sprite
+    sprite: Clothing/armor.rsi
+    state: armor
+
+  - type: Icon
+    sprite: Clothing/armor.rsi
+    state: armor
+
+  - type: Clothing
+    sprite: Clothing/armor.rsi
+
+
+- type: entity
+  parent: SuitBase
+  id: HazardVestClothing
+  name: Hazard Vest
+  description: Prevents accidents
+  components:
+  - type: Sprite
+    sprite: Clothing/vest_hazard.rsi
+    state: hazard
+
+  - type: Icon
+    sprite: Clothing/vest_hazard.rsi
+    state: hazard
+
+  - type: Clothing
+    sprite: Clothing/vest_hazard.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/uniforms.yml b/Resources/Prototypes/Entities/Clothing/uniforms.yml
new file mode 100644
index 0000000000..2d5afb217f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/uniforms.yml
@@ -0,0 +1,76 @@
+- type: entity
+  parent: Clothing
+  id: UniformBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots: [innerclothing]
+
+
+- type: entity
+  parent: UniformBase
+  id: JanitorUniform
+  name: Janitor Jumpsuit
+  description: The jumpsuit for the poor sop with a mop
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_janitor.rsi
+    state: janitor
+
+  - type: Icon
+    sprite: Clothing/uniform_janitor.rsi
+    state: janitor
+
+  - type: Clothing
+    sprite: Clothing/uniform_janitor.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformGrey
+  name: Grey Jumpsuit
+  description: Greytide. Worldwide.
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_grey.rsi
+    state: grey
+
+  - type: Icon
+    sprite: Clothing/uniform_grey.rsi
+    state: grey
+
+  - type: Clothing
+    sprite: Clothing/uniform_grey.rsi
+
+
+- type: entity
+  parent: UniformBase
+  id: UniformEngineering
+  name: Engineering Jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_engineering.rsi
+    state: engine
+
+  - type: Icon
+    sprite: Clothing/uniform_engineering.rsi
+    state: engine
+
+  - type: Clothing
+    sprite: Clothing/uniform_engineering.rsi
+
+
+- type: entity
+  parent: UniformBase
+  id: UniformAssistant
+  name: Assistant Jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/uniform_assistant.rsi
+    state: assistant
+
+  - type: Icon
+    sprite: Clothing/uniform_assistant.rsi
+    state: assistant
+
+  - type: Clothing
+    sprite: Clothing/uniform_assistant.rsi
diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml
index b8f7bdd91e..6da95f0ee2 100644
--- a/Resources/Prototypes/Entities/Mobs.yml
+++ b/Resources/Prototypes/Entities/Mobs.yml
@@ -12,13 +12,29 @@
   - type: Constructor
   - type: Clickable
   - type: Sprite
-    sprite: Mob/greyshirt.rsi
-    state: greyshirt
+    netsync: false
     drawdepth: Mobs
 
+    layers:
+    - sprite: Mob/human.rsi
+      state: male
+    - map: ["enum.Slots.INNERCLOTHING"]
+    - map: ["enum.Slots.IDCARD"]
+    - map: ["enum.Slots.SHOES"]
+    - map: ["enum.Slots.GLOVES"]
+    - map: ["enum.Slots.BELT"]
+    - map: ["enum.Slots.OUTERCLOTHING"]
+    - map: ["enum.Slots.EYES"]
+    - map: ["enum.Slots.BACKPACK"]
+    - map: ["enum.Slots.EARS"]
+    - map: ["enum.Slots.MASK"]
+    - map: ["enum.Slots.HEAD"]
+    - map: ["hand-left"]
+    - map: ["hand-right"]
+
   - type: Icon
-    sprite: Mob/greyshirt.rsi
-    state: greyshirt
+    sprite: Mob/human.rsi
+    state: male
 
   - type: BoundingBox
     aabb: "-0.5,-0.25,-0.05,0.25"
diff --git a/Resources/Scenes/Inventory/StorageSlot.tscn b/Resources/Scenes/Inventory/StorageSlot.tscn
index 5a93ec12a4..5c61fe1ac1 100644
--- a/Resources/Scenes/Inventory/StorageSlot.tscn
+++ b/Resources/Scenes/Inventory/StorageSlot.tscn
@@ -42,7 +42,7 @@ action_mode = 0
 enabled_focus_mode = 2
 shortcut = null
 group = null
-text = "Slut"
+text = "Slot"
 flat = true
 clip_text = true
 align = 1
diff --git a/Resources/Textures/Clothing/armor.rsi/armor.png b/Resources/Textures/Clothing/armor.rsi/armor.png
new file mode 100644
index 0000000000000000000000000000000000000000..d84f5be1301e0f1ed7d50e445404083b27efd530
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004iNkl<Zc%1E(
zv2MaJ5QaZ0M`A1zLCWHR4m<*D7}&|coEKr_ZCH2>9-x&N$Y2JBAW_e;<Sr!&kVY3e
zv_n2Ak`w=T_sc#z(9zNH$MmGa)oSIh<Mn!78z<2`#dl&qi({W8iPu{DdyUrGCrRRG
zaqIzKHPeL1rPkU{r&9o;C}O+aVvOnCYZi+Ir_%|5-EQ}wsY6K&0G#t20OuUmTJBfD
zTFdcx<nwZorUc+cA~MGCIv6kvLzGgaX^OS>=1J2Or4++3WEh4RV?+kpG>Ts?m*q<o
zMK_bzr3ct-HsajkEx4yz@HaedK&i)2=UnSNq8<SJd_FG=*A=gtn#D1I=opF&j7B4g
z>;|p1NGCGT@Aq39kRmehHXgT5ER7Kvc>nk)$IiJQo2~l&kYyqRqEk?}1<!PR9nw>P
zD~j?uZbG7IZNM1QJ7gIu2pS8V^Bfff9I{OGBZ78UF<NUsnM`m+Q9G}Kfc<_iF5cR}
j)kM>Lo8lcE9shzaC`Fm0VSeQ=00000NkvXXu0mjf8PdU%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/armor.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ab8b4351b8fbca05243ee46f96bf71582e62137
GIT binary patch
literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00078Nkl<Zc%1Fp
zL5rg>6bJCX%i=)~r8rUo1#bl*pFx-fKXOlnoiE@q5GY;*A#)g^y@>SU9=Z|j*w$#3
zIlSMcwJCWo@x_1&5JCtcgb?yn7>0EeMRi|W6h(CyhP`b+IsR{x;GFa3yOh#ux2@M}
zY&IJJ=(N4cT=9Pm{iBr95<=W<w{06j2+T3~IpYtmfVMb}0ibRlE2YMCHOedFkD36b
zlun{KUXoG@dO1vuKWYM|2A%4BK7addwOWnpYw&t$UxXf+>pC!3{J|GN0AP$wYM)B?
zFNDD9bn1MLjc;_Oo}Gm`cY${N;_C~4KR%i`f8O6~@9k}wU4SvxyZ#wtc(hHuijEP-
zah>Nmw%aZ8Jcs)H9Mzxk1RM^B&JF-v_u&10KPmxJ`V31c(f$Ok6=K@osB-NKG-v4(
zLI@#*5JCtcgb+dqc@g6~xwm(O_1)mxXZCYy$GVr#P)3i&!Z57MvV@e<D$5d_^Ckf)
zr8V~(B07im;5p}L=VY40;0e%!&$7${fGo=_Aw*{qmZS$Sgy`gCItfM<paW@TS)!_{
zCLxo)rqHpfszO<o4|9BG^!ouinBzD#V+@|>;dnew>246)wz1poP!t8yG&LUZEu#v!
z6$HWJrT^+2CQSeUaL(a*9suBSxlHZuDILS}JPdhZ;+erq;C8J6-<QCWilTs0s&@(W
z<$BNH3h;gZZn?Rx+guEnP*oLN*X?Z!f}r+&e{f%eD<Dad-hKZ6o?HXhmn7QH>*v52
uLz<@T*d31JAW0H>R8I&Ygb+f=WB&lGBT*W~5V6$&0000<MNUMnLSTXfXEBff

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/armor.rsi/inhand-left.png b/Resources/Textures/Clothing/armor.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..7653872d6f950d940f37082875ee1bc1b5cdd4c2
GIT binary patch
literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005iNkl<Zc%1Fp
zF>b;z6b9fwl_j>aU?o0+B|sd34mkv8Whh6;<|CNM6PZAYln&G=P}DZb3o6zB9pJ})
zj%_4AfQX2Qh=_=YXdr8C^Gw+<l3~``W<H-wMqXuSX)2zpB*UC@2>|g`8f)@^@D~7F
ziXbLVJ~IaUvXqPlAXI?3H}CDyA^SE?ez9DlC<^i70s>p0weQa>m8Q-6ZkGVS+j<=*
z-*g>(d*wq2$n(5c&QAsxAnyAtO)=9NN~z1lXIjG;gDeD~!{Dv8&1$uR)*9Y>D5VfW
zK$fO(&J7*%6_G<Q7Gbemo(F0S0HCgGgb<*$?wqN$MmQI4RHBFA?PQf2Uf-B;IvxjS
z-6K{2=Uh@0Meh~=&gpo>>vSrb8IAHkAnxC2yWMs=!DCLI=cuX*lgR|t;V{ZID1NN~
zU$4HtC%04%5fKp)5fKp)5z)Ufv}Zv4b@-9S>_>PSV|Jv_UnSX(Ao?^GpT+lOIod0Z
zbU%V<0s8g>bRpf3Aa)CEHk$?jy!Ya-!?&Ds$-XRMKKl?dV=g@jU4LKn8kFb<=t80&
zL2SfzT}ws%%I#CU_r6z-SOMba2z2iU=&N0XzP~Rv$oBQ~=y!bf5fD*dA3DD2A~V|t
QeE<Le07*qoM6N<$f&lmEjQ{`u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/armor.rsi/inhand-right.png b/Resources/Textures/Clothing/armor.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb7736307b38f373b05df76f73870f3f90806b15
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005QNkl<Zc%1Fp
zL5_kj7zN<x#5Kf413f|$#&`s0!67`Wi}467OgMs)UcgD3bQW61(V}Gr1>*a5R;B;{
ztgvVSA|fIpA|fK921+U0cMT!h*7+9t!7R&05ki_It?CR8V7uL-EX&E?%6hIgAp{37
zmge_Wg;dJm5E=vUec6o-`L9rx<)kPIywB%BAxwRPN-3Kr3DP97pPS7D06vyWcOjc)
z835QJt_r1;&GQ^uYot=T;l^680#HiX#bN;=1a`Y!-FPY`j4=R)eLqN(1X^nVfHCH{
z5{|FEA$V7SYaYOPijYzcx_KY1HG~k2@87%$PNzTl2qEfZhwkfe0Pws1CN~2x#=sa;
zH(wORD1QAYj_VNaxr*r2pw08V9vf5h`>MihHbWH00DvfpuwJhlYj14m^6@c-=AALu
zPDDgRL_|bHL_`BN<UPVr!MnpgV>vVMFfZNwOB(B$fm`nH9-j1lX28u40B-&+1O?Fd
znSsmsyA=EsxI8o9&J9Q@v9GF!@4ubTzgn$2`@6M%4EB9yAY{+K)%Dtb!7X_yWiQ+2
yZvL(W1<?1I0pI*x30?uN2+!D4_~s`f`mb+t$n|Z?5MOWr0000<MNUMnLSTYwkL0=l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/armor.rsi/meta.json b/Resources/Textures/Clothing/armor.rsi/meta.json
new file mode 100644
index 0000000000..8bae430434
--- /dev/null
+++ b/Resources/Textures/Clothing/armor.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "armor", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Clothing/backpack.rsi/backpack.png b/Resources/Textures/Clothing/backpack.rsi/backpack.png
new file mode 100644
index 0000000000000000000000000000000000000000..98ceb952dcd17fdb05378749a26a27c50245ebd5
GIT binary patch
literal 378
zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003&Nkl<Zc%1E4
zF^+{G5S`s@f{jOjj>ZGf7#gl^LSyF@=->!cRBVMo7h%Z%n=O`?Sjdbs&&T)>U|?Y2
zzvBa&D5Z?p+<o8Cb-%F9*L8(?o}0PedzhvvZrg?;(M*z3M#dOWN-^~S0Khp1)>@Pj
zC<RhcN@-OE?>#u@uqE*Xj4{ADKS|U`rhG!k`v`E(FC;Kzt+lTcC{4aGrb_hwd}|Jx
z3NXfgG`}}Wv78)Z45h+nGXvn<_q;Ks^t=*MyyuH~Bp`%{A%x3XP5!625Ta^e#Vrs*
zM5PpHt<Sam?U!Y_<lpZTLI|Lg0sx4|aTI3(?E|^2-ur622aj8jzx^xFT30=xr~o0P
zIK|krpjD?y08{*3KoLmp_Zw%yqe~?h%#ElQN&1=_qK@NUBACW#0(T-9^!yPG4E#C1
Y0SwNRhtVML!2kdN07*qoM6N<$f}#bblmGw#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/backpack.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ade6b3a6868dea5db29d443bcb6868e8f43e5d0
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006-Nkl<Zc%1E;
zA<v^g5Qg9Ha;^x1CZPs{SX+m$sp+5Km(^h^T33OqU4cQ7tZWDZG$)#AIF5xb{rFlg
z^CSqCW#5@$*d@#Y48t%C!!QgpN)$!SE7!kMKMcc$j#u=5nTY3kKG-ME^VxzBMNyNc
zDS*54LI}`7K}gfoSpUnU^LD#!@;pbHrvKa*1VQ6@9?s{p(U_+CbzMUU0pIr@?OB#V
zN{Q8KWvu^n1`uuGXWGA$KIchW2!Xn;jmP|LdPA0F+IG+Lj14eFN(tZh5y$bPZNJ|`
zN;zq~MP&d02q6&1G1_wgoljwL835d$cpKmMwRVkRoB{tEiweN)c6;f1A4ac$ZV3cH
z?X!Le0l?*QF=`*fc+IA70b29ve7#=dbUMxU4bau^@>BW@!!QiPFbu;m48t%C!!V2H
zslTZ08a$CC$w&QxooeG~2dc#bKv5K^stRRU8i~wF+i}~rVObU&#{qCJq>kA)SQsJa
zsrE+Bw+9Wwuz6Pyy4n;B$8p-l+ClrY0cbmay<SmO6^_T_N2Pria&))bHAPWiv)Rxk
zZ4i2EgJBppuImB-;y8v<>aVo#>-P>^*X@1x%d&)0>amAF*ALJHAW4!hr4*!;5JJGV
zZP>QmYsBGjcw1KJw8>r}1f-NuN@?eU!RjzgewJmuZ0t`%Hjizb7%h(v?fiK63NU8F
zGrLx_0hm&2|5S#28C(XZ*4#gZEXziH7);@AEnc@d;?oF%;4$ORy?2pe7=~dOhG7=U
YAFnkdde(ki8~^|S07*qoM6N<$f<Im-B>(^b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/backpack.rsi/inhand-left.png b/Resources/Textures/Clothing/backpack.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..819785ed479024b75fb656c203e94a54e3ed0542
GIT binary patch
literal 465
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4UIU;uumf=j|=Syh8>OtPifQ
zk`6j2z*(92qyIspcFJ?Vn8v%|2`2<4A||ZbVEmNn<r9r97ux>ld#rdr+eu)*?D0aC
zKMaB}@bOlT*<I}`EDhf+yUcu>C6d_-tmb8(eb^jpaO}p+$bTL?D~z3QZ|g8DD~;V>
znavl-u262)a$&x;4Bxt{qe+FK>(^z6%kN)o%d}n3u7$yPwn^*fqtj2T26?T?`{xkL
z{OPWr=GVF3&M+`!+`e{q{rv#;17{`#HO-8btrl^0e04YXi|d9}tNvNEG+ci9WYu>g
z;|E1MeSW=Lf8WHndDW^r%$5A5Y;V5*4t##>m(Bc*aqH7}S1>Ht7tENjH7a)PkK>Oo
zUOl#9-u7u7aInYf{kPvbKO53Nr3t>c{Wvu;Y5Q&4r~j+n#2T#_(w^PpmFu4Bx`6jU
z*>2f;j8&78U&M(edfnb)+Ax(}0xZLz&2O;O*8lbvcZC**lgu_v6J2LKHMLOXKd|b5
z#_cVV6Ws4lX0Kq;?skY?`PuHD@%IlmBUyg-?_*fwcgW-I8TBu~sABMR^>bP0l+XkK
D0C?6N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/backpack.rsi/inhand-right.png b/Resources/Textures/Clothing/backpack.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..223b7060c8aeeca7a0474664b22b1b0fd909ec21
GIT binary patch
literal 455
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004wNkl<Zc%1Fp
zJC1`e5C-7c)pn6M15)IMVj6m1f}T5Z5MP0UBT&#-k$eEET!3ws$Vg!0<zbNiuOfta
zhKaEYh6n%v000000002ylw~=@&S9;PT))>0B&8gTF&oo5my~i<5q{PT#LVNzp=p}0
zEr}g%yz#%Bz4<x|V2mMVCLx4<`qD*6)0FZ&Cn6&AdXbdUneXBwF#hxQ%?lxjnO9G*
zn3PhKKA)649?pE7Ye3t!pTU$;lXG|Qe!sofI19kcq?96No*dsrk|f@1yo+E_6rW=u
z1Zl0eWp$!WGobJL#UHu8y8^8>6-7bg*6qsIIRomtUUlw@wARGT-h92=S(as!6}0QR
z%Wi=qJLfy(3jhEB00000003|gcj_5f;(RqW=gvI?bG)y{=EUk5D9ds%#?YSef(sC{
zXJCxoG|g^f20a2Xdj{;-RaNa4D|iiv*)w3r-b-)+V)hIi5$|7%V9cHYJN6!eW<boI
xfuqI`o&hm?29AgmQ~>K;`{_LcOR)jA`2{k^$!%L6p#J~>002ovPDHLkV1k<I$Z7xp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/backpack.rsi/meta.json b/Resources/Textures/Clothing/backpack.rsi/meta.json
new file mode 100644
index 0000000000..b580b338ca
--- /dev/null
+++ b/Resources/Textures/Clothing/backpack.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "backpack", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-BACKPACK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Clothing/belt_utility.rsi/equipped-BELT.png b/Resources/Textures/Clothing/belt_utility.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8cad1678990049e1537495bb96a324e60f7fad5
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#`WcLn`LHy=BPPWFT_vV|!t7
zN%0$pI}aJ+4sfnlC=Xiy;2G<lhTVw?S2{h}wmnY>n38nKO~~~BeWsV*zig$fwkiQl
z0fGb9XSFZNRJj#eAO6~?BsXEY=LEM!ubWxcKYZSOLa$oxy|a+?@Aj;BHq$RN-8pPJ
zUBzry?6XZbB;FUqyGBMHKd$_J=N$0`8rqWma=usm=NH8Peth!R^j5j(11D|vu-^C<
zCDnPY6k-+FI{nRa|EX=fsA9HC`{KE7Zuu)`Ha*=rFMvNrdWNt1ts4DPt4hNc_@7;~
iXie1LFCd>X{5vB0sxyYwioGxu#PxLbb6Mw<&;$U}rF*ad

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/belt_utility.rsi/meta.json b/Resources/Textures/Clothing/belt_utility.rsi/meta.json
new file mode 100644
index 0000000000..c6d2b08e03
--- /dev/null
+++ b/Resources/Textures/Clothing/belt_utility.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-BELT", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "utilitybelt", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/belt_utility.rsi/utilitybelt.png b/Resources/Textures/Clothing/belt_utility.rsi/utilitybelt.png
new file mode 100644
index 0000000000000000000000000000000000000000..56a15f348318ee2f416343e13b29ce4c656c2e13
GIT binary patch
literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004&Nkl<Zc%1E(
zJxBs!7{`CwWrX&jqlcA5xkltHLG9Ak($wDQ-qzUI+R`TNF0~m(xYST+ABTY%oYftn
zY1eRFT_3)_Nlo1kju-BIKK}f9o;&dH@bLKW_<j<cPO6qn+-{*FUAJqXyJ<M6NEOx1
zmb4h*Wjd)^?xwowml6;TK7SA+64CL(Y3^?7E-d16j!1;i(?ldh-mJe_@3vNiJ3bK^
zC2!U{#tH?@jEw-0*X#na!{yA)S}M*?sR8sTpm=r1fuXRLiaW1_TX5Y}UQgIqjB!xb
zDV7bQfzCNy$GTFj(`W_RIx*cs*gn*_H~Ih=4z)SfVRd1G*=d8L(-4{51?%%F*^(iw
z-%-G;-4-YeDE>Dg*~=%E#`{^Bi!n6y2*AVHAeo$oRx{9Q0Cv*>#ZNRK-U6w`-rPUO
z5mGGQusj*F9oTamxCNm4;Qx}>ZEl2%y<4dGqJj6xw}sfJZnkLq8nk^4>FxLq=})FJ
z+1E|wTU*mf)pCXq=xTk>i2euZq-r_OuQ&Ga@bLI6UI3x%va4_|o;m;k002ovPDHLk
FV1i4G<U#-d

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_black.rsi/black.png b/Resources/Textures/Clothing/gloves_black.rsi/black.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bb3a3b4e538cd9ae01e50d03f892fefac56b9aa
GIT binary patch
literal 456
zcmV;(0XP1MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004xNkl<Zc%1E3
zOK!v<41H9+K@ttQ04xIczeqNj3*gb%XK)uSh$KvAT2*Qnc`Ia$-}46mPMkP#;*Vi|
zE0FhI^Lkm9m*c*Fmqb-zj9HO5=hRwT{8Ux1*Xv6nUKa3(#CxySTJ(LN?ZpKEo(Xv>
zz&WSJ7+fxwLQ+9n_P+0Hn{F%ik^twN0zi!MGm2`RT_H#*VHk#DH^v~h2>?O}MMz6T
zQ-E_$tAmAj8@yiE*zT(;rfF)<#!i59PGgL_;CbD$Jwo0W5dfdnFvhGZ@z%<mnIR&p
z%#Xm#P5b?R2Q#DVIuH>=1k*H?_O1kY?=^$~5kX1`UDrWG9tLM-5D}JTF+|i9GYmr^
z4j~|=1QA&!R0ODMA&)T@f_lR1;F)|YjEFGLbMXx!fQZ1%7{_sUuFSyKaOgOWU}oHI
zw=%(541m^ET-^?!yo8$lLkO7X8P?jJ?`j5eX^3b?e)PN=V|J~|t=U%X@D|j{kI1)V
ystO|7`Q~^>2|Uaye=ggDKmBx0oH%jf-{J$mdoLnPU_|Bs0000<MNUMnLSTZMnZ`;0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_black.rsi/equipped-HAND.png b/Resources/Textures/Clothing/gloves_black.rsi/equipped-HAND.png
new file mode 100644
index 0000000000000000000000000000000000000000..7483ab76a482320db12e7fcd8593e29aa0bb345e
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn`LHy|t0A$v~v_;bIGc
zQ*6q1r)$gRxw_q%vO&SmO2WB&3FFuQ%hbLU-CFnE3#bVQe(3LB*`H>1ug!61@vC2P
zrLq3+>aV0^t~&j7RqZ5}t7~S~fB0)q?&li0io@p1##QrPuY1qD`r7I5b`2_XZ=3xv
zTD~lB+A_y#=e4u)(-zO{-I%>?7C*#fAo;-j%)7h4tG=a~>CNQ)kh=eLv{Apn6}fuT
z?dkHDFIBem%Q?)tzPVrXm`&65Yroz{TZ6RjJ1E;)P-0U0WBz%NL7uLDF6*2UngEq!
Ba6SM4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_black.rsi/inhand-left.png b/Resources/Textures/Clothing/gloves_black.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f8953d6350a9eaafc02aae11628dea79f4f41c6
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Q#@T9Ln`LHy|t0|umKN?gXLVa
zhyN}Y2v7A(Wm)%`PvJ>kL;HtGT17lSwG0jVAy;<>ztffs3w=JvxbDXCqT?K50io&T
z^4V)co}7)!F8MxDPciI3=?=?utxwOY81L4q6fcfX=sEAJYCOLt5@ZGg!vVQ{bH$Fg
zFWx`phV+eX4Oi?AZDU>XO>mp;gHK27m>B+anqQu7cUvs?|9p^YPgg&ebxsLQ0Mmj`
A*#H0l

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_black.rsi/inhand-right.png b/Resources/Textures/Clothing/gloves_black.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..dec3a7db6d67a6c1eff1564080f53fa59d5f1212
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=b3I)gLn`LHy=BOE$biQoaJsJf
z$-n-OXQ$`{i?_4{tIS&T{aeU2|Lqn`K*bCXdhh+N`^qD_x!7)%eC}FZ`G;rbEM*WB
zOzt^xCig1G-tV@?+YOIh*;&-EI43Rd^5wq=3N6=eU0J-8A^lX`(;va>=P`qfVPN=o
za+Us3<5TMouYb46_`}JU41%xU^MurhCVZXS*marl-4<g8hCN?df^F<>bMIK|3DV-}
L>gTe~DWM4fmf=_r

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_black.rsi/meta.json b/Resources/Textures/Clothing/gloves_black.rsi/meta.json
new file mode 100644
index 0000000000..44c5631182
--- /dev/null
+++ b/Resources/Textures/Clothing/gloves_black.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "black", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Clothing/gloves_yellow.rsi/equipped-HAND.png b/Resources/Textures/Clothing/gloves_yellow.rsi/equipped-HAND.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1c10f1c1aff6dd58266a69f6db345521293d168
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_dQ)4Ln`LHy=BOC$U&g>VSA`S
zHQP<^o6nUjU3Uq56qpuwI7+Nv;g*${kYJ#Z+C+|j@wSJXQ+JyS0W||bLHJZ7>r>ZO
zXZXsV*?jrRK_IJaO6bxU>)>bScd?cI_Bm>lIWgYmXVepM(bG%r+7+MmpL_o&!=x>D
z&y-s1b}O|w4`jt|j+^`}eCeJ0>#tr({P6w%)EbE4AhQ0|#?AGi4t1NS)J!*jB6sk*
zrG2LLZ-M0bUjthu*zYQTsbY9}?dJTTSG(<I1$!;NuUzu#^38hT?;yQD?uh=I*82X6
R(~}z@uBWS?%Q~loCIGjuc$okI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/gloves_yellow.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..319a062f6d1d2e2ffe44480712c8d29ab219f40e
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=OFUg1Ln`LHy|t0|kbwYe0Q*Kp
z(c&3@Gc_i&E?AnxGHWq|dx?l8yK7Z`!}{HuPsf7{V_4F$(WOWA-`tO<*STl7^af@7
zMXY_l$L|uq!TuX2Pg&}Us{XbpT7Rg%@NkQby){2b3j;$!@TOhNvA-Bsd%oby`OUz2
zxA6<}9R2onQ>Uf9<I>SddSl#{`L6%5)@gIe*3K>R7pCoxogX=ofgyG;!=Gi=mxQ;l
QgFL|C>FVdQ&MBb@0Qh=SU;qFB

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/gloves_yellow.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..94513c5bc6976f8d7481a76b5bb3647dc600f11a
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>pfi@Ln`LHy=5)bY{27s(S4i4
zQL8C`mwR$bdqinXb66}QaOy@4+u}2}TirjenW!Df1k?lsV)st%ojU#8M%TP=(VHgC
zyrUZ;eCKTHv{JLX4eMrivCV8zeLlx}=_x&pmAjUopDw1W577oB8x)lOD^4i7_Sk;S
z&BO6mpRujE3#8U@{)qdx#`e$S$oAT-_80BPelN7#!ueb6LCX8<8kt!x4>cGV9`M&N
X<Q%uF+t=rj1TxOk)z4*}Q$iB}WXD}>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_yellow.rsi/meta.json b/Resources/Textures/Clothing/gloves_yellow.rsi/meta.json
new file mode 100644
index 0000000000..5008a3259f
--- /dev/null
+++ b/Resources/Textures/Clothing/gloves_yellow.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "yellow", "directions": 1, "delays": [[1.0]]}]}
diff --git a/Resources/Textures/Clothing/gloves_yellow.rsi/yellow.png b/Resources/Textures/Clothing/gloves_yellow.rsi/yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..23dcaf1bf5ea587b888efa436c4025af390ab194
GIT binary patch
literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003dNkl<Zc%1E(
zL5{;93`KuO5x41zoFF|+d!+O*;RJY<+pu94jVTyNNi~{w!IvT-V*H;8CO}tLSJ#Ji
z`m03CtUQk|H`ko^5J1gjnU$YL7vhXnhaj5Gy+wE!Cd_;Ne75&7a7`~MImt9SK<noV
zA{eXkc_DLO0n|TB6(AU2&viP6*o%okN)SWMyd~)oP1iFPtX@L={D(P+0HOzkI2Q>(
zFy9s&GT1SO)-YBTAp$^bZmfD7tUZt|?s9V{V^tYO81uL&Zl`5dNh`_r;&EI>9LMb^
zV`ckhJHVApqsvb>5zKu>Qt6Juu58tY>I=#aA%NVx<z^FGD<L?q%rnSE$rjbji2$S(
x8LI%B_Ik)?%Xa|Ka1qIc@BVbUy1Kf)R=@Iu5&&r$AKw4~002ovPDHLkV1l!)ktqNG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/headset.rsi/equipped-EARS.png b/Resources/Textures/Clothing/headset.rsi/equipped-EARS.png
new file mode 100644
index 0000000000000000000000000000000000000000..4265016980111fe639540a7d4f6ba7e63be61d0a
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ii4<#Ar*7p-ZJEBFc4rl@Zi6<
z{G?OY?p@m+k*ylxDbx{{u*~jIQFvM~Q-jjyU32QwD=tsUUnOa`ZSS|g{-tN97xUHr
zjlMqT;&cI9d7ybfV6fmtY-3R9--hKtdR>jPx;I!j!A1Q131wZ+ql>&id{0+Dmvv4F
FO#mdXJH!A0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/headset.rsi/headset.png b/Resources/Textures/Clothing/headset.rsi/headset.png
new file mode 100644
index 0000000000000000000000000000000000000000..059f303dc2dc4449260fdd35bf3bbc7fe7581d03
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002-Nkl<Zc%1E&
zv2DXJ5JkU}PJrCrEkGd%U_iAOAnXM+hH6cq1w4yAz%_BlI$l6(Er9L0iVzn<EK4E~
zn6DxM9{wxt6Np42ug+@BV`kQMn&R4ZXqsl!>|_CE)}kl?0C}FHs;XHe-o}QD2%K}M
z>l)0gK?Hsf5gfkG5Rs|5&k1<%v0c5xdk^Pac!4GOUjo)zd~7~ptpxzA(=@CA03=D$
zpRZjvS>WLwXU6Dmzwhs-;}PGN%iTN?^|fr<c9xIo4rbP}EOn^=M5MnZW+yX7iAXbJ
w1_c%i|0^U&_)yrC@TV7L@r8>-B9Tzs0L_w3Jc)gTVgLXD07*qoM6N<$f*rbihyVZp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/headset.rsi/meta.json b/Resources/Textures/Clothing/headset.rsi/meta.json
new file mode 100644
index 0000000000..574c1660a1
--- /dev/null
+++ b/Resources/Textures/Clothing/headset.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-EARS", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "headset", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/helmet_sec.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eab46dab359571752f835bcb5944c39d5c6e77c
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006@Nkl<Zc%1E;
zF>2#L6o!8<If15A5yT{*Dx?rH<N&UdCO*X;XCZ0!1Y2$G0~kiA5UvD?Fe%*0SC|ye
z6S5_f%-D)p_WvqN#`C{<dQSuXAMl?u@%d4j&g|j6EL(W3HMahRkNCrU-dr0~004Bo
zwN;f5o`hriDPVn)@Z%J50GLj10RT729kfn5Pv)G6{^j)*F0Zfl^us9j(s!zWFp2@7
z5pQEm0i^;|m1_uoyuG}hWt}f4K(hP$=^07|o$u><3#9^Roea_nS||2lK5t51kn7F5
z#7%Ms08aW&6(Ayi|NQC*+&})bn|0~3oHNE0m`-o^k|3I46vIc~`6bx5dAZ;Bc0LzM
z1z6=v0K2}IHhg<|g)s#->$0grmp1%z0;(#XDE0XUhdK$eY%xjGnUy5SrUlu&>q+1o
z?6Dpns`n2`)0wU7ZRftv=Dj#})C_$D5<&<egb+dqA%qY@2qCBA{XhDcGXkT|2S@;6
z6n88tczX1%+G3H5t}%u8e1LNTv`(zp<Prd|v&=tc2L?+*d-I3(co@ZALmEy45`uVg
zZI@O83ZuBUL{CMkuC3LM!Pl8~ssODMt5g6fe+fXu#k1?1A2<iAe2G=QY}Vh40{~D0
zaPug=-T|9+`60Obd|2{BOo_BLWc?Jd?KpgJN`O*9^OWm)`F)P;5wdJCNr64Lc(D0^
zMzGb3;?<8yU2kPHrneeD!|UmZ6)wFvRu#z0Rx02-<`X(-o!BvE1IE%Ngb+dqA%qY@
e2qA=!f0}n=vp6{%TJr}00000<MNUMnLSTY{79rLE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/helmet.png b/Resources/Textures/Clothing/helmet_sec.rsi/helmet.png
new file mode 100644
index 0000000000000000000000000000000000000000..9756e2cc2870a7ccfbdc144c9d6733d30f975f45
GIT binary patch
literal 378
zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003&Nkl<Zc%1E(
zJ!``-5Qg8DZe9$+I7>@9xF3Ue4aPqqQ@rIL_FohY*)zDUDGlwCPz+r>tAnZ_f3&&_
zWU3x82A!lky}COAfk5EDb9U@PDJwl3TdyD3`&}ICcs9>a6!(X5rE27DsR3ZqJdy)p
zMJ#2dhmKv8s<GQP=-NFw2(kiFR(iQw{AyRK24IwVZTHk|aZYtUn`d6<mPn+?vvQOp
zQ+O4yC%?S89@#!#-g?e=+lJzk7XV;RSa{}G=gZZ?1Z5P{zFhDo3ROzLNN=x-nvCQs
zuz|FnUn84H;>k6XN?`SYNTi5Fiub4I-nb3w>h89u00=3;>H~RJ>PV#Me#*>MLnJX=
z8?_IR%FtprwSSSshtHkE>4fZ7JPgJ~it+n!5~eC+>T#mLx`Myx8145YaQa0c5D2(@
Y1D4!=%s)h=Y5)KL07*qoM6N<$f|;PHJpcdz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/helmet_sec.rsi/meta.json b/Resources/Textures/Clothing/helmet_sec.rsi/meta.json
new file mode 100644
index 0000000000..7a185f0ae9
--- /dev/null
+++ b/Resources/Textures/Clothing/helmet_sec.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-HELMET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "helmet", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/mask_breath.rsi/breath.png b/Resources/Textures/Clothing/mask_breath.rsi/breath.png
new file mode 100644
index 0000000000000000000000000000000000000000..2894ff3def50cce7024a34fbca61832db9888130
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002`Nkl<Zc%1E%
zO>ToQ6ofxlT~<mr_8pim-7__3;!bAkLzqoC!RvycDiH|;RP{&xc3|GjXn2N7rBeA}
z+~&z-cJch~HfcR?HBXV@!atd93GwvE$C7N$93Vvol9?oHn#Shl=UCOin`8!f?}_p2
z{SgiTEn}b<;l+ELb2#TL=e*d+VgO0zLja(ZLhgV#ntz;)k8o&V=sHl}0}#fU#SnK7
zC0Pi8QVIY$XE!Zhd-WTR-Pp#o2a?QtPv7_43$YmBrpSt0AZcF%lgQM<wOBGcoxNX|
zbao->=2j=O(-dS2tFGaiZT{8(zm~oA!(VTpQmIt_1)spPbDA2Ai2DEl002ovPDHLk
FV1h0lii7|F

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/mask_breath.rsi/equipped-MASK.png b/Resources/Textures/Clothing/mask_breath.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd76b158d63de339f1fba20ab4a5b0e94e9d9868
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV083!aSW-L^Y)f~cC&-T@sG!Y
z3Ql-)T-um_Ffd5y<h}5Vx+UBxrKPV|zsU01!rQm6wddfDG=Y|TC38hMHADUcNAH{O
z`Tj}W^SL|jC^In}=+}u2-~LiQ`Csnj_NhUeN@D+RyDh1tbbQf;^2wcnZQ4s`Ju_c4
zMd<wJ5)oJa>9wDK{&{T6Q+-xkaN^9z8TOuE6n(#L)BuuO=c`mbv)KEt&UU|Nwf;Qw
z*;#^rR3!B(a!$EwynlVY-gR;P0afkuuFEdJI{IGs^oz78pqC)vz=|)i{02v4q~<@}
z+m<N$<56YOtYtB)#b2D>I;&;**IlpbV|3bV=l@w3x8U`heOW?zxA->nCqEWp*>u+E
zr_KD-*{Pd0y**c+n0njI79`sLxNxo;f1u9AQn%Oo3(lSTtk?c~D-YDN|JTK@e%TY~
SV3h6y67h8Pb6Mw<&;$VcbE`f8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/mask_breath.rsi/meta.json b/Resources/Textures/Clothing/mask_breath.rsi/meta.json
new file mode 100644
index 0000000000..ecf72073c9
--- /dev/null
+++ b/Resources/Textures/Clothing/mask_breath.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "breath", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-MASK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/meson_scanners.rsi/equipped-EYES.png b/Resources/Textures/Clothing/meson_scanners.rsi/equipped-EYES.png
new file mode 100644
index 0000000000000000000000000000000000000000..83fa02bc45628a5495e08493abaf7f3766d09fd2
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pd!~6Ln`LHy|rGL(NW^q$KyR}
zG2tACN*9&<W89?^W3afRX~hgdy%W2Bv&Zauv5A-I=!&KqrnEm2&%_*m)ZKb#{rlXz
zYu_g_Fx>pPZ~m<}|99_s%b485mRbF8hrIcj{Jbx2>u>vRpWVxM{BiJEO_30->8A61
zip*@++B;18cG7E-$y(L5=QdUS<as_hEG$Q!9q1$|I56|;j-Q4ci9La}fjsM9C+1!I
zb#QOouCr=KdSfq_-rZd#z!H}KtLomn%D5;=S*MqC#D8py7rX9rXxDp_#TrV+Fmo7;
ZEEzfWTO5ul%`O6odAj<!taD0e0sv_ecc}mX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/meson_scanners.rsi/meson.png b/Resources/Textures/Clothing/meson_scanners.rsi/meson.png
new file mode 100644
index 0000000000000000000000000000000000000000..fffba8d28659cfb98a083602d52a1e8b46c9c4ed
GIT binary patch
literal 329
zcmV-P0k-~$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003HNkl<Zc%1E$
ztxm*16h;q(WF1q)Bu&;3I@t%<%^EPXkFbJ=AOyb{1Uvu+S&KsS5n6*HV6c4v`XhEA
zIFe%6hE3BS6y_c~-`sOE^MN1;f*|}eJ3~U3t5sE$CC<4)LzPm5VK``ZZ^&9(4YK~A
zwf@r*odIiY6-5zwo^v-jZ=7GR9{{-WP62pbd;#$B`Cez9pI$m0yL}r1+)r*=<+t7i
z2lxQ^an{Jq=F`p>-0PE{dB<qR>{9~pxbOg2vc!)wG~+rOFyak3It;eHU^bstZ7(sX
z11IsimTRq1O5vQNC<^>IBVg1x-^i`CRgxsFo<U9B6ww&dDAw<i8e>S)bn9-HTo437
b5CFabovl;@asrY500000NkvXXu0mjf5O#*f

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/meson_scanners.rsi/meta.json b/Resources/Textures/Clothing/meson_scanners.rsi/meta.json
new file mode 100644
index 0000000000..315034e91c
--- /dev/null
+++ b/Resources/Textures/Clothing/meson_scanners.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-EYES", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "meson", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/shoes_black.rsi/black.png b/Resources/Textures/Clothing/shoes_black.rsi/black.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fde5f293556bf683a412fa2f4d0a44630e3e3b1
GIT binary patch
literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003CNkl<Zc%1E%
zF>ZrE6ht2(vJfQ=f{q4Xz#RuLf)ZqjGx$8*0#}@d0!)Q)MMVJ;S{G3)IXHw+q{+T=
zcD`nI^%o=(iA3_>QML@(wk^JDnx?(<R#ml_@#_M%Z41k?5JI3RALD)BGYkWUVc<B<
z!+X76>AG&Q#QU1iBuRv#D2(Gs+qN`K!{KmXnx>hzC<=DF-RcYdSRhFfaXcQ0;~0Q6
zO{wdeuImVb;GusKh9PBHVw&cv0&h!)r_<>v9N>ID(=-jf@6W;kJkP^4O>Vc_ssf8I
zpsFeWS(ZKNx~{*}0bJL`bzK1RJZHb(Q&rWs8H-C8MbT{Aw{W>!HvKk<L?V$${)9WK
W%2Udsgr*w+0000<MNUMnLSTY4zKTBp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/shoes_black.rsi/equipped-FEET.png b/Resources/Textures/Clothing/shoes_black.rsi/equipped-FEET.png
new file mode 100644
index 0000000000000000000000000000000000000000..07a3b0a47d0199d5ae5906f471c1baa1d7ab0360
GIT binary patch
literal 374
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^pgaSW-L^Y+&MtV01ZM?X$J
z>gO2$K=0Vu?V3ScqFwv~TfFD4S}{4cYr;WauD(m(InJ%q(>v(-GGuzZI`<>_MH18N
z><gyfDLDUB?Y6BD&|E0^!yI=@e7~CT<R#Ced|RCyCvAz)v3Wkn^HSE<OV2Y@Ja?@R
z30hyB_b+?%%K2y0^#AKkzg)e4zVAPSt}|zHW~!L=CV#HIzwO{TOCYtZFz2+2q4DNK
zkw~$hOBD>B-?@L|S-!g_$GLO<r9o@MUO#BMn|IyXbb6U^=I8y_U(bCm-`w~;X#M*q
zzkmL@`k4{tCI*K|U%vb(xO)3RbXr_VbJYrAgV|@lT+6%v#BJO4mk~Q-rfs<&zQgt3
zML!2+9^?PQQi&PMe{ntE_2NihDbushJC8jsTo%7DYHifU2pfxXPxS}lkv?mc(<|=q
Pf^6_~^>bP0l+XkK&T^~X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/shoes_black.rsi/meta.json b/Resources/Textures/Clothing/shoes_black.rsi/meta.json
new file mode 100644
index 0000000000..78af7791af
--- /dev/null
+++ b/Resources/Textures/Clothing/shoes_black.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "black", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Clothing/shoes_white.rsi/equipped-FEET.png b/Resources/Textures/Clothing/shoes_white.rsi/equipped-FEET.png
new file mode 100644
index 0000000000000000000000000000000000000000..7933bd55a4efd46d7424709e9d98ea7dc00a05a2
GIT binary patch
literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fV)aSW-L^Y)fw)}a6awg>lv
z3Njsa@|xH;+<Opv$jxhEI!8sL&=PeGwvPe_QyrOt3}!!AmSO84a7vkDrS!q8B}+|?
zZu898_3?k$%<0F^*i5=B-OzyyUa(BLlqa)u-JAJSgBTi4SM3$a)Ma?^`(NVw(&dw_
z@~{08pUSl^O7~5fwM4I5rf6G`-t>>VA|BLk)?D`QLZOR`%B83@M+N2UQ~w@RUYq)4
zmk~Ep=N2)+i3=Z}$hZ7_Wq!pxmniQgTh|;4U`P;cYv0=WJat|DytK>FA_up<J#y=G
z4Ie`RTeC|{OYPscW!=j^T6}!B@xK3&^OrLdYXt<6z{SqpyZ8RQeEY%wH8Wq!{k`FH
zplIijy}AE?#vCx@-#gD__F3mYm2ryM>o)K4{jrb#u)%^UPPa`0SBG5$TK>OfU8?8W
zDA(I23#T+CN_6s13|;lJVg0_@oDs(h-??3iI{vZ$Ggo9Sga6U(rIUU<k_5&8gQu&X
J%Q~loCIHnr#}EJj

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/shoes_white.rsi/meta.json b/Resources/Textures/Clothing/shoes_white.rsi/meta.json
new file mode 100644
index 0000000000..4edc53f5af
--- /dev/null
+++ b/Resources/Textures/Clothing/shoes_white.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "white", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/shoes_white.rsi/white.png b/Resources/Textures/Clothing/shoes_white.rsi/white.png
new file mode 100644
index 0000000000000000000000000000000000000000..0be1296f03136401187c4e03461bf42963dbf821
GIT binary patch
literal 259
zcmV+e0sQ`nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002WNkl<Zc%1E%
zyAFde3`K8IrSMg3C{m<Mu=v~9naC6=60q@8jP6oUc_`2fUFx&>=5cMu0R%x1gn#Fe
za;T~*-fMZDgZUt%ZQH2FGsWCmyV0g;!aUE=TBEM(RqwhE063P!tqu?oXIZw<%Cf{b
zj)%QUDHKJq#=|f~yKvb7BI2fL*7#i&`o2F@ysU>1V2ruC`Z@t3Vy*SYIA*?JjDhza
z`=|OkfrU@=J30VZYvH|zQYw0PbOz3*Jq71n(r*(4K@fzW@B#{6MxL3RuDAdI002ov
JPDHLkV1j@?aq<8F

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/sunglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/sunglasses.rsi/equipped-EYES.png
new file mode 100644
index 0000000000000000000000000000000000000000..f72e29ec428d2a53667ebf7ebf9bb92ec1c9e89b
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=O`a}}Ar*7p-rC4}$bpA7z_`tQ
zhv}t5tFAlFHr>Q%ek?FhU@nV>7t5vUsi`ObasT09_z{s7XT14()bA=gjsO47*6G_C
z|4smz2m}rCCAW(9ykeQ-t!a4v^RoHxeJ)>_p4!>5!?t|w*3<K5IyXBVnkd^iea+(2
ef?y2?>Z=$;uPc47-_E2A67Y2Ob6Mw<&;$UX)kZe}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/sunglasses.rsi/meta.json
new file mode 100644
index 0000000000..a9eea33125
--- /dev/null
+++ b/Resources/Textures/Clothing/sunglasses.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-EYES", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sunglasses", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/sunglasses.rsi/sun.png b/Resources/Textures/Clothing/sunglasses.rsi/sun.png
new file mode 100644
index 0000000000000000000000000000000000000000..a11166c046b7fb9408f6e8f3778b7ac4042ffd24
GIT binary patch
literal 226
zcmV<803H8{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001~Nkl<Zc%1E$
zF%E<v5JkVqc6R?%T-6&;dIt)tsVM9SjWt_oM$y1#OXqduPi7u4fMFPhVZ5E8RY0=n
zb4qD=%C7m}0wl{k&zPnOB7${Y5kf#pY0w#fD(@Bev<md_obw^JXL`66zxH{OY6^%5
zmSw4$ku2A2+qNTj&K2+d>AUVEx^{ph#&JZ9vDyKWTI`hfNOb+x{-k#|(9iwr0vd*4
c7zO}*0kn#Eg1I-}I{*Lx07*qoM6N<$g8J}Zy8r+H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/sunglasses.rsi/sunglasses.png b/Resources/Textures/Clothing/sunglasses.rsi/sunglasses.png
new file mode 100644
index 0000000000000000000000000000000000000000..a11166c046b7fb9408f6e8f3778b7ac4042ffd24
GIT binary patch
literal 226
zcmV<803H8{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001~Nkl<Zc%1E$
zF%E<v5JkVqc6R?%T-6&;dIt)tsVM9SjWt_oM$y1#OXqduPi7u4fMFPhVZ5E8RY0=n
zb4qD=%C7m}0wl{k&zPnOB7${Y5kf#pY0w#fD(@Bev<md_obw^JXL`66zxH{OY6^%5
zmSw4$ku2A2+qNTj&K2+d>AUVEx^{ph#&JZ9vDyKWTI`hfNOb+x{-k#|(9iwr0vd*4
c7zO}*0kn#Eg1I-}I{*Lx07*qoM6N<$g8J}Zy8r+H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_assistant.rsi/assistant.png b/Resources/Textures/Clothing/uniform_assistant.rsi/assistant.png
new file mode 100644
index 0000000000000000000000000000000000000000..862996b3692a0e467b2832a9c2161195ccd6b9ed
GIT binary patch
literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004TNkl<Zc%1E%
zJxfAS7{`BxL=8?}!gDr35TOi=7C%9o)Y50@14Mgk&|Z^`j&6++)e<_GC_*5Lcr~s<
z3QiYp!}Z>-32_cMp5JnKUU**q=NvE?3<eD{*_@Zj<~-flf5df~i<AgV@3Yg6sl+xm
z0Kk4eA2mIZ64)afkrH9d9@#o2)dq-eIB^_=lwmWG5(p`oI1Wk6VwtC`!j|f!LQ0yA
z#)=(10h*1*ioMYRz~4A&StKoM#UJ=|<p;$pSjy=Ep$dOD52)8`=sZGY1%jeN$~Bpz
zKAq;E`3nH-;c(5@YWH-@geWU;c^LP=-_{=42q`HPj%c-e+}>Psc3NU**9!AgQC6To
zb7A{efv6HMZ#ABt-}#;`=zFeCf4wWXJD!r>i_!g>GIj=3J993w39cR%0F;XZ?q9X~
z>kaVuG2!H3-Cr&a!niKV15~=i&eN_pcKmItojIj!!atWe{h3Rpi`FkN7z_r(4~*B8
U868-I_5c6?07*qoM6N<$f`?AHX8-^I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_assistant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/uniform_assistant.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d3972342b44ba9225eada542f44b4cfb1b20470
GIT binary patch
literal 1209
zcmV;q1V;ObP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000DlNkl<Zc%1E;
z&ube;6vw|VD#Sjh6fKfwAp(Jjka1)pUqXs8_>^05FZ~btADGf>FQFLv2l$j@b1J#z
z($Zfpfntj|!A2$^>I98sb_tdtDnzh7C~rHvT1opxyGlyt147d5?tI_8nR&bHdw{`U
zFc=I5gW<zuiF0zLTJr$ldFyoSx@pIfqEfASq9`D2d+eC(bRfHut)Gc|;^x-2w^py?
z+3_&|c&ZQ?wpOo06ovQuuRka51k!gM2RX}%JV!@AmIEr)nlG++-xEav*_EJKaUBP1
z^*Ur%dP%MXRUg2Z6V!ID{!9nZ?2-ro-wEpARbxa^0HIZ)OO!t8M8VbnXx0hp0A;6x
zoMj<rS$><aZNE)+I)2+*BjzToKMfuIsSeoO+V)g&*_Ch|hvI<Gv*Tm9jsw}10V6iI
zw!K(ZF!U!mA$&Zp{>&8+7L=XNSQHkv9eG|7==Kx$x|uORb|qw2#urx3PhuNH>4zsl
z9V}O${T!fnN<r||<r@INKLckW&jFLrc@CJl1;Pm19u3^K(P(Vo)#V#}zxOS^*!djS
zmZR^_Nuui0hyLpj`$34H<)$vXKmI(#FTeeT%l>OEBj(kQ`X86r%jL^5ysthhpq$U4
zec__#{5ROI&u#z!?%#Qd{evDJw0T=Au6`+-!7Z_jrX1kBKlG1<+d2BIEf603!`2l5
z;JX`VxPRv*%K03pJ2rQ3=KSw_JF5VIdpoOvb}q3UP|9Y|zHk8m1#1OOIRF4O<p2e1
z1pv^#a8b&#cU5ftay}Q(Qojq<3d;E$Tc5Q8Xy$v)Yn=CoC}lG^?+*j*Y4Z5w1pwgD
zQy2ROJ(RK;>>u>-=&2hx&Vl6s^1klzd7=JqiRC~${nycF-v-rL-g`1!ifT`jr1fJv
zVDHIrN!^2CXb-AJB}rQPtcdZ=k0<``QLq`sfrqUtpmhbH$LWsEyVf@t3<iV2U@#aA
zh7X%cwdPSh!27^F_OM^zRjM_w(b%BZ(5V+i%(4XtBv9EIX_f<M@M?xwb%ZDiq){B9
zvbnYGsi`l@P6I%ru>mlhz+M3)<~oj_qa#Ofa)`QwYZ53SLX*OU?Ep%RQ%Y*BUJn?z
z2-I0WIy!`~?Xi@7T-Yx~$p9j%USJVWO+u7S9JCw|NJmH13oL?gO@eN2khKM<C<<8I
za*xB&(V_oa6a}8QPGeuojsf8aD~iHPsv0CNC#Qb{06zWX<4AireX+JcWP#$_+`Q~c
zx(%huwPnk%N1(!tSvF3C<p6c5sZ7e*r^U2-gh@6|g8k64yPokV`?9;9@zgwBQw~zg
z45|7*T&)8brR7yk)wZ~38N0il@qkf2o@xftDvXFCT&zLaVIAjd-3HJ5Lx1o9{8aU#
zptLwJD%!YvGZ&~B;h=5xqG|%B@%ZEg3f9V8HfXH?b+*&437Ceet-AuX96-Fw*-y%b
zxg2nN^|~Ji(vJQrq*c!6aC`OoTzzTBfTkRvDbE04VbNdZK^se@pU&Q!w^9bf|CE0L
X6WWY=4(L7500000NkvXXu0mjf@?b|?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_assistant.rsi/meta.json b/Resources/Textures/Clothing/uniform_assistant.rsi/meta.json
new file mode 100644
index 0000000000..3407454e75
--- /dev/null
+++ b/Resources/Textures/Clothing/uniform_assistant.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "assistant", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/engine.png b/Resources/Textures/Clothing/uniform_engineering.rsi/engine.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d76f810b521366e43e2e2d1e6f75c8c09097614
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nNkl<Zc%1E%
z!Ae3w6ox;;Wwq0d6iOHArnqqBrbT%-_5kVwxD9#$mpwqxwin0;Xmzb^v?y?qCQ3p`
zaA(;fFlkyGuOddx><aD&ml@_9&iUuee<30wBH}-h&lPk&SJ1YxpNN|#9v*nQT;4}1
zMKYPxCC8t~ZU-KP!Y+wKf_6KpuW$UAY27u`#2^SzO3~@`C^<fZv78UaP;z`aogPXl
zf*>$034oE(>Ji#W$xY9W<>vhnw0x*~kWEY8$+<Td*Sa#RZ9IW`MQ$3BO@otKGzW>-
zE2b4K1%QmZKl(n_A2ELx8;ndi8|R9{i|%Uf>4o|DjRk}vY8mw8bA$E0EdVBuFH8H_
z(;Ju1=FP$K2>>2m->uGn!&q%CgVwGX4`lrJ-Ng#xfmj!-DHuNiNb{n*?EGw6zR;Y*
zu1!S?0o$8#itZE;qlJQ6vp=)yiMWruI50I9VC{iy8k!AhJ{Zf|Y%EX31}n$bGUy#o
o_F?mI1sM8v?;jBn5%DMZ0@9j;WN6~jP5=M^07*qoM6N<$f}~KzA^-pY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/uniform_engineering.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..b60ce95734803049e923c9eb4a3792497ab242c0
GIT binary patch
literal 1469
zcmV;u1w#6XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000GqNkl<Zc%1E;
zL1-IC6o!ALAyBY-vSd?PjZ9_LD~mmd7DA{^ZSA2E#7zm2O?zud4~0OEbxu8mw%|*_
zH#hXwqACQF9O7b>HWX9brWh>NQf)TaMG@GtZW{;~<LO~M+F41pc6KGFH1k~~?aa>q
zc4p_z)64@T5{X12kw_#jCq9wNi4m0qgF*cKOTOv8iE)iot5xXh1)(<G==b&aHkIw}
z)Zj+{w9|?c;~Gh&MzOcIhu&B7B=^ATyi6M8^`T(|0;72NFi2W;kXLy9eE!#_a!ng^
zrSGT%5+iC|e79Od?YV|bns!1a4N`lq;gxC)0FX+JqFSwzPQD3^`d?fvG}XELIPOZn
zZKX^aB%=X$A5UX<r-pB?=K%nl+dwW4WHcZap>=P}Y3S?k#pQRh$mIe4Epf|-??uVS
zlSY$%D|r3y??<ul$Y`tI_6>-J=mX9~vdAu4*JBa;!vny%XdcrStou5FGGy5Fvx}%}
z@MIV5`pS@jg-7k%KXqK;&1)b@#S$<obmUvHxlPMiCnXhne|r<0>9h9P??#e}-9D%K
z$94c<A7K&P-q(uFZD6%Tzps{>2ccd0akQNRtTCek_)5V3p&vc*FaTh`ShjulZJ011
zW<WdGgE9TYp&v<q7<g*cNdnj}m+|CCUj!j1H8lwG!CQU+z`1xBE5&mC69DdQnD}wa
zyW?}J&+ww}I1T^+q5yixL{b5sMT*c(An|SyX9nm<ky8M+L|PPs=>x!-fnxo-ZXT7p
z&=-yb0U#I*0s#8@d$GGi*Z*p@N{#7qB*^RYxYc)Dd1?^k%5}@R@$;O&c4rP<nFdpX
zAa82ayRVk0Phdnt*7YZOG5xly08it?GY7?fchd8>g01n>7ibI;4be~jx+so2;EmT#
z*Vp)1#2SUwlJ(%(MOv>LFny*Ki%@<3w;O$-+KoX;G-L%Iu?Q{y{SP61A(Dy}f&=wX
zn*j7paHH>P3b-xzN-Sc9;5;lOccU-V0f0T~`tn=qY(%54{}PTnV0P`m*Rve2zv?_m
zh4y~WavZa32VGePXV(sV`n=yZ01P$&`n+FQU&sf{EEGZhqTkuSy=cgqlfF{1^^G0k
z-iAqood$iQauh0Wm|fMENF)-8L?V$$B$Ah##E42J#x+mJUY%rOTqA79SQOz6k%@7Q
zXxbQ3sZk_GRFX*_ZAqoQodb%%YqFzrO&f!oK@sYJ#E42%br^v_0Q!0f!C(*>jT*vo
z1w;)Hh1bex^o&4XFCh>JKvjn!`X)Hu5Xq!LqM-s-3PJSs*D!M>Ti*<ghFH1i<A}p+
z#Uj9G7xRckfUoY*{DH~y1;o#SIL%EE-W5(NRFG{=#UgY+p5LwQCPu}cm%z5i*nqG)
zP7#^{{22h-muGZ)N0^7#YCIcg+%Ig0uoGn5x=lyoMeYV~Zc`g>-FDxG@D$+FWcHWn
zQ8mjExO7-X4&B|DymaVC&$5-1001~;+A>o_rhwxPV5cy=bIHNP5AXX4%M&<BSWdu4
zKbbaX$5sia?RY-O)5G?Bfo`LRO<PWaSA;sC__qqco}+jFHx(;}l`jBfy<2q*ThFF(
zV~)>Bu-nth#^Vs`fcV)0CeMSgBeBmDAa8$Cuq}(-X0RuV%NJ4C{PR1IuXSqA&1)b=
zr2u{1d3(agSbV^fDEpE4)U3w<ok)yyY6FV}^m#w@Fr9lwMcfAAWia;uK9;XncuKu*
zF5kJtNGGu4xa=aefq8y61K>Ii004Es|F4OQCqYu7Hh95x2dtK8s@h3LfQ`f=)CMoU
z$I~0|f53GIBo$zOsrbS};rXSar)lWQYt!Y1rmm7B@snBs7;Nu>*$@p`87mTr#4-N>
X6JC98inkNp00000NkvXXu0mjfy}-n(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/uniform_engineering.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf69e2e3cb4b7f38589c87219429053a551829b5
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005RNkl<Zc%1Fo
zze>YU6vy$eso>-wXhCN;6|#tQkqU|rQ2Gi57X@F#Nrwu)Lhu2^!Qx<1mw>tnf`daV
z3W{TU9n$*W)}{yb!tb+$oWL)ab8kBIfQX2Qh=_=Yh=`=IxqyqJ$bD5$oA<F6MUhLJ
z_np8Zq`Z!sEkeCo{Pb+Lm^@FD_ffrCOqJJ(Ndo|K4-ihiU))g{mwQN`cT|4ODzD?h
z$)s*+px=Pa1>EX#>!uJ;-ER_KCe6q#1+d!$U~3Q74!Xb3I<FhE6L5H%TyskSPvaZO
zV&ByNI`2D!{RXsl!2!&-cIWE)>Sd?mJBWMOE$h5)Oin<1F_n||_4a+Qi?z<{#OxCQ
z7+M4ht;j-<-2bDzub6bQG?Q`X!*hgTNH&`#pU+dNRH)Tz#Bt2@<1ssDjUT_uI<FJ6
z2271MSltQO-fq6sS5^YHN=+_qGd(xJGOrV}Z>cnsaoMoJ#2AbW!~G-N)S(uqTdZ}S
zh=_=Yh=_=Yi1^KF8f`ik_$`*xXfGQ8cGGC@{$9489(#KNtft3(Pltb-_4L@w6JR+#
z_ObzO7Sm(zegwgGdhBfjtft3aHUKm|77-iIn2{!MSG{SL00000NkvXXu0mjf@wV~<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/uniform_engineering.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ff1950af25815f666d1ea4686bfa1502978d0b0
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005oNkl<Zc%1Fo
z%}N_l7{>9x6Ty{>LJiclyH=Qulx!q{iWd-a3jsG4yp68nB7(Ot^a8|%!G%HH3}|-+
zp^Gk((t^@ua=Ms|)y%}4Nl?y_=eG&-&IiwV=gcNAh=_=Yh=_=YhzLNdh8eF#QDpM!
zE@;&-Q50peP0JhP72A85jYhWK?>5+IB<E)h`W(`{{cbk&w7j_u0I1x;S^NKu?LADm
zmegHTxrK1;@nX-~m}z+z#tW?)W_NpZP!H%H4~f4g53g(m@O22l{t<jW$=?6c=FK~C
z2b^9ezm=_kzwf>z4|`B|&8&GB#|xt_8Gy}E_ildN+;=km4Y4C{ALh@Sy93gTI~R}Z
z>9H$|PtB8e;wJ#G^a-esE~y8}vBPG`o7<V@ddXZbe<Tb;%H=ZEYL!l>L$B8(j$=OD
zopX3KaAp_GlXqeR-oG8Ndl+zVFubqt>;&vLhkW~0a;^ch=AF2R=6cDL!vU)+@ManQ
z+`-R2^kTObpYkoQh=_=Yh=_=Yh!1?57~6PqF7S|V6JuM}4FLZp#x|_}F7|C=TtuNA
z;M>I5MrJyk$G3@b5!O4vw~4W>LZ1NmH!+^Z`mOmkF}78x0X|KPZ50Zv39N{`Hva(r
WWF~Oa30l_x0000<MNUMnLSTa7%KvWw

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/meta.json b/Resources/Textures/Clothing/uniform_engineering.rsi/meta.json
new file mode 100644
index 0000000000..0c0ed98d44
--- /dev/null
+++ b/Resources/Textures/Clothing/uniform_engineering.rsi/meta.json
@@ -0,0 +1,74 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "engine",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/uniform_grey.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..d796e300540df275df2a261bedfa86e4fdc23f6b
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000B1Nkl<Zc%1E;
zy>8nu5Xb*13V0|4wjj`{&A_Q!la4`vYArJ64fr61kai9H27CjJ@{~b?l0`t0ZUGDs
zN!qD^kq|-#Wl@)qm6Z>Nq-CcKe~b0~KcA`NnRh@S5C{YUfk5DSvSM>F=ez-c)zwub
zNn-9zlB795KL-E^A*`P1s?QiR$EB2T)qnKGob!fr4y6<TU^1DQbCgm503ifIh+dp<
zmp-M`e7fqtv=Nt5nq%ExKpVw52Y_atPIyS45aOjj(*a%2Q%XSynYxBC2Bj1xlL?ek
zb9F-B`Y&vZ$@ARnyf5A7Yp3|=Kj;AMeE=xS5&(>syN2kPps(Yco1o>&BJ^jD0HqX!
z5GLwNDW?LUHcG#TNs_DxA#NGzO5gf39gwD}wb4HJEn5G<Am|#z<~0K>Lf<L~{*PFB
z_|y7_1^`~ac?AG?|L!e*{`w67xV*Rm0305j^p**B^)D~3rnX)5AC(Ac*48($y}fO+
zFG7fkz?4#?X^O+66Prg`v9`W}IF3ycq?9r_fs_(?o?Gi%zXDoNPdECro1F9oV+>MC
z6ZQ3WJ2SPxDF*1=dv9-VYJX8sN+G30S(cDedg)s`pgj-kxw$<LFOv2@Qdg`Uz!<yb
zaZ0K45VWP8^=a<P4j+qE5UlGOqtOUa6k$9b0|3V3F$RMHs;WX=*G@**=<o0E0|3s>
z&W!%`^|d)~i}eVIq6k%0O&zPM3Q-hUi@R{2j;p@41G-;+*713>Z2dqW5C{YUfj}S-
zc)r|}th~xz^Tfv<s|AsknBJWd?Xx+eYeQ$>*wb5sgcjCf-9`z<SZ~b{ciEuVAluCm
z0IY3rS{2soa%q}^F}ASvz&2VpO;fKmLFdv~p67_;*!A|g5y!DtUxHU{P_NG~3*VXm
z;OPKD$kLpkzr1fn%Gv=+DN_!6N|a^k6bG!Q!8A=xlodiC%d(~B1Dl(hCgQu~0@fqo
zzA0v2EisSbJ}s9i*lGkEA06B}w!8b)Z0j0*pBx_@;PmvzgXe9q?hp9(eYe@#+FAjC
zqA1Le6GDJ|B)#?r0Kn(?OS=~kJ3DCfYmjAGW80%(<$#+Z)?``M=;jFEZx%Kj4tr09
zhr{8De%G~rQ520*YAQbU3g^7ZvaBhJqA7}EDSwPO=SDxvGG`l}eUp^81B4Lsuw!Z3
z)_DLhU8k?>8iT>W+YnbfMx&A0cEM`|EUG7<PaC`(@DytDPr-&j;2-7>kHv01%aBhM
P00000NkvXXu0mjfinq`0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/grey.png b/Resources/Textures/Clothing/uniform_grey.rsi/grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d26413f4b246573a98d381f682245aa2d870c3f
GIT binary patch
literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003|Nkl<Zc%1E(
zu};G<5Qe`Z)CH*lC3J$K_6cC9RPh>JJ>|hNb?rN3sw#DWC#Zy>OH&IHiKR;zimjkB
z_*#&V@V7WRpM1a1mpcdq0{@+s#5qmV8lczfktB(;Z#EmW)&OK#COY%f*HI}|r)f%A
zmH-%I++M%mXE+=ZMG@QWww_ET-XgpO04$eF_dOU4_UuhjzIZ8BO4Xy$h)$<N9LGda
zwC7WnCB_)4s$xE$<C}#OiP}8RkJ>+40PNCi>%d}fe+XVR@R`oK-EO=0Za#xC#@Qw5
z2SEmW50wNL3HU9%1t_KJpY*eM_kp4)DArFrKFm13I0NANs>}1s8i2RgcK|NCH<I|W
zMs$03&v-n>7~}eZ{R84SW;&g+TCGF^#5G{6f3aA6S-)#eJ{&ZRU^kGo)^4>(hmj})
o&BL|UWLefaCU_ta2>b~?0N(MC>pgt&Q2+n{07*qoM6N<$f~m%={r~^~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/uniform_grey.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fa516dbc5ce7c5e7f3cbd113a7eddc20d8fe550
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00055Nkl<Zc%1Fo
zJ&wXK5C!0u)izNilrDvpC^zr{(p#JY$=9R~2cSnNjSISnCLP{l*Jxo0KVev8>3tmr
zUd-4|BnBWNA|fIpA|fK9DU31RTI(;3Pt7|Yv)1~ld1F2#LX0uKswz0={=8RJ)x$*y
zdFPySlk%<+DF6VJWeKI!$>glHzAVehdB1m*F~%#UFg0&X@@#-H#y3rKeBE^&oO4i0
zp|0!W_-eJna=E;DJ?Xq##CAZ}bpU|6t}&m_kCP4K@6H?Z`E0<?DtG|LNp3b96h#5x
z``kL`?p`hFyjw(eK$y&SyFD2XtM%w)!{^UeJLF6KctG$7Tyi)Z-unG}h!j9;?fbq*
zmSsqi1dGK2Ns=JTGW2~9t@T5XE$O^#p1ubJd7h&v3bbvDwrv3bP17LHbL@7zx95!!
zJ4;$?pQb5hvl-Gf#V`!m@Anvn0qgbp;p<4}5fKp)5fKp)5mDTvy3sG~3%rVCH#*7!
z0CL^v=>A@o?jA?G1EjjgVx6J?BHcZXatBCuqoXXqm?_=lC<`FjJ&x`k5J+{8qk9Yn
d>>d-5gfGWtAJEt}x_AHp002ovPDHLkV1h;Q+He2>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/uniform_grey.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f985a97ca641cc58e7f01acc179744316512738b
GIT binary patch
literal 507
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU_9jM;uumf=j~0yzSRaItQSsS
zH{sA+w0J|$jYe^Y{8Z72d(K`-VSKr`<Cv?}ls3J2kLukeIfRWf(mq_bjg{*xtvuK_
zg<U`p1{gBd-rbPaQ+WPW_JXZt$7Td>3$Og|qZ>Bu>59Cyu94I9#s6m7t>0Q!@;3C|
za$W`oO;tJTRa?uPI6O4P+5hncd2uM(-C1LJZ11VrJls*);n%<ZExo;M!!;+4##O7{
zeLeiJ;cuP&uRs3Lv&uhlX51EI2nZG3cKdCuVSN1T_0MXh#r~C^{CSk&L5bBu4K9ZI
z^NiVVwf5B}RNh<e-%$T~L-q5|KM#N1`k}JM?)>xrI`5x|F*MwMyUpTGKG(_rTNu4G
zub0Yh(s7=oa^r28$0U}>X$xOlX)F!<YP>_`{R^HCpKRO%MKWfw`CevVc(u!I-t!$X
zdiM*YPuG~fe{wItYp03t#+x}4mTCUlcl>LW>;3N*a{a5Vm>Yh45`u-#QH5=tg&qFS
znfjAvOSE(4F$mm0V&QV({?U!TJ<n%+WjSJI$Y*FNStWA&NJZZRb&%>6k<knt^+`4&
vcN%V}9b4FRjzJ$}M&$2l!VyZp?(bpN@RYxxEaYVdj8q0sS3j3^P6<r_{88e@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/meta.json b/Resources/Textures/Clothing/uniform_grey.rsi/meta.json
new file mode 100644
index 0000000000..69fe95b1a8
--- /dev/null
+++ b/Resources/Textures/Clothing/uniform_grey.rsi/meta.json
@@ -0,0 +1,74 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "grey",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/uniform_janitor.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8ea12d1b7163a72920b64ca45791d0a154de173
GIT binary patch
literal 1636
zcmV-q2AlbbP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000InNkl<Zc%1E;
zO=ufO6vuyZA{W_>6vvh&g(gN0bWP(J5=arHg80-^6Z?`wpeGq}F&Lk6=|Rv_a<D1%
z5@>rV7)md#1Enc(>!8FIP3nXcny3-_u!9#V>r|4hkI1#R2eBK;b{);iN}$=_#opQ3
z_kZ*D?c34pfQgBTiHV7ciOHLZMWpli>7d#-;sM~|#f$p2SFc`G0V3bXOxy|z*%Z~c
z4i*47d-kl}K0Q4R!1}LkOx_XG-(PRXu@gb{T}i@jhfpZQ>guYhox61D5`Mp*_ujWN
zmJO<(|FQQ$(Dd7mmpOFkkUnStzu(WZXU`}sw=z}|)32-J*omO(JA8(>KZFB*kY$-r
zD8%K<m-WGWJRY7W;n@^~muK0_AXMvj48FK$OG`@}IdVil{`=Q|Si2>r-%_u5x*)UC
zA_L&@c<}rEHG>CG)@9NK8Q<YEjGYLoyV<Rmo%A(qHe1c{N{hJuO9KFqF37|(5yFo`
z07N1YoK7cRuNSA&NhA^h;P%}Ru}p+?LEg=rFkAKii|`|H{aphvb|R?u9+Ze>Dg$(O
zb=RDa$Ky4}PG{wOEEA#kpww^{?4%!y#mHu}HT|;LEU{Qj_fJIsr5UhR&H?Dplq}0g
zl2p^@*s){CvRu<oyRK2T>MM$Z!{Gp+y}ca(hr@xQD2DWReG4qFF0#D3SktCG@7i6+
zX0vp5cH;4Pc=TuFKd&>wPIfjnHg@b=-7ccPYXH7Wd|gvXTWqkhva+q8)@Iqa^L0kq
zYUjDNKx=CUkw}E2M~?zfEEZW@Tx8$AeLS}og!Sv52LM=FMS3@fjg1X5nGBgs27t}Y
zO#oV2>Z<445DGv#on~fc27vDFZqA=S&+P0h>2%tVxF`z?3k(bl5Rb?4dc8G&-EKFJ
zA3qkhDHMS2?(Uibs1-!5O?w?Si&Ljg;rII)92^9ov$K<dfdTzE6bf<U#tk8xLIHpm
zMGz_hs6K9X000t+1Se0P1S$o%qoV_Wd-v`cvL_q>K!4>`54buI&7`fZjhi=b>TjXx
z>1iAe2X439kUe9SgUaB8!Jy?;-1TZCNzw;<<;oQcfZOffHaDpk!vXle@Wux~s0O6I
zE%VE@2LL=Rl=ZgFwx>MgsovHsR<G^n=b44d|AqZ}TXH5(k_Ej@1feVB{1S40>7{MW
z;&tnrn3$NDn3$NDn3$Nn*$nlLs-H-o?#ai`z2Fn+Q+23!)Q~^I3nD|kqv`?cK|VNr
zoNJ%Ws)0a21sES6e`NvDv;u*EdhN4W^@G#LIbc1Akst`I2WW%$xjtfZ5uWe_yVFh}
z5Kt#3CIHmQ$;qbe5P{0zCnhGy<#MXsZs$ovW^?f!e6Dv0r>-;9JF0#k`=V|igfqbB
z`Urq%?g7{5ZsYU$u-om7jEs;<r9{mMlS-u+85zNDx8w8qxITBAXzoFcZz3386O88`
z;yq^tDof&$B;j(ojGC((m&=7DN%}Ip_neh@?xA6O!U52t4d8S-0qE)Jp{J+km1TgY
zSM9@A-|9tp6;UbH?!G9O%e1z>p0B3m@{2{-Xzsx_-|9g)16J2FddmIw<+AQXGMU`A
zXQvt1Y&Md~Bv1*!Z(lA0l}B=QJtJ&SC<DCbti*p<r@G31%vUN@9)tV$?+ZI1O0ihf
z(;ukuWvF*l^`5iBWc~JpGhpj0CY4IDwzei}reW6B*0$9gk=LJwPylu+a?xm%L?VHr
zC=3q|i|PwAJUon|C?paIqS0twKJJEa252)ss7y-w`ugba@29J)i@CWuQFFq~&CSu(
z)kS}QKYe|DH8ap^-|9s;WiDK}plZcVk|h0k42Q!sdlslMK0dDcd_JI3e6=ss#bS}E
zsVN~Jgfn1jYRXb97GK-o0VXFWE#Yt&s1#pGk_-(V49*0rXMCkniCk`P_5_NM%jGDQ
zN;~=_f}tHE8l_T+d_LcZiH6t<?S}RT<nwvv=jTz?SHCo%sw(sI^9={VPzESJwu7ym
zj(2S+cUoUd0G59Ni=`FixsAX7Qc;TShU_%-YjEN2@4RKP@zWmd3>D$0#MhR$EH)PI
i{@&29K@*cVoPPm6C-Et3q;_%u0000<MNUMnLSTXmGb+0P

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/uniform_janitor.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..333d7bae8d36a2046f51bbf816a15c4210244caa
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005VNkl<Zc%1Fo
zJ!%3$90l;VA&o4^l4c3ZuG{4X7O{2_YinVy;6dU=tkc*o-XS1jiXqs9#l|K$DUvnO
z_&NTK47^|GsE=_z*5Uy~L_|bHL_|bHWFyNmqm(k+#%=R9$COgWHgA_3iI8@!XObj=
z*80zTNs^#l>zy>|GH;XC+A41!kp%#NIF1oT(b~=_rA!>h)_K2ARF-8XiXzzN?Q(l=
zK)cp6&9H+xhDg&Cz|UmM*Uhj40OtAi$vZVqDP^?Qu+2L}>;z1wQvg7krf9WVtI3w*
z*UsDJ>=W?43+5xxt4WT>V}xM{;OpMbW&<3%The)lh@60OGLy+<ZM@vAQzu(~esj0W
ze5oG~2ws70mdoW;zkdvo1?bmDrYH*dz7Nmy(Cv2Nc^-V<M^O~$*GDJ)ZAs_tbM`X;
z0EV*xf`<TM7$VPe<arJNXfzrKf&jyp!BzA25xYz6TF<=Sk5H{vQK?k0SS&D~&vEzm
zXmw|$^N5Iuh=_=Yh=|B-Qf>4_dx1-lY@?lA06?yd7U>24lXM&H><N%+kDWUK((SR6
zCqS}|c5(rBv1yZ?TmZ@T*tur_Aln{0+p@AfCL#%+vQI5yOM`G)00000NkvXXu0mjf
DYX<Ll

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/uniform_janitor.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..5db9b849d47caf503fe24401f6ef812bc3f45bab
GIT binary patch
literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005_Nkl<Zc%1Fo
z!HU{I9LMo*N-q+S&`T&GF}Hn#J=C*7>~+t=yn+wXeG#wQORm9pD2Uj@P`s4j#Y=H|
z*v9V0xQ?dFX3GC_93}kn&rAe=AcPP?2qA<JLI@#*0LZe;)Yp_!rfIzkvMe)7siSP?
z^1f?YoD60rNs^;=tu;xKFd57`HH0d!*81qPb9oyF01(G9PbZpXnTeu^IF4HfehqOP
z6GhRpC$5w-=kmU<FH8nAGYaq6l9Q$>N-3kYCW<1`GzDN3-T|1e-@kbO^e(PY&kKJa
zmQCK1J7B$D1CXXE<MH@#v1+|*uFZS21O80O{0j8pBFp8HFbsjm_rPW|rwdOX+UITD
z0o9l5(_5`p&pz*pDo>TKQssXs@5v(ou;1@nhkHvl`5Omtf4eYcS>pRXp64;0PVqbs
z-}foYlKb05r+x<8<UM)^0OXrF!A(FIh7?6XQ4|0SheLuOApbUhrCYg9o4hB_#$+%v
zKR+($_xtpEJ$Abt+wGPQKR$Kt9RTj-6+#Fhgb+dqA%qaZ1+F#5HeT!no^q`*wq-p4
zaIZ18VfA<Mp@IFJ1CNzcy)o`TjL19G8QQvN2e{T4+h}Zt>RfA#FJZj{Tx*PNU33J%
z{l>V?dH}99#<r~90pMO^Z0n+PD-Em=;(zlSJjOC{i|Qez00000NkvXXu0mjf=1>BO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/janitor.png b/Resources/Textures/Clothing/uniform_janitor.rsi/janitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a0adb6f1a39d511e733f7ffd131783fb978d005
GIT binary patch
literal 456
zcmV;(0XP1MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004xNkl<Zc%1E&
zv1;Q$5QaYm6~e|Cf(Tm(BD*%Ms(S$wZ0zz5{1z(mAimZQ5z^V%q(8raYfD8C3)fgy
zvz7OX5E12^pbhS#uiKe_XMSdfg@%TP?~Y?59*@UnFc<(ZoleX6a=8Rxx7)E^udQlc
z)fG-|?+t+Kx+tZPQUV~QL@9;qx;T!*Bz)0b+yD;r`+b5SKnOt`$4DuO;}{_XK@iaE
z^(<#v)4=5R-rU{%D$ijUmL`M{gkf0b?rwfsO`-k-fc<`7F)<ttE6tN60b@6UdImnI
zx!rCnXJgE#`g6E-M5}b}0EX*oTnO=>_UZ2ft7Kl=LhUD5rE|yk{ZBQ%?^`vuGVn^0
zBxmDkn%b7KGw}PzpK`O`n|Ry&t?r@*9-kNFc}`IjwA*a}X0sUptyYWU@kpNMJU%aM
z`qx{+SGwIUr_+fn%gC~fG)*}i4wd}j!`tVv-hn8Jh@uFsHA*S8)@AG~SZ(ZRG%}v&
y0nq7m@H`K#HAPVXptWYR*;szY4Gj$q-<^N34T5c*ep~_o0000<MNUMnLSTZB%h7TG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/meta.json b/Resources/Textures/Clothing/uniform_janitor.rsi/meta.json
new file mode 100644
index 0000000000..12a1932f33
--- /dev/null
+++ b/Resources/Textures/Clothing/uniform_janitor.rsi/meta.json
@@ -0,0 +1,74 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "janitor",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/vest_hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/vest_hazard.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d09fbcb5d0bae31b9e4b5dafcc406b7a5b2ab8f
GIT binary patch
literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008KNkl<Zc%1Fp
zv1=Mp90%~PrAHQtL%0Zqpf5up*x`mELI-IHG(-M?4E_P_7_yXtQy`F`d;fq!ErIqQ
z2q_&3;&jVVlA%wj2pU9A9C}FmI-Jky<u2a4)1!gk2OPW$@B8!la)ZAgKnNj(5JJd8
zRi=rG4&isNqC-@f=6i41`QDtM>nkgwW~AqWYDPMl@PI78n!<XxoU)Q**$$3NI{>by
zANaVmgSYkTNb5z~fc@PZYG{c=bCjwXX|cbXgB7uWD6V>g$tL`JAJqeuKd$Hyh0Gd&
z$tFxbJOC6jYY2KiEK5a)IM~(!xF1@+0N`L-kCd;p0RX@@)^F|jRc`>cv97vQB)mUV
zy1t0gzd+~l9zH)Yz*rt8fXw&T_*j1B7Qmb6{4s$q7m*4Hn{O5k*erkR9_LMT8tVB<
z8}PLG6@@_^fO`@+0OR}=yg!5iK(ifOD#fdj`F^J@(;wou_@$h$v;p7pWwdjTkj-ww
zW_h&Fj$prh1J0Z1c6(^GIsjkY36S{!kj-vRuXnpWU<+<O)bdlRMa({ESXu)gji>kC
z->9z_C*LcHd_o8zgb+dqA%qY@2qE{G^3TY#t?3g!{x5!pj#HCTZ?MWV!AE1rm$xq;
zwMVbQo99=P%6dwjAwC+<H6JP%3t7maIZE_2)Qq&SY$vd$utJ}JD$|6w^CI8NR=H(6
zD%p`(wlmk3_p3?e6olS@*%p{I+pm`eB|&Bd%>?+>8bo<Mz>l04ki!$JBs1bnh0KaI
zBgE1g-fiunR4PvA1(G0V66*B^*pCmuP55uzEB27o3-c4$Pq!t_<1QAGaefNGoe8jF
zuBEgA6&-UA!V^ADJ%3gf#mUr2`|K!YIg44gGo49jG)!EY7jqB6mCh;MH6)qTprRa#
nysMT~*FXp%gb+dqx&QtGGt)d^9eQd200000NkvXXu0mjf^-)~d

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/vest_hazard.rsi/hazard.png b/Resources/Textures/Clothing/vest_hazard.rsi/hazard.png
new file mode 100644
index 0000000000000000000000000000000000000000..50fac7686cd42389832cf1c102497eceaeab3de2
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004pNkl<Zc%1E)
zu}cC`9LGOKrbBc@lwgEjLn5~{1`U!lG`QEl(A?7E)ZE;^U{i}jgBT8hW6KdbbQ&gf
zA#&27HC%(9sf71CF<kC59gpw({l2{SeeWIk`1mZCfK-^<U$vd@v!~BL=Seh^EK8f~
zR?k&8s>$uI+7c5Y1G?2Cv%5)RYke?MwE?b-?*Kqn4cY(~2YUci%r^O#4@qg3L@F3*
z4w@3eY3ww2#wN9MGw@%C3|txCf$MTrT=cqJ9d6HD3^-KG_FObG8*n&D#>VzsQ$n01
zW3!Z!or3hyvE7J8xr=O}s&N36=gTq8ZR#8V!>IATW0H<H?czhhbsH8QLeUBw)=FsY
z5bDMniP!!SyPwdUmTrK428>n*-Re;k)b_jr(?aGofFN9f$9RfHEJ|dMfhSxt@NQDC
zH^C^l)?Ro9M3+TY4ceO0&j5fH?vj7|8a_Un5+bv`g5C`S3^O3PjKnvgZuKx)9apWF
q=HTIf0DfP+QDf7_eSCa;B>Vs$LYE(&A##)e0000<MNUMnLSTX&%g3Yu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/vest_hazard.rsi/meta.json b/Resources/Textures/Clothing/vest_hazard.rsi/meta.json
new file mode 100644
index 0000000000..693db07a8c
--- /dev/null
+++ b/Resources/Textures/Clothing/vest_hazard.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hazard", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Mob/human.rsi/male.png b/Resources/Textures/Mob/human.rsi/male.png
new file mode 100644
index 0000000000000000000000000000000000000000..b501089e4a5f3d4f985b741f065a9da9af613729
GIT binary patch
literal 1705
zcmV;a23GlrP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000JXNkl<Zc%1E9
zPiPZa82@Ey*^p!jreT8>jUa5gECiE?)Pl#xn@~Y|@YKVCXY~?#mR$DF#e*Ph&a!C1
zJqWoiLR|zi80fAMf*nhvBhz5msZ?8-J<Pn9d6Q`~@0&~tYkv@uH#6`3-uvdg?|t9<
zz5qu!!WWGQwPK^XWU}AIN{!qO74_vs&R@QLpUgi&snn=0nT7H~zYLh;6heJ@(VV|>
ztzQOAst~@Ct>7L!02Im#!i)$L_2or#zI;izHebFZ%m^7s3E<tsUrhi|*WVygx(w_^
z5h-1Uy8cGE9~Ol64ZZ*Iy6+QGOW?!$-$;E|LiTtX=AXX-fb~5Y15m<;^%t`IQs}gr
zNGD>@wtC1+CHZx2tA}(VhEA&~-KNwGn7MH;vZGpq{P%MN_~#Gnd-o%D)EAh!aW7Oo
z;M6nPR*!$Y?)wF)!!LjN(ae=DSZ{v!BU;a&hCX;F8r3CpI+sUg`UJGjCOWMqc_)&p
z#1vg&?xG<1%v2J}>JtFrZi$Sa4IYzGV0VWLfx_?m;YM}IEX-ZB3W@aK1GX|!R-c3-
z1h3tvyQv~|A}d@|>MK(Gz8>U*_ZqkxhCXs3>??djA1p)eB@9)9O!D2{wy(~1d)p(m
z3kKf2W83TYwt?N9f$K8-{&oRFhq~54cT)ubXlh#^W##Us3U#d^bY>*5XBB@5hHg#&
zWE|c18t3cwwk=&G!GE9~;Fi9+)&O8BJs3K=y=|oIG9NquB+}Mf2xuaE^8Zi-0HnUn
zp!;6q-_HKY@cWtpo{A-rwiJ*{FBB`ah*Dqi)2wee`FHpBkV?jd`>A9cyL)>i{^0^}
zO{Y{cKBx>6>48p-Y#AKT&HyKY-`5P7&gFeO8};Qyb2^vzMeY{^{9h-4PllxvJ{eY-
z$Ujs7+Ex#VSQPovEC5^cx|AQ&2LO;S%_0$t3Wib;xcMh1Civh}$v79n<irGtf2aTw
zu_yqb`TQ>cK<Y%64>prM1HcjrGf3ETtX@zI@Y_p}@i9HbmV+$+fdVL2YLQpUGrUrs
z38yZpWW2w|3|&}@<=gjpouI~$C;xuNn0;NAf2cb=(1>k)DfJZ;<}N~6eS$)HK~OrQ
zv;y62In7_rZC|JGOP>fi$(RG=Bo7;@WE|a16>O_h>MPtRqCj2%jwvWe+K-<wBCx?S
ze(K->;-ToF!b{KrgfBk>TuKjcDaDYn-*TfaLz)h7d4_&H#ZiFi0D*t3I^cf>-vZ$N
zwTIpB^bf*{4>;TP<o9^a4}2*>!7Vj(Y-nBK{)X1YNr3OkqmC3cs!L|pc7qR6g6x?_
z)jz-QUEm-WQ*W<9Z~JYD2IlK?pWlH|yWdAR!WRUxqH-UQ1c}ifCO^p(t}ic|`O+*u
z4*-J2=qdcp`~XdDqrObzmo|jF1`h!9SFVv`^s@ZU!2{O8OujTr;-_1Jj@UfQ7dVwV
zMsCh8PNj|sISK9@0a-{3U?2`}=*XsHSbuN_xpU|7^5^TJ&4QOdUpI5-&SU+-9c0rn
zVc;xxKo+DKz)pe??I$T@(=p(+f|;9lL(>B@H}6L9TCunoqE=*@#||YStptmeTBK2h
zb@aT`6NI3=HAtP1f%4Ws;rl)(c6yl3<;ekA@_|TZDrp}*2g}fqMX^$gynC1zmRV*h
zi4L(nT9%kS-7?uT{6oplp`z1j3fzFTEGeF-lmNI_=;4u#D^<=bQ360eAS&4h@;0b#
z^~QD#b|4HrP!x(L07FNo)#O6pA+j+-Q`>y-omP|lGDwG_LPuE6-Z*E2p*xiD{(bWU
z+6-{$0G_Zo#<&3Eawbbs`N>Pbt3zXjn{ymXpjfFzSU9XuUg+xq2OizJ8rn|aZkw%t
zwkuGKp+L@%*LHM%ZjRjKFnG1?4$R7et^@1{ab_wh>;lhLSIM0j24~xv+O{%O>nprJ
z6p&0;XUZ(lpNix9(*(~Iwv}LzG+mM}K=r)BLcc#X>AIvPz$6X;NTl(((;n;phKiM1
z<a4JjOnaeE5;%$t2CAJ%W8-NZkCpM8!jF|UHlEf4+aTog0Bx&>jQ#ugvBZJTh5^ob
zD9#XEX6PX!NMDY0K%m<8`a63%6RHX9#-m$T&9kR7LLaCImLz59IC-IL7wUL)>#BMA
zr{6=}4%y&2Z$LMkECBbuoBoELsz%};QBJ^r&AMTfuPBwm00000NkvXXu0mjfgO)Wl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mob/human.rsi/meta.json b/Resources/Textures/Mob/human.rsi/meta.json
new file mode 100644
index 0000000000..604233c32b
--- /dev/null
+++ b/Resources/Textures/Mob/human.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "male",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/SpaceStation14Content.sln.DotSettings b/SpaceStation14Content.sln.DotSettings
new file mode 100644
index 0000000000..8ea8bb0428
--- /dev/null
+++ b/SpaceStation14Content.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSI/@EntryIndexedValue">RSI</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/engine b/engine
index 7f74ae7b61..99ab6fce9c 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 7f74ae7b61e09e8a4a63f4a50e780a896428e239
+Subproject commit 99ab6fce9c63e77401d2cb97cb8cff62dff183e3