diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj
index 2eedacc7f0..194ddc4d61 100644
--- a/Content.Benchmarks/Content.Benchmarks.csproj
+++ b/Content.Benchmarks/Content.Benchmarks.csproj
@@ -8,7 +8,7 @@
false
Exe
true
- 8
+ 9
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 38f4d32250..66beb8956c 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -3,7 +3,7 @@
$(TargetFramework)
- 8
+ 9
false
false
..\bin\Content.Client\
diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index 66e2898088..e86493ab70 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -79,6 +79,7 @@ namespace Content.Client
prototypes.RegisterIgnore("gasReaction");
prototypes.RegisterIgnore("seed"); // Seeds prototypes are server-only.
prototypes.RegisterIgnore("barSign");
+ prototypes.RegisterIgnore("objective");
ClientContentIoC.Register();
diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs b/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs
index 1a33b83398..28f7ffb381 100644
--- a/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs
+++ b/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs
@@ -1,26 +1,30 @@
+#nullable enable
+using System.Drawing;
using Content.Client.GameObjects.Components.Mobs;
using Content.Client.UserInterface;
using Content.Client.UserInterface.Stylesheets;
+using Content.Shared.GameObjects.Components.Actor;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
+using Robust.Client.Utility;
using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
+using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Actor
{
[RegisterComponent]
- public sealed class CharacterInfoComponent : Component, ICharacterUI
+ public sealed class CharacterInfoComponent : SharedCharacterInfoComponent, ICharacterUI
{
[Dependency] private readonly IResourceCache _resourceCache = default!;
- private CharacterInfoControl _control;
+ private CharacterInfoControl _control = default!;
- public override string Name => "CharacterInfo";
-
- public Control Scene { get; private set; }
+ public Control Scene { get; private set; } = default!;
public UIPriority Priority => UIPriority.Info;
public override void OnAdd()
@@ -30,18 +34,29 @@ namespace Content.Client.GameObjects.Components.Actor
Scene = _control = new CharacterInfoControl(_resourceCache);
}
- public override void Initialize()
+ public void Opened()
{
- base.Initialize();
+ SendNetworkMessage(new RequestCharacterInfoMessage());
+ }
- if (Owner.TryGetComponent(out ISpriteComponent spriteComponent))
+ public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null)
+ {
+ base.HandleNetworkMessage(message, netChannel, session);
+
+ if(session?.AttachedEntity != Owner) return;
+
+ switch (message)
{
- _control.SpriteView.Sprite = spriteComponent;
- }
+ case CharacterInfoMessage characterInfoMessage:
+ _control.UpdateUI(characterInfoMessage);
+ if (Owner.TryGetComponent(out ISpriteComponent? spriteComponent))
+ {
+ _control.SpriteView.Sprite = spriteComponent;
+ }
- _control.NameLabel.Text = Owner.Name;
- // ReSharper disable once StringLiteralTypo
- _control.SubText.Text = Loc.GetString("Professional Greyshirt");
+ _control.NameLabel.Text = Owner.Name;
+ break;
+ }
}
private sealed class CharacterInfoControl : VBoxContainer
@@ -50,8 +65,12 @@ namespace Content.Client.GameObjects.Components.Actor
public Label NameLabel { get; }
public Label SubText { get; }
+ public VBoxContainer ObjectivesContainer { get; }
+
public CharacterInfoControl(IResourceCache resourceCache)
{
+ IoCManager.InjectDependencies(this);
+
AddChild(new HBoxContainer
{
Children =
@@ -66,7 +85,8 @@ namespace Content.Client.GameObjects.Components.Actor
(SubText = new Label
{
SizeFlagsVertical = SizeFlags.None,
- StyleClasses = {StyleNano.StyleClassLabelSubText}
+ StyleClasses = {StyleNano.StyleClassLabelSubText},
+
})
}
}
@@ -78,16 +98,65 @@ namespace Content.Client.GameObjects.Components.Actor
PlaceholderText = Loc.GetString("Health & status effects")
});
- AddChild(new Placeholder(resourceCache)
+ AddChild(new Label
{
- PlaceholderText = Loc.GetString("Objectives")
+ Text = Loc.GetString("Objectives"),
+ SizeFlagsHorizontal = SizeFlags.ShrinkCenter
});
+ ObjectivesContainer = new VBoxContainer();
+ AddChild(ObjectivesContainer);
AddChild(new Placeholder(resourceCache)
{
PlaceholderText = Loc.GetString("Antagonist Roles")
});
}
+
+ public void UpdateUI(CharacterInfoMessage characterInfoMessage)
+ {
+ SubText.Text = characterInfoMessage.JobTitle;
+
+ ObjectivesContainer.RemoveAllChildren();
+ foreach (var (groupId, objectiveConditions) in characterInfoMessage.Objectives)
+ {
+ var vbox = new VBoxContainer
+ {
+ Modulate = Color.Gray
+ };
+
+ vbox.AddChild(new Label
+ {
+ Text = groupId,
+ Modulate = Color.LightSkyBlue
+ });
+
+ foreach (var objectiveCondition in objectiveConditions)
+ {
+ var hbox = new HBoxContainer();
+ hbox.AddChild(new ProgressTextureRect
+ {
+ Texture = objectiveCondition.SpriteSpecifier.Frame0(),
+ Progress = objectiveCondition.Progress,
+ SizeFlagsVertical = SizeFlags.ShrinkCenter
+ });
+ hbox.AddChild(new Control
+ {
+ CustomMinimumSize = (10,0)
+ });
+ hbox.AddChild(new VBoxContainer
+ {
+ Children =
+ {
+ new Label{Text = objectiveCondition.Title},
+ new Label{Text = objectiveCondition.Description}
+ }
+ }
+ );
+ vbox.AddChild(hbox);
+ }
+ ObjectivesContainer.AddChild(vbox);
+ }
+ }
}
}
}
diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
index f776411554..d96fef4f6c 100644
--- a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
+++ b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
@@ -116,6 +116,7 @@ namespace Content.Client.GameObjects.Components.Actor
public class CharacterWindow : SS14Window
{
private readonly VBoxContainer _contentsVBox;
+ private readonly List _windowComponents;
public CharacterWindow(List windowComponents)
{
@@ -129,6 +130,17 @@ namespace Content.Client.GameObjects.Components.Actor
{
_contentsVBox.AddChild(element.Scene);
}
+
+ _windowComponents = windowComponents;
+ }
+
+ protected override void Opened()
+ {
+ base.Opened();
+ foreach (var windowComponent in _windowComponents)
+ {
+ windowComponent.Opened();
+ }
}
}
}
diff --git a/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs b/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs
new file mode 100644
index 0000000000..40f95f717b
--- /dev/null
+++ b/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs
@@ -0,0 +1,22 @@
+using System;
+using Content.Client.GameObjects.EntitySystems.DoAfter;
+using Robust.Client.Graphics.Drawing;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Maths;
+
+namespace Content.Client.GameObjects.Components.Actor
+{
+ public class ProgressTextureRect : TextureRect
+ {
+ public float Progress;
+
+ protected override void Draw(DrawingHandleScreen handle)
+ {
+ var dims = Texture != null ? GetDrawDimensions(Texture) : UIBox2.FromDimensions(Vector2.Zero, PixelSize);
+ dims.Top = Math.Max(dims.Bottom - dims.Bottom * Progress,0);
+ handle.DrawRect(dims, DoAfterHelpers.GetProgressColor(Progress));
+
+ base.Draw(handle);
+ }
+ }
+}
diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
index be2d6957e0..37fa84f161 100644
--- a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
+++ b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
@@ -1,9 +1,13 @@
-using Content.Client.GameObjects.Components.Items;
+#nullable enable
+using Content.Client.GameObjects.Components.HUD.Inventory;
+using Content.Client.GameObjects.Components.Items;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Inventory;
using Content.Shared.GameObjects.Components.Items;
using Robust.Client.Graphics;
+using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -18,8 +22,29 @@ namespace Content.Client.GameObjects.Components.Clothing
public override string Name => "Clothing";
public override uint? NetID => ContentNetIDs.CLOTHING;
+ private string? _clothingEquippedPrefix;
+
[ViewVariables(VVAccess.ReadWrite)]
- public string ClothingEquippedPrefix { get; set; }
+ public string? ClothingEquippedPrefix
+ {
+ get => _clothingEquippedPrefix;
+ set
+ {
+ if (_clothingEquippedPrefix == value)
+ return;
+
+ _clothingEquippedPrefix = value;
+
+ if (!Owner.TryGetContainer(out IContainer? container))
+ return;
+ if (!container.Owner.TryGetComponent(out ClientInventoryComponent? inventory))
+ return;
+ if (!inventory.TryFindItemSlots(Owner, out EquipmentSlotDefines.Slots? slots))
+ return;
+
+ inventory.SetSlotVisuals(slots.Value, Owner);
+ }
+ }
[ViewVariables(VVAccess.ReadWrite)]
public FemaleClothingMask FemaleMask
@@ -54,7 +79,7 @@ namespace Content.Client.GameObjects.Components.Clothing
return null;
}
- public override void HandleComponentState(ComponentState curState, ComponentState nextState)
+ public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
if (curState == null)
return;
diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
index d74f8d30e7..a543b709f2 100644
--- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
+++ b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Client.GameObjects.Components.Clothing;
using Content.Shared.GameObjects.Components.Inventory;
@@ -22,10 +24,9 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
{
private readonly Dictionary _slots = new Dictionary();
- [ViewVariables]
- public InventoryInterfaceController InterfaceController { get; private set; }
+ [ViewVariables] public InventoryInterfaceController InterfaceController { get; private set; } = default!;
- private ISpriteComponent _sprite;
+ private ISpriteComponent? _sprite;
private bool _playerAttached = false;
@@ -69,7 +70,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
}
}
- public override void HandleComponentState(ComponentState curState, ComponentState nextState)
+ public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
base.HandleComponentState(curState, nextState);
@@ -126,7 +127,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
return;
}
- if (entity != null && entity.TryGetComponent(out ClothingComponent clothing))
+ if (entity.TryGetComponent(out ClothingComponent? clothing))
{
var flag = SlotMasks[slot];
var data = clothing.GetEquippedStateInfo(flag);
@@ -155,6 +156,9 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
internal void ClearAllSlotVisuals()
{
+ if (_sprite == null)
+ return;
+
foreach (var slot in InventoryInstance.SlotMasks)
{
if (slot != Slots.NONE)
@@ -192,7 +196,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
SendNetworkMessage(new OpenSlotStorageUIMessage(slot));
}
- public override void HandleMessage(ComponentMessage message, IComponent component)
+ public override void HandleMessage(ComponentMessage message, IComponent? component)
{
base.HandleMessage(message, component);
@@ -210,9 +214,25 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
}
}
- public bool TryGetSlot(Slots slot, out IEntity item)
+ public bool TryGetSlot(Slots slot, out IEntity? item)
{
return _slots.TryGetValue(slot, out item);
}
+
+ public bool TryFindItemSlots(IEntity item, [NotNullWhen(true)] out Slots? slots)
+ {
+ slots = null;
+
+ foreach (var (slot, entity) in _slots)
+ {
+ if (entity == item)
+ {
+ slots = slot;
+ return true;
+ }
+ }
+
+ return false;
+ }
}
}
diff --git a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs b/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs
index 748bdf40bc..ef9c3a6821 100644
--- a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs
+++ b/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs
@@ -17,5 +17,10 @@ namespace Content.Client.GameObjects.Components.Mobs
/// The order it will appear in the character UI, higher is lower
///
UIPriority Priority { get; }
+
+ ///
+ /// Called when the CharacterUi was opened
+ ///
+ void Opened(){}
}
}
diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs
index 172c05d047..c612670e5e 100644
--- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs
+++ b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
using System;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Shaders;
@@ -105,16 +105,10 @@ namespace Content.Client.GameObjects.EntitySystems.DoAfter
}
color = new Color(1.0f, 0.0f, 0.0f, _flash ? 1.0f : 0.0f);
- }
- else if (Ratio >= 1.0f)
- {
- color = new Color(0f, 1f, 0f);
- }
+ }
else
{
- // lerp
- var hue = (5f / 18f) * Ratio;
- color = Color.FromHsv((hue, 1f, 0.75f, 1f));
+ color = DoAfterHelpers.GetProgressColor(Ratio);
}
handle.UseShader(_shader);
@@ -128,4 +122,18 @@ namespace Content.Client.GameObjects.EntitySystems.DoAfter
handle.DrawRect(box, color);
}
}
+
+ public static class DoAfterHelpers
+ {
+ public static Color GetProgressColor(float progress)
+ {
+ if (progress >= 1.0f)
+ {
+ return new Color(0f, 1f, 0f);
+ }
+ // lerp
+ var hue = (5f / 18f) * progress;
+ return Color.FromHsv((hue, 1f, 0.75f, 1f));
+ }
+ }
}
diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
index 28d350b880..920cd8e71a 100644
--- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
@@ -114,7 +114,7 @@ namespace Content.Client.GameObjects.EntitySystems.DoAfter
// Predictions
if (doAfter.BreakOnUserMove)
{
- if (userGrid != doAfter.UserGrid)
+ if (!userGrid.InRange(EntityManager, doAfter.UserGrid, doAfter.MovementThreshold))
{
comp.Cancel(id, currentTime);
continue;
@@ -123,7 +123,7 @@ namespace Content.Client.GameObjects.EntitySystems.DoAfter
if (doAfter.BreakOnTargetMove)
{
- if (EntityManager.TryGetEntity(doAfter.TargetUid, out var targetEntity) && targetEntity.Transform.Coordinates != doAfter.TargetGrid)
+ if (EntityManager.TryGetEntity(doAfter.TargetUid, out var targetEntity) && !targetEntity.Transform.Coordinates.InRange(EntityManager, doAfter.TargetGrid, doAfter.MovementThreshold))
{
comp.Cancel(id, currentTime);
continue;
diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs
index 1959d0ebad..9833230e94 100644
--- a/Content.Client/IgnoredComponents.cs
+++ b/Content.Client/IgnoredComponents.cs
@@ -35,7 +35,6 @@
"Smes",
"LightBulb",
"Healing",
- "Catwalk",
"RangedMagazine",
"Ammo",
"HitscanWeaponCapacitor",
@@ -210,8 +209,9 @@
"CrematoriumEntityStorage",
"RandomArcade",
"RandomSpriteState",
+ "WelderRefinable",
"ConveyorAssembly",
- "TwoWayLever"
+ "TwoWayLever",
};
}
}
diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
index b7587d5ec8..1452fb6809 100644
--- a/Content.IntegrationTests/Content.IntegrationTests.csproj
+++ b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -6,7 +6,7 @@
..\bin\Content.IntegrationTests\
false
false
- 8
+ 9
diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
index 177f856e3d..096e464c7b 100644
--- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
+++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
@@ -53,11 +53,11 @@ namespace Content.IntegrationTests.Tests
Assert.That(inventory.HasSlot(Slots.INNERCLOTHING));
Assert.That(inventory.HasSlot(Slots.IDCARD));
- Assert.That(inventory.SpawnItemInSlot(Slots.INNERCLOTHING, "UniformJanitor", true));
+ Assert.That(inventory.SpawnItemInSlot(Slots.INNERCLOTHING, "ClothingUniformJumpsuitJanitor", true));
// Do we actually have the uniform equipped?
Assert.That(inventory.TryGetSlotItem(Slots.INNERCLOTHING, out ItemComponent uniform));
- Assert.That(uniform.Owner.Prototype != null && uniform.Owner.Prototype.ID == "UniformJanitor");
+ Assert.That(uniform.Owner.Prototype != null && uniform.Owner.Prototype.ID == "ClothingUniformJumpsuitJanitor");
stun.Stun(1f);
diff --git a/Content.Server.Database/Content.Server.Database.csproj b/Content.Server.Database/Content.Server.Database.csproj
index 4daa852b65..2cf17ebfd3 100644
--- a/Content.Server.Database/Content.Server.Database.csproj
+++ b/Content.Server.Database/Content.Server.Database.csproj
@@ -3,7 +3,7 @@
$(TargetFramework)
- 8
+ 9
false
false
..\bin\Content.Server.Database\
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index 69cba419e3..eaebbd2f7e 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -197,7 +197,7 @@ namespace Content.Server.Atmos
foreach (var entity in _gridTileLookupSystem.GetEntitiesIntersecting(GridIndex, GridIndices))
{
if (!entity.TryGetComponent(out IPhysicsComponent physics)
- || !entity.TryGetComponent(out MovedByPressureComponent pressure)
+ || !entity.IsMovedByPressure(out var pressure)
|| entity.IsInContainer())
continue;
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index e13b99e8a1..8923cb0774 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -3,7 +3,7 @@
$(TargetFramework)
- 8
+ 9
false
false
..\bin\Content.Server\
diff --git a/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs b/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs
new file mode 100644
index 0000000000..7f4c040725
--- /dev/null
+++ b/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs
@@ -0,0 +1,58 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Mobs.Roles;
+using Content.Shared.GameObjects.Components.Actor;
+using Content.Shared.Objectives;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.Network;
+using Robust.Shared.Players;
+
+namespace Content.Server.GameObjects.Components.Actor
+{
+ [RegisterComponent]
+ public class CharacterInfoComponent : SharedCharacterInfoComponent
+ {
+ public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null)
+ {
+ switch (message)
+ {
+ case RequestCharacterInfoMessage _:
+ var conditions = new Dictionary>();
+ var jobTitle = "No Profession";
+ if (Owner.TryGetComponent(out MindComponent? mindComponent))
+ {
+ var mind = mindComponent.Mind;
+
+ if (mind != null)
+ {
+ // getting conditions
+ foreach (var objective in mind.AllObjectives)
+ {
+ if (!conditions.ContainsKey(objective.Issuer))
+ conditions[objective.Issuer] = new List();
+ foreach (var condition in objective.Conditions)
+ {
+ conditions[objective.Issuer].Add(new ConditionInfo(condition.GetTitle(),
+ condition.GetDescription(), condition.GetIcon(), condition.GetProgress(mindComponent.Mind)));
+ }
+ }
+
+ // getting jobtitle
+ foreach (var role in mind.AllRoles)
+ {
+ if (role.GetType() == typeof(Job))
+ {
+ jobTitle = role.Name;
+ break;
+ }
+ }
+ }
+ }
+ SendNetworkMessage(new CharacterInfoMessage(jobTitle, conditions));
+ break;
+ }
+ }
+ }
+}
diff --git a/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs b/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs
index 851f281a58..8e840ce03e 100644
--- a/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs
@@ -1,4 +1,7 @@
-using Robust.Shared.GameObjects;
+#nullable enable
+using System.Diagnostics.CodeAnalysis;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -9,6 +12,8 @@ namespace Content.Server.GameObjects.Components.Atmos
{
public override string Name => "MovedByPressure";
+ [ViewVariables(VVAccess.ReadWrite)]
+ public bool Enabled { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite)]
public float PressureResistance { get; set; } = 1f;
[ViewVariables(VVAccess.ReadWrite)]
@@ -19,8 +24,23 @@ namespace Content.Server.GameObjects.Components.Atmos
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
+ serializer.DataField(this, x => x.Enabled, "enabled", true);
serializer.DataField(this, x => PressureResistance, "pressureResistance", 1f);
serializer.DataField(this, x => MoveResist, "moveResist", 100f);
}
}
+
+ public static class MovedByPressureExtensions
+ {
+ public static bool IsMovedByPressure(this IEntity entity)
+ {
+ return entity.IsMovedByPressure(out _);
+ }
+
+ public static bool IsMovedByPressure(this IEntity entity, [NotNullWhen(true)] out MovedByPressureComponent? moved)
+ {
+ return entity.TryGetComponent(out moved) &&
+ moved.Enabled;
+ }
+ }
}
diff --git a/Content.Server/GameObjects/Components/CatwalkComponent.cs b/Content.Server/GameObjects/Components/CatwalkComponent.cs
deleted file mode 100644
index 4027c5045d..0000000000
--- a/Content.Server/GameObjects/Components/CatwalkComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameObjects;
-
-namespace Content.Server.GameObjects.Components
-{
- ///
- /// Literally just a marker component for footsteps for now.
- ///
- [RegisterComponent]
- public sealed class CatwalkComponent : Component
- {
- public override string Name => "Catwalk";
- }
-}
diff --git a/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs b/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs
new file mode 100644
index 0000000000..1d5fb02d88
--- /dev/null
+++ b/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs
@@ -0,0 +1,71 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.GameObjects.Components.Stack;
+using Content.Shared.GameObjects.Components.Interactable;
+using Content.Shared.Interfaces.GameObjects.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Server.GameObjects.Components.Construction
+{
+ ///
+ /// Used for something that can be refined by welder.
+ /// For example, glass shard can be refined to glass sheet.
+ ///
+ [RegisterComponent]
+ public class WelderRefinableComponent : Component, IInteractUsing
+ {
+ [ViewVariables]
+ private HashSet? _refineResult = default;
+ [ViewVariables]
+ private float _refineTime;
+
+ private bool _beingWelded;
+
+ public override string Name => "WelderRefinable";
+
+ public override void ExposeData(ObjectSerializer serializer)
+ {
+ base.ExposeData(serializer);
+ serializer.DataField(ref _refineResult, "refineResult", new HashSet { "GlassStack" });
+ serializer.DataField(ref _refineTime, "refineTime", 2f);
+ }
+
+ public async Task InteractUsing(InteractUsingEventArgs eventArgs)
+ {
+ // check if object is welder
+ if (!eventArgs.Using.TryGetComponent(out ToolComponent? tool))
+ return false;
+
+ // check if someone is already welding object
+ if (_beingWelded)
+ return false;
+ _beingWelded = true;
+
+ if (!await tool.UseTool(eventArgs.User, Owner, _refineTime, ToolQuality.Welding))
+ {
+ // failed to veld - abort refine
+ _beingWelded = false;
+ return false;
+ }
+
+ // get last owner coordinates and delete it
+ var resultPosition = Owner.Transform.Coordinates;
+ Owner.Delete();
+
+ // spawn each result afrer refine
+ foreach (var result in _refineResult!)
+ {
+ var droppedEnt = Owner.EntityManager.SpawnEntity(result, resultPosition);
+
+ if (droppedEnt.TryGetComponent(out var stackComp))
+ stackComp.Count = 1;
+ }
+
+ return true;
+ }
+ }
+}
diff --git a/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs b/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs
new file mode 100644
index 0000000000..8263cca814
--- /dev/null
+++ b/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs
@@ -0,0 +1,23 @@
+using Robust.Server.GameObjects.Components.Container;
+
+namespace Content.Server.GameObjects.Components.ContainerExt
+{
+ public static class ContainerExt
+ {
+ public static int CountPrototypeOccurencesRecursive(this ContainerManagerComponent mgr, string prototypeId)
+ {
+ int total = 0;
+ foreach (var container in mgr.GetAllContainers())
+ {
+ foreach (var entity in container.ContainedEntities)
+ {
+ if (entity.Prototype?.ID == prototypeId) total++;
+ if(!entity.TryGetComponent(out var component)) continue;
+ total += component.CountPrototypeOccurencesRecursive(prototypeId);
+ }
+ }
+
+ return total;
+ }
+ }
+}
diff --git a/Content.Server/GameObjects/Components/Damage/DamageCommands.cs b/Content.Server/GameObjects/Components/Damage/DamageCommands.cs
index e90fc5d294..820c858db5 100644
--- a/Content.Server/GameObjects/Components/Damage/DamageCommands.cs
+++ b/Content.Server/GameObjects/Components/Damage/DamageCommands.cs
@@ -2,12 +2,13 @@
using System;
using System.Diagnostics.CodeAnalysis;
using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Atmos;
+using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.GameObjects.Components.Damage;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -204,17 +205,12 @@ namespace Content.Server.GameObjects.Components.Damage
return;
}
- if (entity.HasComponent())
- {
- entity.RemoveComponent();
- }
+ var godmodeSystem = EntitySystem.Get();
+ var enabled = godmodeSystem.ToggleGodmode(entity);
- if (entity.TryGetComponent(out IDamageableComponent? damageable))
- {
- damageable.AddFlag(DamageFlag.Invulnerable);
- }
-
- shell.SendText(player, $"Enabled godmode for entity {entity.Name}");
+ shell.SendText(player, enabled
+ ? $"Enabled godmode for entity {entity.Name} with id {entity.Uid}"
+ : $"Disabled godmode for entity {entity.Name} with id {entity.Uid}");
}
}
}
diff --git a/Content.Server/GameObjects/Components/DoAfterComponent.cs b/Content.Server/GameObjects/Components/DoAfterComponent.cs
index 5ae0a4ce83..1fe5f2712e 100644
--- a/Content.Server/GameObjects/Components/DoAfterComponent.cs
+++ b/Content.Server/GameObjects/Components/DoAfterComponent.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems.DoAfter;
using Content.Shared.GameObjects.Components;
@@ -31,6 +31,7 @@ namespace Content.Server.GameObjects.Components
doAfter.EventArgs.Delay,
doAfter.EventArgs.BreakOnUserMove,
doAfter.EventArgs.BreakOnTargetMove,
+ doAfter.EventArgs.MovementThreshold,
doAfter.EventArgs.Target?.Uid ?? EntityUid.Invalid);
toAdd.Add(clientDoAfter);
diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
index a54160d12d..f472399261 100644
--- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
+++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
@@ -80,6 +80,10 @@ namespace Content.Server.GameObjects.Components.Doors
public bool Occludes => _occludes;
+ [ViewVariables(VVAccess.ReadWrite)] private bool _bumpOpen;
+
+ public bool BumpOpen => _bumpOpen;
+
[ViewVariables(VVAccess.ReadWrite)]
public bool IsWeldedShut
{
@@ -112,6 +116,7 @@ namespace Content.Server.GameObjects.Components.Doors
base.ExposeData(serializer);
serializer.DataField(ref _occludes, "occludes", true);
+ serializer.DataField(ref _bumpOpen, "bumpOpen", true);
serializer.DataField(ref _isWeldedShut, "welded", false);
serializer.DataField(ref _canCrush, "canCrush", true);
}
@@ -147,6 +152,11 @@ namespace Content.Server.GameObjects.Components.Doors
return;
}
+ if (!_bumpOpen)
+ {
+ return;
+ }
+
// Disabled because it makes it suck hard to walk through double doors.
if (entity.HasComponent())
diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
index 3774218410..25f3314fc5 100644
--- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
+++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
@@ -3,8 +3,10 @@ using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Items.Clothing;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.Components.Power;
+using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
using Content.Shared.GameObjects.Components;
using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Utility;
@@ -164,7 +166,7 @@ namespace Content.Server.GameObjects.Components.Interactable
if (Owner.TryGetComponent(out ClothingComponent? clothing))
{
- clothing.ClothingEquippedPrefix = on ? "On" : "Off";
+ clothing.ClothingEquippedPrefix = on ? "on" : "off";
}
if (Owner.TryGetComponent(out ItemComponent? item))
@@ -226,5 +228,25 @@ namespace Content.Server.GameObjects.Components.Interactable
{
return new HandheldLightComponentState(GetLevel());
}
+
+ [Verb]
+ public sealed class ToggleLightVerb : Verb
+ {
+ protected override void GetData(IEntity user, HandheldLightComponent component, VerbData data)
+ {
+ if (!ActionBlockerSystem.CanInteract(user))
+ {
+ data.Visibility = VerbVisibility.Invisible;
+ return;
+ }
+
+ data.Text = Loc.GetString("Toggle light");
+ }
+
+ protected override void Activate(IEntity user, HandheldLightComponent component)
+ {
+ component.ToggleStatus(user);
+ }
+ }
}
}
diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs
index 8ae15d2640..78af6ec95a 100644
--- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs
+++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs
@@ -16,7 +16,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Map;
using Robust.Shared.Serialization;
-using Robust.Shared.Timers;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
diff --git a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs b/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs
index 2b20077cb1..8c2ba42bbc 100644
--- a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs
+++ b/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs
@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects.Components.Timers;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
using Timer = Robust.Shared.Timers.Timer;
namespace Content.Server.GameObjects.Components.Timing
@@ -24,6 +25,7 @@ namespace Content.Server.GameObjects.Components.Timing
///
/// The time, in seconds, between an object's use and when it can be used again
///
+ [ViewVariables(VVAccess.ReadWrite)]
public float Delay { get => _delay; set => _delay = value; }
public bool ActiveDelay{ get; private set; }
diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs
index 59b847effd..2e4d2e5380 100644
--- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs
+++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
using System;
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.GUI;
@@ -118,12 +118,14 @@ namespace Content.Server.GameObjects.EntitySystems.DoAfter
}
// TODO :Handle inertia in space.
- if (EventArgs.BreakOnUserMove && EventArgs.User.Transform.Coordinates != UserGrid)
+ if (EventArgs.BreakOnUserMove && !EventArgs.User.Transform.Coordinates.InRange(
+ EventArgs.User.EntityManager, UserGrid, EventArgs.MovementThreshold))
{
return true;
}
- if (EventArgs.BreakOnTargetMove && EventArgs.Target!.Transform.Coordinates != TargetGrid)
+ if (EventArgs.BreakOnTargetMove && !EventArgs.Target!.Transform.Coordinates.InRange(
+ EventArgs.User.EntityManager, TargetGrid, EventArgs.MovementThreshold))
{
return true;
}
diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
index 84507fe1b9..e3063e3a43 100644
--- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
+++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
using System;
using System.Threading;
using Content.Shared.Physics;
@@ -60,6 +60,11 @@ namespace Content.Server.GameObjects.EntitySystems.DoAfter
///
public bool BreakOnTargetMove { get; set; }
+ ///
+ /// Threshold for user and target movement
+ ///
+ public float MovementThreshold { get; set; }
+
public bool BreakOnDamage { get; set; }
public bool BreakOnStun { get; set; }
@@ -86,6 +91,7 @@ namespace Content.Server.GameObjects.EntitySystems.DoAfter
Delay = delay;
CancelToken = cancelToken;
Target = target;
+ MovementThreshold = 0.1f;
if (Target == null)
{
diff --git a/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs b/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs
new file mode 100644
index 0000000000..b2495f7627
--- /dev/null
+++ b/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs
@@ -0,0 +1,100 @@
+#nullable enable
+using System.Collections.Generic;
+using Content.Server.GameObjects.Components.Atmos;
+using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.GameTicking;
+using JetBrains.Annotations;
+using Robust.Shared.GameObjects.Systems;
+using Robust.Shared.Interfaces.GameObjects;
+
+namespace Content.Server.GameObjects.EntitySystems
+{
+ [UsedImplicitly]
+ public class GodmodeSystem : EntitySystem, IResettingEntitySystem
+ {
+ private readonly Dictionary _entities = new Dictionary();
+
+ public void Reset()
+ {
+ _entities.Clear();
+ }
+
+ public bool EnableGodmode(IEntity entity)
+ {
+ if (_entities.ContainsKey(entity))
+ {
+ return false;
+ }
+
+ _entities[entity] = new OldEntityInformation(entity);
+
+ if (entity.TryGetComponent(out MovedByPressureComponent? moved))
+ {
+ moved.Enabled = false;
+ }
+
+ if (entity.TryGetComponent(out IDamageableComponent? damageable))
+ {
+ damageable.AddFlag(DamageFlag.Invulnerable);
+ }
+
+ return true;
+ }
+
+ public bool HasGodmode(IEntity entity)
+ {
+ return _entities.ContainsKey(entity);
+ }
+
+ public bool DisableGodmode(IEntity entity)
+ {
+ if (!_entities.Remove(entity, out var old))
+ {
+ return false;
+ }
+
+ if (entity.TryGetComponent(out MovedByPressureComponent? moved))
+ {
+ moved.Enabled = old.MovedByPressure;
+ }
+
+ if (entity.TryGetComponent(out IDamageableComponent? damageable))
+ {
+ damageable.RemoveFlag(DamageFlag.Invulnerable);
+ }
+
+ return true;
+ }
+
+ ///
+ /// Toggles godmode for a given entity.
+ ///
+ /// The entity to toggle godmode for.
+ /// true if enabled, false if disabled.
+ public bool ToggleGodmode(IEntity entity)
+ {
+ if (HasGodmode(entity))
+ {
+ DisableGodmode(entity);
+ return false;
+ }
+ else
+ {
+ EnableGodmode(entity);
+ return true;
+ }
+ }
+
+ public class OldEntityInformation
+ {
+ public OldEntityInformation(IEntity entity)
+ {
+ Entity = entity;
+ MovedByPressure = entity.IsMovedByPressure();
+ }
+
+ public IEntity Entity { get; }
+ public bool MovedByPressure { get; }
+ }
+ }
+}
diff --git a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
index 50219e5c07..4801729395 100644
--- a/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MoverSystem.cs
@@ -56,7 +56,8 @@ namespace Content.Server.GameObjects.EntitySystems
public override void Update(float frameTime)
{
- foreach (var (moverComponent, collidableComponent) in EntityManager.ComponentManager.EntityQuery())
+ foreach (var (moverComponent, collidableComponent) in EntityManager.ComponentManager
+ .EntityQuery(false))
{
var entity = moverComponent.Owner;
UpdateKinematics(entity.Transform, moverComponent, collidableComponent);
@@ -141,24 +142,19 @@ namespace Content.Server.GameObjects.EntitySystems
var grid = _mapManager.GetGrid(coordinates.GetGridId(EntityManager));
var tile = grid.GetTileRef(coordinates);
- // If the coordinates have a catwalk, it's always catwalk.
- string soundCollectionName;
- var catwalk = false;
- foreach (var maybeCatwalk in grid.GetSnapGridCell(tile.GridIndices, SnapGridOffset.Center))
+ // If the coordinates have a FootstepModifier component
+ // i.e. component that emit sound on footsteps emit that sound
+ string? soundCollectionName = null;
+ foreach (var maybeFootstep in grid.GetSnapGridCell(tile.GridIndices, SnapGridOffset.Center))
{
- if (maybeCatwalk.Owner.HasComponent())
+ if (maybeFootstep.Owner.TryGetComponent(out FootstepModifierComponent? footstep))
{
- catwalk = true;
+ soundCollectionName = footstep._soundCollectionName;
break;
}
}
-
- if (catwalk)
- {
- // Catwalk overrides tile sound.s
- soundCollectionName = "footstep_catwalk";
- }
- else
+ // if there is no FootstepModifierComponent, determine sound based on tiles
+ if (soundCollectionName == null)
{
// Walking on a tile.
var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];
diff --git a/Content.Server/IgnoredComponents.cs b/Content.Server/IgnoredComponents.cs
index 59b7053ca7..0be2eccd08 100644
--- a/Content.Server/IgnoredComponents.cs
+++ b/Content.Server/IgnoredComponents.cs
@@ -10,7 +10,6 @@
"SubFloorHide",
"LowWall",
"ReinforcedWall",
- "CharacterInfo",
"InteractionOutline",
"MeleeWeaponArcAnimation",
"AnimationsTest",
diff --git a/Content.Server/Mobs/Mind.cs b/Content.Server/Mobs/Mind.cs
index 9adcb4a776..77d5c23394 100644
--- a/Content.Server/Mobs/Mind.cs
+++ b/Content.Server/Mobs/Mind.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Mobs.Roles;
+using Content.Server.Objectives;
using Content.Server.Players;
using Robust.Server.Interfaces.GameObjects;
using Robust.Server.Interfaces.Player;
@@ -27,6 +28,8 @@ namespace Content.Server.Mobs
{
private readonly ISet _roles = new HashSet();
+ private readonly List _objectives = new List();
+
///
/// Creates the new mind attached to a specific player session.
///
@@ -74,6 +77,12 @@ namespace Content.Server.Mobs
[ViewVariables]
public IEnumerable AllRoles => _roles;
+ ///
+ /// An enumerable over all the objectives this mind has.
+ ///
+ [ViewVariables]
+ public IEnumerable AllObjectives => _objectives;
+
///
/// The session of the player owning this mind.
/// Can be null, in which case the player is currently not logged in.
@@ -144,6 +153,32 @@ namespace Content.Server.Mobs
return _roles.Any(role => role.GetType() == t);
}
+ ///
+ /// Adds an objective to this mind.
+ ///
+ public bool TryAddObjective(ObjectivePrototype objective)
+ {
+ if (!objective.CanBeAssigned(this))
+ return false;
+ _objectives.Add(objective);
+ return true;
+ }
+
+ ///
+ /// Removes an objective to this mind.
+ ///
+ /// Returns true if the removal succeeded.
+ public bool TryRemoveObjective(int index)
+ {
+ if (_objectives.Count >= index) return false;
+
+ var objective = _objectives[index];
+ _objectives.Remove(objective);
+ return true;
+ }
+
+
+
///
/// Transfer this mind's control over to a new entity.
///
diff --git a/Content.Server/Objectives/Commands.cs b/Content.Server/Objectives/Commands.cs
new file mode 100644
index 0000000000..47ecdd4f8a
--- /dev/null
+++ b/Content.Server/Objectives/Commands.cs
@@ -0,0 +1,139 @@
+#nullable enable
+using System.Linq;
+using Content.Server.Administration;
+using Content.Server.Players;
+using Content.Shared.Administration;
+using Robust.Server.Interfaces.Console;
+using Robust.Server.Interfaces.Player;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Objectives
+{
+ [AdminCommand(AdminFlags.Admin)]
+ public class AddObjectiveCommand : IClientCommand
+ {
+ public string Command => "addobjective";
+ public string Description => "Adds an objective to the player's mind.";
+ public string Help => "addobjective ";
+ public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
+ {
+ if (args.Length != 2)
+ {
+ shell.SendText(player, "Expected exactly 2 arguments.");
+ return;
+ }
+
+ var mgr = IoCManager.Resolve();
+ if (!mgr.TryGetPlayerDataByUsername(args[0], out var data))
+ {
+ shell.SendText(player, "Can't find the playerdata.");
+ return;
+ }
+
+
+ var mind = data.ContentData()?.Mind;
+ if (mind == null)
+ {
+ shell.SendText(player, "Can't find the mind.");
+ return;
+ }
+
+ if (!IoCManager.Resolve()
+ .TryIndex(args[1], out var objectivePrototype))
+ {
+ shell.SendText(player, $"Can't find matching ObjectivePrototype {objectivePrototype}");
+ return;
+ }
+
+ if (!mind.TryAddObjective(objectivePrototype))
+ {
+ shell.SendText(player, "Objective requirements dont allow that objective to be added.");
+ }
+
+ }
+ }
+
+ [AdminCommand(AdminFlags.Admin)]
+ public class ListObjectivesCommand : IClientCommand
+ {
+ public string Command => "lsobjectives";
+ public string Description => "Lists all objectives in a players mind.";
+ public string Help => "lsobjectives []";
+ public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
+ {
+ IPlayerData? data;
+ if (args.Length == 0 && player != null)
+ {
+ data = player.Data;
+ }
+ else if (player == null || !IoCManager.Resolve().TryGetPlayerDataByUsername(args[0], out data))
+ {
+ shell.SendText(player, "Can't find the playerdata.");
+ return;
+ }
+
+ var mind = data.ContentData()?.Mind;
+ if (mind == null)
+ {
+ shell.SendText(player, "Can't find the mind.");
+ return;
+ }
+
+ shell.SendText(player, $"Objectives for player {data.UserId}:");
+ var objectives = mind.AllObjectives.ToList();
+ if (objectives.Count == 0)
+ {
+ shell.SendText(player, "None.");
+ }
+ for (var i = 0; i < objectives.Count; i++)
+ {
+ shell.SendText(player, $"- [{i}] {objectives[i]}");
+ }
+
+ }
+ }
+
+ [AdminCommand(AdminFlags.Admin)]
+ public class RemoveObjectiveCommand : IClientCommand
+ {
+ public string Command => "rmobjective";
+ public string Description => "Removes an objective from the player's mind.";
+ public string Help => "rmobjective ";
+ public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
+ {
+ if (args.Length != 2)
+ {
+ shell.SendText(player, "Expected exactly 2 arguments.");
+ return;
+ }
+
+ var mgr = IoCManager.Resolve();
+ if (mgr.TryGetPlayerDataByUsername(args[0], out var data))
+ {
+ var mind = data.ContentData()?.Mind;
+ if (mind == null)
+ {
+ shell.SendText(player, "Can't find the mind.");
+ return;
+ }
+
+ if (int.TryParse(args[1], out var i))
+ {
+ shell.SendText(player,
+ mind.TryRemoveObjective(i)
+ ? "Objective successfully removed!"
+ : "Objective removing failed. Maybe the index is out of bounds? Check lsobjectives!");
+ }
+ else
+ {
+ shell.SendText(player, $"Invalid index {args[1]}!");
+ }
+ }
+ else
+ {
+ shell.SendText(player, "Can't find the playerdata.");
+ }
+ }
+ }
+}
diff --git a/Content.Server/Objectives/Conditions/StealCondition.cs b/Content.Server/Objectives/Conditions/StealCondition.cs
new file mode 100644
index 0000000000..a7ea32187a
--- /dev/null
+++ b/Content.Server/Objectives/Conditions/StealCondition.cs
@@ -0,0 +1,57 @@
+#nullable enable
+using Content.Server.GameObjects.Components.ContainerExt;
+using Content.Server.Mobs;
+using Content.Server.Objectives.Interfaces;
+using Robust.Server.GameObjects.Components.Container;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Log;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Objectives.Conditions
+{
+ public class StealCondition : IObjectiveCondition
+ {
+ public string PrototypeId { get; private set; } = default!;
+ public int Amount { get; private set; }
+
+ public void ExposeData(ObjectSerializer serializer)
+ {
+ serializer.DataField(this, x => x.PrototypeId, "prototype", "");
+ serializer.DataField(this, x => x.Amount, "amount", 1);
+
+ if (Amount < 1)
+ {
+ Logger.Error("StealCondition has an amount less than 1 ({0})", Amount);
+ }
+ }
+
+ private string PrototypeName =>
+ IoCManager.Resolve().TryIndex(PrototypeId, out var prototype)
+ ? prototype.Name
+ : "[CANNOT FIND NAME]";
+
+ public string GetTitle() => Loc.GetString("Steal {0} {1}", Amount > 1 ? $"{Amount}x" : "", Loc.GetString(PrototypeName));
+
+ public string GetDescription() => Loc.GetString("We need you to steal {0}. Don't get caught.", Loc.GetString(PrototypeName));
+
+ public SpriteSpecifier GetIcon()
+ {
+ return new SpriteSpecifier.EntityPrototype(PrototypeId);
+ }
+
+ public float GetProgress(Mind? mind)
+ {
+ if (mind?.OwnedEntity == null) return 0f;
+ if (!mind.OwnedEntity.TryGetComponent(out var containerManagerComponent)) return 0f;
+
+ float count = containerManagerComponent.CountPrototypeOccurencesRecursive(PrototypeId);
+ return count/Amount;
+ }
+
+ public float GetDifficulty() => 1f;
+ }
+}
diff --git a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
new file mode 100644
index 0000000000..97385aa805
--- /dev/null
+++ b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
@@ -0,0 +1,35 @@
+using Content.Server.Mobs;
+using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Objectives.Interfaces
+{
+ public interface IObjectiveCondition : IExposeData
+ {
+ ///
+ /// Returns the title of the condition.
+ ///
+ string GetTitle();
+
+ ///
+ /// Returns the description of the condition.
+ ///
+ string GetDescription();
+
+ ///
+ /// Returns a SpriteSpecifier to be used as an icon for the condition.
+ ///
+ SpriteSpecifier GetIcon();
+
+ ///
+ /// Returns the current progress of the condition in %.
+ ///
+ /// Current progress in %.
+ float GetProgress(Mind mind);
+
+ ///
+ /// Returns a difficulty of the condition.
+ ///
+ float GetDifficulty();
+ }
+}
diff --git a/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs b/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs
new file mode 100644
index 0000000000..7615c8a0a3
--- /dev/null
+++ b/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs
@@ -0,0 +1,15 @@
+using Content.Server.Mobs;
+using Robust.Shared.Interfaces.Serialization;
+
+namespace Content.Server.Objectives.Interfaces
+{
+ public interface IObjectiveRequirement : IExposeData
+ {
+
+ ///
+ /// Checks whether or not the entity & its surroundings are valid to be given the objective.
+ ///
+ /// Returns true if objective can be given.
+ bool CanBeAssigned(Mind mind);
+ }
+}
diff --git a/Content.Server/Objectives/Interfaces/IObjectivesManager.cs b/Content.Server/Objectives/Interfaces/IObjectivesManager.cs
new file mode 100644
index 0000000000..25b72812e7
--- /dev/null
+++ b/Content.Server/Objectives/Interfaces/IObjectivesManager.cs
@@ -0,0 +1,17 @@
+using Content.Server.Mobs;
+
+namespace Content.Server.Objectives.Interfaces
+{
+ public interface IObjectivesManager
+ {
+ ///
+ /// Returns all objectives the provided mind is valid for.
+ ///
+ ObjectivePrototype[] GetAllPossibleObjectives(Mind mind);
+
+ ///
+ /// Returns a randomly picked (no pop) collection of objectives the provided mind is valid for.
+ ///
+ ObjectivePrototype[] GetRandomObjectives(Mind mind, float maxDifficulty = 3f);
+ }
+}
diff --git a/Content.Server/Objectives/ObjectivePrototype.cs b/Content.Server/Objectives/ObjectivePrototype.cs
new file mode 100644
index 0000000000..78965c79f6
--- /dev/null
+++ b/Content.Server/Objectives/ObjectivePrototype.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Mobs;
+using Content.Server.Objectives.Interfaces;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
+using YamlDotNet.RepresentationModel;
+
+namespace Content.Server.Objectives
+{
+ [Prototype("objective")]
+ public class ObjectivePrototype : IPrototype, IIndexedPrototype
+ {
+ [ViewVariables]
+ public string ID { get; private set; }
+
+ [ViewVariables(VVAccess.ReadWrite)]
+ public string Issuer { get; private set; }
+
+ [ViewVariables]
+ public float Probability { get; private set; }
+
+ [ViewVariables]
+ public IReadOnlyList Conditions => _conditions;
+ [ViewVariables]
+ public IReadOnlyList Requirements => _requirements;
+
+ [ViewVariables]
+ public float Difficulty => _difficultyOverride ?? _conditions.Sum(c => c.GetDifficulty());
+
+ private List _conditions = new List();
+ private List _requirements = new List();
+
+ [ViewVariables(VVAccess.ReadWrite)]
+ private float? _difficultyOverride = null;
+
+ public bool CanBeAssigned(Mind mind)
+ {
+ foreach (var requirement in _requirements)
+ {
+ if (!requirement.CanBeAssigned(mind)) return false;
+ }
+
+ return true;
+ }
+
+ public void LoadFrom(YamlMappingNode mapping)
+ {
+ var ser = YamlObjectSerializer.NewReader(mapping);
+
+ ser.DataField(this, x => x.ID, "id", string.Empty);
+ ser.DataField(this, x => x.Issuer, "issuer", "Unknown");
+ ser.DataField(this, x => x.Probability, "prob", 0.3f);
+ ser.DataField(this, x => x._conditions, "conditions", new List());
+ ser.DataField(this, x => x._requirements, "requirements", new List());
+ ser.DataField(this, x => x._difficultyOverride, "difficultyOverride", null);
+ }
+ }
+}
diff --git a/Content.Server/Objectives/ObjectivesManager.cs b/Content.Server/Objectives/ObjectivesManager.cs
new file mode 100644
index 0000000000..e8f75dbc71
--- /dev/null
+++ b/Content.Server/Objectives/ObjectivesManager.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Mobs;
+using Content.Server.Objectives.Interfaces;
+using Robust.Shared.Interfaces.Random;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Objectives
+{
+ public class ObjectivesManager : IObjectivesManager
+ {
+ [Dependency] private IPrototypeManager _prototypeManager = default!;
+ [Dependency] private IRobustRandom _random = default!;
+
+ public ObjectivePrototype[] GetAllPossibleObjectives(Mind mind)
+ {
+ return _prototypeManager.EnumeratePrototypes().Where(objectivePrototype => objectivePrototype.CanBeAssigned(mind)).ToArray();
+ }
+
+ public ObjectivePrototype[] GetRandomObjectives(Mind mind, float maxDifficulty = 3)
+ {
+ var objectives = GetAllPossibleObjectives(mind);
+
+ //to prevent endless loops
+ if(objectives.Length == 0 || objectives.Sum(o => o.Difficulty) == 0f) return objectives;
+
+ var result = new List();
+ var currentDifficulty = 0f;
+ _random.Shuffle(objectives);
+ while (currentDifficulty < maxDifficulty)
+ {
+ foreach (var objective in objectives)
+ {
+ if (!_random.Prob(objective.Probability)) continue;
+
+ result.Add(objective);
+ currentDifficulty += objective.Difficulty;
+ if (currentDifficulty >= maxDifficulty) break;
+ }
+ }
+
+ if (currentDifficulty > maxDifficulty) //will almost always happen
+ {
+ result.Pop();
+ }
+
+ return result.ToArray();
+ }
+ }
+}
diff --git a/Content.Server/Objectives/Requirements/SuspicionTraitorRequirement.cs b/Content.Server/Objectives/Requirements/SuspicionTraitorRequirement.cs
new file mode 100644
index 0000000000..183e24a2c6
--- /dev/null
+++ b/Content.Server/Objectives/Requirements/SuspicionTraitorRequirement.cs
@@ -0,0 +1,17 @@
+using Content.Server.Mobs;
+using Content.Server.Mobs.Roles.Suspicion;
+using Content.Server.Objectives.Interfaces;
+using Robust.Shared.Serialization;
+
+namespace Content.Server.Objectives.Requirements
+{
+ public class SuspicionTraitorRequirement : IObjectiveRequirement
+ {
+ public void ExposeData(ObjectSerializer serializer){}
+
+ public bool CanBeAssigned(Mind mind)
+ {
+ return mind.HasRole();
+ }
+ }
+}
diff --git a/Content.Server/ServerContentIoC.cs b/Content.Server/ServerContentIoC.cs
index ad69775abf..9f150e83df 100644
--- a/Content.Server/ServerContentIoC.cs
+++ b/Content.Server/ServerContentIoC.cs
@@ -14,6 +14,8 @@ using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Interfaces.PDA;
+using Content.Server.Objectives;
+using Content.Server.Objectives.Interfaces;
using Content.Server.PDA;
using Content.Server.Preferences;
using Content.Server.Sandbox;
@@ -49,6 +51,7 @@ namespace Content.Server
IoCManager.Register();
IoCManager.Register();
IoCManager.Register();
+ IoCManager.Register();
IoCManager.Register();
IoCManager.Register();
IoCManager.Register();
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index ec92c5eb36..09cb30317d 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -3,7 +3,7 @@
$(TargetFramework)
- 8
+ 9
false
false
../bin/Content.Shared
diff --git a/Content.Shared/GameObjects/Components/Actor/SharedCharacterInfoComponent.cs b/Content.Shared/GameObjects/Components/Actor/SharedCharacterInfoComponent.cs
new file mode 100644
index 0000000000..9e20f4f86e
--- /dev/null
+++ b/Content.Shared/GameObjects/Components/Actor/SharedCharacterInfoComponent.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using Content.Shared.Objectives;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.GameObjects.Components.Actor
+{
+ public class SharedCharacterInfoComponent : Component
+ {
+ public override string Name => "CharacterInfo";
+ public override uint? NetID => ContentNetIDs.CHARACTERINFO;
+
+ [Serializable, NetSerializable]
+ protected class RequestCharacterInfoMessage : ComponentMessage
+ {
+ public RequestCharacterInfoMessage()
+ {
+ Directed = true;
+ }
+ }
+
+ [Serializable, NetSerializable]
+ protected class CharacterInfoMessage : ComponentMessage
+ {
+ public readonly Dictionary> Objectives;
+ public readonly string JobTitle;
+
+ public CharacterInfoMessage(string jobTitle, Dictionary> objectives)
+ {
+ Directed = true;
+ JobTitle = jobTitle;
+ Objectives = objectives;
+ }
+ }
+ }
+}
diff --git a/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs b/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs
index bd1c506b7e..9e04ef0dd4 100644
--- a/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
@@ -59,7 +59,9 @@ namespace Content.Shared.GameObjects.Components
public bool BreakOnTargetMove { get; }
- public ClientDoAfter(byte id, EntityCoordinates userGrid, EntityCoordinates targetGrid, TimeSpan startTime, float delay, bool breakOnUserMove, bool breakOnTargetMove, EntityUid targetUid = default)
+ public float MovementThreshold { get; }
+
+ public ClientDoAfter(byte id, EntityCoordinates userGrid, EntityCoordinates targetGrid, TimeSpan startTime, float delay, bool breakOnUserMove, bool breakOnTargetMove, float movementThreshold, EntityUid targetUid = default)
{
ID = id;
UserGrid = userGrid;
@@ -68,6 +70,7 @@ namespace Content.Shared.GameObjects.Components
Delay = delay;
BreakOnUserMove = breakOnUserMove;
BreakOnTargetMove = breakOnTargetMove;
+ MovementThreshold = movementThreshold;
TargetUid = targetUid;
}
}
diff --git a/Content.Shared/GameObjects/ContentNetIDs.cs b/Content.Shared/GameObjects/ContentNetIDs.cs
index a2d20277d0..8e1c89dd5e 100644
--- a/Content.Shared/GameObjects/ContentNetIDs.cs
+++ b/Content.Shared/GameObjects/ContentNetIDs.cs
@@ -84,6 +84,7 @@
public const uint PULLABLE = 1078;
public const uint GAS_TANK = 1079;
public const uint SINGULARITY = 1080;
+ public const uint CHARACTERINFO = 1081;
// Net IDs for integration tests.
public const uint PREDICTION_TEST = 10001;
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
index 8d59168e75..974ba1014a 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
@@ -49,7 +49,8 @@ namespace Content.Shared.GameObjects.EntitySystems
base.Shutdown();
}
- protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, IPhysicsComponent physics)
+ //TODO: reorganize this to make more logical sense
+ protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, IPhysicsComponent physics)
{
physics.EnsureController();
@@ -70,14 +71,14 @@ namespace Content.Shared.GameObjects.EntitySystems
// TODO: movement check.
var (walkDir, sprintDir) = mover.VelocityDir;
var combined = walkDir + sprintDir;
- if (combined.LengthSquared < 0.001 || !ActionBlockerSystem.CanMove(mover.Owner) && !weightless)
+ if (combined.LengthSquared < 0.001 || !ActionBlockerSystem.CanMove(mover.Owner) && !weightless)
{
if (physics.TryGetController(out MoverController controller))
{
controller.StopMoving();
}
}
- else
+ else if (ActionBlockerSystem.CanMove(mover.Owner))
{
if (weightless)
{
diff --git a/Content.Shared/Objectives/ConditionInfo.cs b/Content.Shared/Objectives/ConditionInfo.cs
new file mode 100644
index 0000000000..de0e7f934b
--- /dev/null
+++ b/Content.Shared/Objectives/ConditionInfo.cs
@@ -0,0 +1,23 @@
+using System;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Objectives
+{
+ [Serializable, NetSerializable]
+ public class ConditionInfo
+ {
+ public string Title { get; }
+ public string Description { get; }
+ public SpriteSpecifier SpriteSpecifier { get; }
+ public float Progress { get; }
+
+ public ConditionInfo(string title, string description, SpriteSpecifier spriteSpecifier, float progress)
+ {
+ Title = title;
+ Description = description;
+ SpriteSpecifier = spriteSpecifier;
+ Progress = progress;
+ }
+ }
+}
diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
index f82a4628d7..74b5abb421 100644
--- a/Content.Tests/Content.Tests.csproj
+++ b/Content.Tests/Content.Tests.csproj
@@ -3,7 +3,7 @@
$(TargetFramework)
- 8
+ 9
false
false
..\bin\Content.Tests\
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index ab4aa3775f..0c77b3caab 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -1,7 +1,7 @@
meta:
format: 2
- name: DemoStation
- author: Space-Wizards
+ name: Saltern
+ author: Buncha sickass mfers
postmapinit: false
tilemap:
0: space
@@ -474,7 +474,7 @@ entities:
rot: -1.5707963267948966 rad
type: Transform
- uid: 52
- type: ShoesCoder
+ type: ClothingUnderSocksCoder
components:
- parent: 855
pos: 47.437466,-6.6893435
@@ -490,14 +490,14 @@ entities:
- useSound: /Audio/Items/jaws_pry.ogg
type: Tool
- uid: 54
- type: GlovesLatex
+ type: ClothingHandsGlovesLatex
components:
- parent: 855
pos: 22.086878,-4.4133806
rot: -1.5707963267948966 rad
type: Transform
- uid: 55
- type: GlovesLatex
+ type: ClothingHandsGlovesLatex
components:
- parent: 855
pos: 21.618128,-4.4133806
@@ -712,14 +712,14 @@ entities:
rot: -1.5707963267948966 rad
type: Transform
- uid: 82
- type: Bling
+ type: ClothingNeckBling
components:
- parent: 855
pos: -2.861164,18.612366
rot: -1.5707963267948966 rad
type: Transform
- uid: 83
- type: Bling
+ type: ClothingNeckBling
components:
- parent: 855
pos: -2.564289,18.643616
@@ -971,19 +971,19 @@ entities:
type: Content.Server.GameObjects.ContainerSlot
type: ContainerContainer
- uid: 117
- type: HatHardhatYellow
+ type: ClothingHeadHatHardhatYellow
components:
- parent: 855
pos: 31.357727,-4.36431
type: Transform
- uid: 118
- type: HatHardhatWhite
+ type: ClothingHeadHatHardhatWhite
components:
- parent: 855
pos: 31.623352,-4.14556
type: Transform
- uid: 119
- type: HatHardhatRed
+ type: ClothingHeadHatHardhatRed
components:
- parent: 855
pos: 31.201477,-4.05181
@@ -47190,7 +47190,7 @@ entities:
rot: -1.5707963267948966 rad
type: Transform
- uid: 4144
- type: MaskJoy
+ type: ClothingMaskJoy
components:
- parent: 855
pos: 13.418978,24.555822
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index 509128acc1..9a52655710 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -1977,7 +1977,7 @@ entities:
- anchored: False
type: Physics
- uid: 225
- type: OuterclothingVest
+ type: ClothingOuterVest
components:
- parent: 216
pos: 1.412994,7.507263
@@ -2973,7 +2973,7 @@ entities:
rot: -1.5707963267949 rad
type: Transform
- uid: 361
- type: OuterclothingVest
+ type: ClothingOuterVest
components:
- parent: 216
pos: 0.5223687,7.507263
@@ -3874,7 +3874,7 @@ entities:
- anchored: False
type: Physics
- uid: 473
- type: UniformEngineering
+ type: ClothingUniformJumpsuitEngineering
components:
- parent: 216
pos: -0.6474335,-10.27245
@@ -3883,7 +3883,7 @@ entities:
- anchored: False
type: Physics
- uid: 474
- type: GasMaskClothing
+ type: ClothingMaskGas
components:
- parent: 216
pos: -0.2880585,-10.69432
@@ -3892,7 +3892,7 @@ entities:
- anchored: False
type: Physics
- uid: 475
- type: OuterclothingVest
+ type: ClothingOuterVest
components:
- parent: 216
pos: -0.9130585,-10.66307
@@ -3901,7 +3901,7 @@ entities:
- anchored: False
type: Physics
- uid: 476
- type: UtilityBeltClothingFilled
+ type: ClothingBeltUtilityFilled
components:
- parent: 216
pos: -1.895102,-10.33495
@@ -3914,7 +3914,7 @@ entities:
type: Robust.Server.GameObjects.Components.Container.Container
type: ContainerContainer
- uid: 477
- type: UtilityBeltClothingFilled
+ type: ClothingBeltUtilityFilled
components:
- parent: 216
pos: -1.770102,-10.63182
@@ -3972,7 +3972,7 @@ entities:
type: Robust.Server.GameObjects.Components.Container.Container
type: ContainerContainer
- uid: 481
- type: BackpackClothing
+ type: ClothingBackpack
components:
- parent: 216
pos: -5.089887,7.591276
@@ -3985,7 +3985,7 @@ entities:
type: Robust.Server.GameObjects.Components.Container.Container
type: ContainerContainer
- uid: 482
- type: BackpackClothing
+ type: ClothingBackpack
components:
- parent: 216
pos: -4.683637,7.606901
@@ -3998,7 +3998,7 @@ entities:
type: Robust.Server.GameObjects.Components.Container.Container
type: ContainerContainer
- uid: 483
- type: GlovesBlack
+ type: ClothingHandsGlovesColorBlack
components:
- parent: 216
pos: -3.386762,7.466276
@@ -4348,7 +4348,7 @@ entities:
rot: -1.5707963267949 rad
type: Transform
- uid: 527
- type: GlovesLeather
+ type: ClothingHandsGlovesLeather
components:
- parent: 216
pos: -4.332221,4.64238
@@ -4357,7 +4357,7 @@ entities:
- anchored: False
type: Physics
- uid: 528
- type: GlovesLeather
+ type: ClothingHandsGlovesLeather
components:
- parent: 216
pos: -3.519721,4.64238
@@ -4366,7 +4366,7 @@ entities:
- anchored: False
type: Physics
- uid: 529
- type: GlovesLeather
+ type: ClothingHandsGlovesLeather
components:
- parent: 216
pos: -2.597846,4.61113
diff --git a/Resources/Prototypes/Catalog/Fills/backpack.yml b/Resources/Prototypes/Catalog/Fills/backpack.yml
index d97dc2c03e..842d8a12d9 100644
--- a/Resources/Prototypes/Catalog/Fills/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/backpack.yml
@@ -1,7 +1,7 @@
- type: entity
abstract: true
- parent: BackpackClothing
- id: BackpackClothingFilled
+ parent: ClothingBackpack
+ id: ClothingBackpackFilled
components:
- type: StorageFill
contents:
@@ -9,8 +9,8 @@
- type: entity
abstract: true
- parent: ClownPack
- id: ClownPackFilled
+ parent: ClothingBackpackClown
+ id: ClothingBackpackClownFilled
components:
- type: StorageFill
contents:
@@ -18,8 +18,8 @@
- type: entity
abstract: true
- parent: SecPack
- id: SecPackFilled
+ parent: ClothingBackpackSecurity
+ id: ClothingBackpackSecurityFilled
components:
- type: StorageFill
contents:
@@ -29,8 +29,8 @@
- type: entity
abstract: true
- parent: BackpackMedical
- id: BackpackMedicalFilled
+ parent: ClothingBackpackMedical
+ id: ClothingBackpackMedicalFilled
components:
- type: StorageFill
contents:
@@ -38,8 +38,8 @@
- type: entity
abstract: true
- parent: BackpackCaptain
- id: BackpackCaptainFilled
+ parent: ClothingBackpackCaptain
+ id: ClothingBackpackCaptainFilled
components:
- type: StorageFill
contents:
@@ -49,8 +49,8 @@
- type: entity
abstract: true
- parent: BackpackEngineering
- id: BackpackEngineeringFilled
+ parent: ClothingBackpackEngineering
+ id: ClothingBackpackEngineeringFilled
components:
- type: StorageFill
contents:
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/filled_belts.yml b/Resources/Prototypes/Catalog/Fills/belt.yml
similarity index 72%
rename from Resources/Prototypes/Entities/Clothing/Belt/filled_belts.yml
rename to Resources/Prototypes/Catalog/Fills/belt.yml
index 4959eac56f..e24225aeea 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/filled_belts.yml
+++ b/Resources/Prototypes/Catalog/Fills/belt.yml
@@ -1,6 +1,6 @@
- type: entity
- id: UtilityBeltClothingFilled #Change to ClothingBeltUtilityFilled
- parent: UtilityBeltClothing #Change to ClothingBeltUtility
+ id: ClothingBeltUtilityFilled
+ parent: ClothingBeltUtility
description: "Holds tools."
suffix: Filled
components:
@@ -13,17 +13,6 @@
- name: Welder
- name: Multitool
-- type: entity
- id: UtilityBeltClothingFilledEvent
- parent: UtilityBeltClothing
- suffix: Filled
- components:
- - type: StorageFill
- contents:
- - name: Crowbar
- - name: Screwdriver
- - name: Multitool
-
- type: entity
id: ClothingBeltChiefEngineerFilled
parent: ClothingBeltChiefEngineer
@@ -44,7 +33,6 @@
components:
- type: StorageFill
contents:
- - name: SecGlasses
- name: GrenadeFlashBang
- name: GrenadeFlashBang
- name: Stunbaton
@@ -60,6 +48,6 @@
contents:
- name: Soap #Make a soap group and pick between when i'm not lazy
- name: SprayBottleSpaceCleaner
- - name: # GrenadeChem
- - name: # GrenadeChem
+ #- name: GrenadeChem
+ #- name: GrenadeChem
- name: FlashlightLantern
diff --git a/Resources/Prototypes/Catalog/Fills/duffel.yml b/Resources/Prototypes/Catalog/Fills/duffel.yml
new file mode 100644
index 0000000000..b86c279f9d
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/duffel.yml
@@ -0,0 +1,16 @@
+- type: entity
+ parent: ClothingBackpackDuffelMedical
+ id: ClothingBackpackDuffelSurgeryFilled
+ name: surgical duffel bag
+ description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools."
+ components:
+ - type: StorageFill
+ contents:
+ - name: Hemostat
+ - name: BoneSaw
+ - name: Drill
+ - name: Cautery
+ - name: Retractor
+ - name: Scalpel
+ - type: Storage
+ capacity: 30
diff --git a/Resources/Prototypes/Catalog/Fills/lockers.yml b/Resources/Prototypes/Catalog/Fills/lockers.yml
index 1be31aef1b..f2b3c447b9 100644
--- a/Resources/Prototypes/Catalog/Fills/lockers.yml
+++ b/Resources/Prototypes/Catalog/Fills/lockers.yml
@@ -5,7 +5,7 @@
components:
- type: StorageFill
contents:
- - name: OuterclothingHazard
+ - name: ClothingOuterVestHazard
prob: 0.4
- name: FlashlightLantern
prob: 0.7
@@ -21,11 +21,11 @@
prob: 0.7
- name: Multitool
prob: 0.2
- - name: UtilityBeltClothing
+ - name: ClothingBeltUtility
prob: 0.2
- - name: GlovesYellow
+ - name: ClothingHandsGlovesColorYellow
prob: 0.05
- - name: HatHardhatRed
+ - name: ClothingHeadHatHardhatRed
prob: 0.4
- name: ApcExtensionCableStack
prob: 0.3
@@ -43,9 +43,9 @@
contents:
- name: ToolboxEmergencyFilled
prob: 0.4
- - name: BreathMaskClothing
+ - name: ClothingMaskBreath
prob: 0.4
- - name: BreathMaskClothing
+ - name: ClothingMaskBreath
prob: 0.25
- name: EmergencyOxygenTankFilled
prob: 0.4
@@ -79,9 +79,9 @@
components:
- type: StorageFill
contents:
- - name: HelmetHardsuitCE
- - name: HardsuitCE
- - name: BreathMaskClothing
+ - name: ClothingHeadHelmetHardsuitEngineeringWhite
+ - name: ClothingOuterHardsuitEngineeringWhite
+ - name: ClothingMaskBreath
- name: OxygenTankFilled
- type: entity
@@ -101,9 +101,9 @@
components:
- type: StorageFill
contents:
- - name: HelmetHardsuitAtmos
- - name: HardsuitAtmos
- - name: BreathMaskClothing
+ - name: ClothingHeadHelmetHardsuitAtmos
+ - name: ClothingOuterHardsuitAtmos
+ - name: ClothingMaskBreath
- name: OxygenTankFilled
- type: entity
@@ -113,9 +113,9 @@
components:
- type: StorageFill
contents:
- - name: HelmetHardsuitEngineering
- - name: HardsuitEngineering
- - name: BreathMaskClothing
+ - name: ClothingHeadHelmetHardsuitEngineering
+ - name: ClothingOuterHardsuitEngineering
+ - name: ClothingMaskBreath
- name: OxygenTankFilled
- type: entity
@@ -135,7 +135,7 @@
components:
- type: StorageFill
contents:
- - name: GlovesLatex
+ - name: ClothingHandsGlovesLatex
prob: 0.4
- type: entity
@@ -241,7 +241,7 @@
components:
- type: StorageFill
contents:
- - name: GlovesLatex
+ - name: ClothingHandsGlovesLatex
prob: 0.4
- type: entity
@@ -328,7 +328,7 @@
contents:
- name: RedOxygenTankFilled
prob: 0.6
- - name: OuterclothingFiresuit
+ - name: ClothingOuterSuitFire
prob: 0.75
- type: entity
diff --git a/Resources/Prototypes/Catalog/VendingMachines/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/chapel.yml
index 62b47d6caa..594b10002c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/chapel.yml
@@ -4,13 +4,10 @@
description: "A vending machine containing religious supplies and clothing. A label reads: \"A holy vendor for a pious man.\""
spriteName: chapel
startingInventory:
- OuterclothingChaplainhoodie: 1
- OuterclothingAcolyte: 4
- OuterclothingBedsheet: 4
- OuterclothingBlackhoodie: 1
- OuterclothingChurchcoat: 1
- OuterclothingCultrobes: 1
- OuterclothingCultarmour: 1
- HatChaplainHood: 1
- HatCulthood: 1
- HatCultHelmet: 1
+ ClothingOuterHoodieChaplain: 1
+ ClothingOuterHoodieBlack: 1
+ ClothingOuterRobesCult: 1
+ ClothingOuterArmorCult: 1
+ ClothingHeadHatHoodChaplainHood: 1
+ ClothingHeadHatHoodCulthood: 1
+ ClothingHeadHelmetCult: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/engivend.yml
index 827161b9f8..9db79d4ed0 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/engivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/engivend.yml
@@ -5,6 +5,6 @@
animationDuration: 2.1
spriteName: engivend
startingInventory:
- MesonGlasses: 4
+ ClothingEyesGlassesMeson: 4
Multitool: 4
PowerCellSmallHigh: 5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/hats.yml b/Resources/Prototypes/Catalog/VendingMachines/hats.yml
index 05b4783a4c..0d670016fe 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/hats.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/hats.yml
@@ -4,22 +4,19 @@
description: A vending machine containing hats.
spriteName: hats
startingInventory:
- HatBandana: 3
- HatBandblack: 3
- HatBandblue: 3
- HatBandbotany: 3
- HatBandcamo: 3
- HatBandgreen: 3
- HatBandred: 3
- HatBandskull: 3
- HatBearpelt: 3
- HatBeret: 3
- HatBluesoft: 3
- HatBluesoftFlipped: 3
- HatBowler: 3
- HatBunny: 3
- HatCake: 3
- HatCargosoft: 3
- HatCentcom: 3
- HatChefhat: 3
- HatCowboy: 3
+ HatBandBlack: 3
+ HatBandBlue: 3
+ HatBandBotany: 3
+ HatBandGreen: 3
+ HatBandRed: 3
+ HatBandSkull: 3
+ ClothingHeadHatBearpelt: 3
+ ClothingHeadHatBeret: 3
+ ClothingHeadHatBluesoft: 3
+ ClothingHeadHatBluesoftFlipped: 3
+ ClothingHeadHatBowlerHat: 3
+ ClothingHeadHatBunny: 3
+ ClothingHeadHatCake: 3
+ ClothingHeadHatCargosoft: 3
+ ClothingHeadHatCentcom: 3
+ ClothingHeadHatChef: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/shoes.yml b/Resources/Prototypes/Catalog/VendingMachines/shoes.yml
index fc7a4b35bf..fa80b492bf 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/shoes.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/shoes.yml
@@ -4,7 +4,7 @@
description: A vending machine containing footwear.
spriteName: shoes
startingInventory:
- ShoesWhite: 3
- ShoesClown: 3
- ShoesJackboots: 3
- ShoesBrown: 3
+ ClothingShoesColorWhite: 3
+ ClothingShoesClown: 3
+ ClothingShoesBootsJack: 3
+ ClothingShoesColorBrown: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/suits.yml b/Resources/Prototypes/Catalog/VendingMachines/suits.yml
index e4f2ab5631..676338d6a2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/suits.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/suits.yml
@@ -4,12 +4,11 @@
description: A vending machine containing jumpsuits and dress garments.
spriteName: suits
startingInventory:
- UniformJanitor: 3
- UniformColorGrey: 3
- UniformEngineering: 3
- UniformAssistant: 3
- UniformClown: 3
- UniformSec: 3
- UniformChef: 3
- UniformCaptain: 3
+ ClothingUniformJumpsuitJanitor: 3
+ ClothingUniformJumpsuitColorGrey: 3
+ ClothingUniformJumpsuitEngineering: 3
+ ClothingUniformJumpsuitClown: 3
+ ClothingUniformJumpsuitSec: 3
+ ClothingUniformJumpsuitChef: 3
+ ClothingUniformJumpsuitCaptain: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 53daf4f114..4ce83ff158 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -1,6 +1,6 @@
- type: entity
parent: Clothing
- id: BackpackClothing
+ id: ClothingBackpack
name: backpack
description: You wear this on your back and put items into it.
components:
@@ -17,106 +17,96 @@
capacity: 100
- type: entity
- parent: BackpackClothing
- id: ClownPack
+ parent: ClothingBackpack
+ id: ClothingBackpackClown
name: giggles von honkerton
description: It's a backpack made by Honk! Co.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/clown.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/clown.rsi
- type: entity
- parent: BackpackClothing
- id: SecPack
+ parent: ClothingBackpack
+ id: ClothingBackpackSecurity
name: security backpack
description: It's a very robust backpack.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/security.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/security.rsi
- type: entity
- parent: BackpackClothing
- id: BackpackEngineering
+ parent: ClothingBackpack
+ id: ClothingBackpackEngineering
name: engineering backpack
description: It's a tough backpack for the daily grind of station life.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/engineering.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/engineering.rsi
- type: entity
- parent: BackpackClothing
- id: BackpackMedical
+ parent: ClothingBackpack
+ id: ClothingBackpackMedical
name: medical backpack
description: It's a backpack especially designed for use in a sterile environment.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/medical.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/medical.rsi
- type: entity
- parent: BackpackClothing
- id: BackpackCaptain
+ parent: ClothingBackpack
+ id: ClothingBackpackCaptain
name: captain's backpack
description: It's a special backpack made exclusively for Nanotrasen officers.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/captain.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/captain.rsi
-# Inhands/On mob aren't working until I refactor this file -Swept
-
- type: entity
- parent: BackpackClothing
- id: BackpackMime
+ parent: ClothingBackpack
+ id: ClothingBackpackMime
name: mime backpack
description: A silent backpack made for those silent workers. Silence Co.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/mime.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/mime.rsi
- type: entity
- parent: BackpackClothing
- id: BackpackChemistry
+ parent: ClothingBackpack
+ id: ClothingBackpackChemistry
name: chemistry backpack
description: A backpack specially designed to repel stains and hazardous liquids.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/chemistry.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/chemistry.rsi
- type: entity
- parent: BackpackClothing
- id: BackpackBotany
+ parent: ClothingBackpack
+ id: ClothingBackpackBotany
name: botany backpack
description: It's a backpack made of all-natural fibers.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/botany.rsi
- state: icon
- type: Clothing
sprite: Clothing/Back/Backpacks/botany.rsi
- type: entity
- parent: BackpackClothing
- id: BackpackHolding
+ parent: ClothingBackpack
+ id: ClothingBackpackHolding
name: bag of holding
description: A backpack that opens into a localized pocket of bluespace.
components:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 53113042e4..b9a4cfee00 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -1,7 +1,7 @@
- type: entity
parent: Clothing
- id: Duffelbag
- name: duffelbag
+ id: ClothingBackpackDuffel
+ name: duffel bag
description: "A large duffel bag for holding extra things."
components:
- type: Sprite
@@ -17,97 +17,67 @@
capacity: 100
- type: entity
- parent: Duffelbag
- id: DuffelbagEngineering
- name: engineering duffelbag
+ parent: ClothingBackpackDuffel
+ id: ClothingBackpackDuffelEngineering
+ name: engineering duffel bag
description:
components:
- type: Sprite
- sprite: Clothing/Back/Duffels/duffel_eng.rsi
- state: icon
+ sprite: Clothing/Back/Duffels/engineering.rsi
- type: Clothing
- sprite: Clothing/Back/Duffels/duffel_eng.rsi
+ sprite: Clothing/Back/Duffels/engineering.rsi
- type: entity
- parent: Duffelbag
- id: DuffelbagMedical
- name: medical duffelbag
+ parent: ClothingBackpackDuffel
+ id: ClothingBackpackDuffelMedical
+ name: medical duffel bag
description: "A large duffel bag for holding extra medical supplies."
components:
- type: Sprite
- sprite: Clothing/Back/Duffels/duffel_med.rsi
- state: icon
+ sprite: Clothing/Back/Duffels/medical.rsi
- type: Clothing
- sprite: Clothing/Back/Duffels/duffel_med.rsi
+ sprite: Clothing/Back/Duffels/medical.rsi
- type: entity
- parent: Duffelbag
- id: DuffelbagCaptain
- name: captain duffelbag
+ parent: ClothingBackpackDuffel
+ id: ClothingBackpackDuffelCaptain
+ name: captain's duffel bag
description: "A large duffel bag for holding extra captainly goods."
components:
- type: Sprite
- sprite: Clothing/Back/Duffels/duffel_cap.rsi
- state: icon
+ sprite: Clothing/Back/Duffels/captain.rsi
- type: Clothing
- sprite: Clothing/Back/Duffels/duffel_cap.rsi
+ sprite: Clothing/Back/Duffels/captain.rsi
- type: entity
- parent: Duffelbag
- id: DuffelbagClown
- name: clown duffelbag
+ parent: ClothingBackpackDuffel
+ id: ClothingBackpackDuffelClown
+ name: clown duffel bag
description: "A large duffel bag for holding extra honk goods."
components:
- type: Sprite
- sprite: Clothing/Back/Duffels/duffel_clown.rsi
- state: icon
+ sprite: Clothing/Back/Duffels/clown.rsi
- type: Clothing
- sprite: Clothing/Back/Duffels/duffel_clown.rsi
+ sprite: Clothing/Back/Duffels/clown.rsi
- type: entity
- parent: Duffelbag
- id: DuffelbagSecurity
- name: security duffelbag
+ parent: ClothingBackpackDuffel
+ id: ClothingBackpackDuffelSecurity
+ name: security duffel bag
description: "A large duffel bag for holding extra security related goods."
components:
- type: Sprite
- sprite: Clothing/Back/Duffels/duffel_sec.rsi
- state: icon
+ sprite: Clothing/Back/Duffels/security.rsi
- type: Clothing
- sprite: Clothing/Back/Duffels/duffel_sec.rsi
+ sprite: Clothing/Back/Duffels/security.rsi
- type: entity
- parent: Duffelbag
- id: DuffelbagSyndicate
- name: syndicate duffelbag
+ parent: ClothingBackpackDuffel
+ id: ClothingBackpackDuffelSyndicate
+ name: syndicate duffel bag
description: "A large duffel bag for holding various traitor goods."
components:
- type: Sprite
- sprite: Clothing/Back/Duffels/duffel_syn.rsi
- state: icon
+ sprite: Clothing/Back/Duffels/syndicate.rsi
- type: Clothing
- sprite: Clothing/Back/Duffels/duffel_syn.rsi
-
-# FILLED
-
-- type: entity
- parent: Duffelbag
- id: DuffelbagSurgeryFilled
- name: surgical duffelbag
- description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools."
- components:
- - type: Sprite
- sprite: Clothing/Back/Duffels/duffel_med.rsi
- state: icon
- - type: Clothing
- sprite: Clothing/Back/Duffels/duffel_med.rsi
- - type: StorageFill
- contents:
- - name: Hemostat
- - name: BoneSaw
- - name: Drill
- - name: Cautery
- - name: Retractor
- - name: Scalpel
- - type: Storage
- capacity: 30
+ sprite: Clothing/Back/Duffels/syndicate.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml b/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml
index 489c820463..6164e8cc28 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml
@@ -29,7 +29,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/oxygen.rsi
- state: icon
- type: GasTank
outputPressure: 21.27825
air:
@@ -65,7 +64,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/yellow.rsi
- state: icon
- type: Clothing
sprite: Objects/Tanks/yellow.rsi
Slots:
@@ -81,7 +79,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/yellow.rsi
- state: icon
- type: Clothing
sprite: Objects/Tanks/yellow.rsi
Slots:
@@ -97,7 +94,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/red.rsi
- state: icon
- type: Clothing
sprite: Objects/Tanks/red.rsi
Slots:
@@ -113,7 +109,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/red.rsi
- state: icon
- type: Clothing
sprite: Objects/Tanks/red.rsi
Slots:
@@ -129,7 +124,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/emergency.rsi
- state: icon
- type: GasTank
outputPressure: 21.27825
air:
@@ -166,7 +160,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/emergency_yellow.rsi
- state: icon
- type: GasTank
outputPressure: 21.27825
air:
@@ -203,7 +196,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/emergency_double.rsi
- state: icon
- type: GasTank
outputPressure: 21.27825
air:
@@ -240,7 +232,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/generic.rsi
- state: icon
- type: GasTank
outputPressure: 101.325
air:
@@ -261,7 +252,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/generic.rsi
- state: icon
- type: GasTank
outputPressure: 101.325
air:
@@ -285,7 +275,6 @@
components:
- type: Sprite
sprite: Objects/Tanks/phoron.rsi
- state: icon
- type: GasTank
outputPressure: 101.325
air:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index 6fcbe928c4..25ee88fc3b 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -1,6 +1,6 @@
- type: entity
parent: Clothing
- id: SatchelBase
+ id: ClothingBackpackSatchel
name: satchel
description: A trendy looking satchel.
components:
@@ -17,85 +17,78 @@
capacity: 100
- type: entity
- parent: SatchelBase
- id: SatchelEngineering
+ parent: ClothingBackpackSatchel
+ id: ClothingBackpackSatchelEngineering
name: engineering satchel
description: A tough satchel with extra pockets.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/satchel_engineering.rsi
- state: icon
+ sprite: Clothing/Back/Satchels/engineering.rsi
- type: Clothing
- sprite: Clothing/Back/Satchels/satchel_engineering.rsi
+ sprite: Clothing/Back/Satchels/engineering.rsi
- type: entity
- parent: SatchelBase
- id: SatchelMedical
+ parent: ClothingBackpackSatchel
+ id: ClothingBackpackSatchelMedical
name: medical satchel
description: A sterile satchel used in medical departments.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/satchel_medical.rsi
- state: icon
+ sprite: Clothing/Back/Satchels/medical.rsi
- type: Clothing
- sprite: Clothing/Back/Satchels/satchel_medical.rsi
+ sprite: Clothing/Back/Satchels/medical.rsi
- type: entity
- parent: SatchelBase
- id: SatchelChemistry
+ parent: ClothingBackpackSatchel
+ id: ClothingBackpackSatchelChemistry
name: chemistry satchel
description: A sterile satchel with chemist colours.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
- state: icon
+ sprite: Clothing/Back/Satchels/chemistry.rsi
- type: Clothing
- sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
+ sprite: Clothing/Back/Satchels/chemistry.rsi
- type: entity
- parent: SatchelBase
- id: SatchelScience
+ parent: ClothingBackpackSatchel
+ id: ClothingBackpackSatchelScience
name: science satchel
description: Useful for holding research materials.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/satchel_science.rsi
- state: icon
+ sprite: Clothing/Back/Satchels/science.rsi
- type: Clothing
- sprite: Clothing/Back/Satchels/satchel_science.rsi
+ sprite: Clothing/Back/Satchels/science.rsi
- type: entity
- parent: SatchelBase
- id: SatchelSecurity
+ parent: ClothingBackpackSatchel
+ id: ClothingBackpackSatchelSecurity
name: security satchel
description: A robust satchel for security related needs.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/satchel_security.rsi
- state: icon
+ sprite: Clothing/Back/Satchels/security.rsi
- type: Clothing
- sprite: Clothing/Back/Satchels/satchel_security.rsi
+ sprite: Clothing/Back/Satchels/security.rsi
- type: entity
- parent: SatchelBase
- id: SatchelCaptain
+ parent: ClothingBackpackSatchel
+ id: ClothingBackpackSatchelCaptain
name: captain's satchel
description: An exclusive satchel for Nanotrasen officers.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/satchel_captain.rsi
- state: icon
+ sprite: Clothing/Back/Satchels/captain.rsi
- type: Clothing
- sprite: Clothing/Back/Satchels/satchel_captain.rsi
+ sprite: Clothing/Back/Satchels/captain.rsi
- type: entity
- parent: SatchelBase
- id: SatchelHydroponics
+ parent: ClothingBackpackSatchel
+ id: ClothingBackpackSatchelHydroponics
name: hydroponics satchel
description: A satchel made of all natural fibers.
components:
- type: Sprite
- sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
- state: icon
+ sprite: Clothing/Back/Satchels/hydroponics.rsi
- type: Clothing
- sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
+ sprite: Clothing/Back/Satchels/hydroponics.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base.yml b/Resources/Prototypes/Entities/Clothing/Belt/base.yml
new file mode 100644
index 0000000000..47cb05ceb3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base.yml
@@ -0,0 +1,11 @@
+- type: entity
+ parent: Clothing
+ id: ClothingBeltBase
+ abstract: true
+ components:
+ - type: Sprite
+ state: icon
+ - type: Clothing
+ Slots: [belt]
+ size: 50
+ QuickEquip: false
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 201ed2fe0e..e7af7db6e1 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -1,17 +1,3 @@
-# BASE
-- type: entity
- parent: Clothing
- id: ClothingBeltBase
- abstract: true
- components:
- - type: Sprite
- state: icon
- - type: Clothing
- Slots: [belt]
- size: 50
- QuickEquip: false
-
-# CONTENT
- type: entity
parent: ClothingBeltBase
id: ClothingBeltAssault
@@ -41,7 +27,7 @@
- type: entity
parent: ClothingBeltBase
id: ClothingBeltChiefEngineer
- name: the Chief Engineer's toolbelt
+ name: chief's toolbelt
description: "Holds tools, looks snazzy."
components:
- type: Sprite
@@ -168,7 +154,7 @@
- type: entity
parent: ClothingBeltBase
- id: UtilityBeltClothing #Change to ClothingBeltUtility
+ id: ClothingBeltUtility
name: utility belt
description: "Can hold various things."
components:
diff --git a/Resources/Prototypes/Entities/Clothing/Earpieces/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
similarity index 78%
rename from Resources/Prototypes/Entities/Clothing/Earpieces/headsets.yml
rename to Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index c67116c7e7..d4f9a8106a 100644
--- a/Resources/Prototypes/Entities/Clothing/Earpieces/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -1,123 +1,113 @@
- type: entity
parent: Clothing
- id: HeadsetBase
+ id: ClothingHeadset
name: headset
abstract: true
description: An updated, modular intercom that fits over the head. Takes encryption keys.
components:
- type: Headset
+ - type: Sprite
+ state: icon
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/base.rsi
-
- type: entity
- parent: HeadsetBase
- id: HeadsetCargo
+ parent: ClothingHeadset
+ id: ClothingHeadsetCargo
name: cargo headset
description: A headset used by the quartermaster and his slaves.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/cargo.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetCentCom
+ parent: ClothingHeadset
+ id: ClothingHeadsetCentCom
name: centcomm headset
description: A headset used by the upper echelons of Nanotrasen.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/centcom.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetCommand
+ parent: ClothingHeadset
+ id: ClothingHeadsetCommand
name: command headset
description: A headset with a commanding channel.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetEngineering
+ parent: ClothingHeadset
+ id: ClothingHeadsetEngineering
name: engineering headset
description: When the engineers wish to chat like girls.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/engineering.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetMedical
+ parent: ClothingHeadset
+ id: ClothingHeadsetMedical
name: medical headset
description: A headset for the trained staff of the medbay.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medical.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetMedicalScience
+ parent: ClothingHeadset
+ id: ClothingHeadsetMedicalScience
name: medical research headset
description: A headset that is a result of the mating between medical and science.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medicalscience.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetMining
+ parent: ClothingHeadset
+ id: ClothingHeadsetMining
name: mining headset
description: Headset used by shaft miners.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/mining.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetRobotics
+ parent: ClothingHeadset
+ id: ClothingHeadsetRobotics
name: robotics headset
description: Made specifically for the roboticists, who cannot decide between departments.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/robotics.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetScience
+ parent: ClothingHeadset
+ id: ClothingHeadsetScience
name: science headset
description: A sciency headset. Like usual.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/science.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetSecurity
+ parent: ClothingHeadset
+ id: ClothingHeadsetSecurity
name: security headset
description: This is used by your elite security force.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
- state: icon
- type: entity
- parent: HeadsetBase
- id: HeadsetService
+ parent: ClothingHeadset
+ id: ClothingHeadsetService
name: service headset
description: Headset used by the service staff, tasked with keeping the station full, happy and clean.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/service.rsi
- state: icon
diff --git a/Resources/Prototypes/Entities/Clothing/Earpieces/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
similarity index 76%
rename from Resources/Prototypes/Entities/Clothing/Earpieces/headsets_alt.yml
rename to Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
index 9783dee4af..c896f599b3 100644
--- a/Resources/Prototypes/Entities/Clothing/Earpieces/headsets_alt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
@@ -1,61 +1,54 @@
- type: entity
parent: Clothing
- id: HeadsetBaseAlt
+ id: ClothingHeadsetAlt
name: headset
abstract: true
description: An updated, modular intercom that fits over the head. Takes encryption keys.
components:
- type: Headset
+ - type: Sprite
+ state: icon_alt
+ - type: Clothing
+ Slots:
+ - ears
- type: entity
- parent: HeadsetBaseAlt
- id: HeadsetCommandAlt
+ parent: ClothingHeadsetAlt
+ id: ClothingHeadsetAltCommand
name: command overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
- state: icon_alt
- type: Clothing
- Slots:
- - ears
sprite: Clothing/Ears/Headsets/command.rsi
- type: entity
- parent: HeadsetBaseAlt
- id: HeadsetMedicalAlt
+ parent: ClothingHeadsetAlt
+ id: ClothingHeadsetAltMedical
name: medical overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medical.rsi
- state: icon_alt
- type: Clothing
- Slots:
- - ears
sprite: Clothing/Ears/Headsets/medical.rsi
- type: entity
- parent: HeadsetBaseAlt
- id: HeadsetSecurityAlt
+ parent: ClothingHeadsetAlt
+ id: ClothingHeadsetAltSecurity
name: security overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
- state: icon_alt
- type: Clothing
- Slots:
- - ears
sprite: Clothing/Ears/Headsets/security.rsi
- type: entity
- parent: HeadsetBaseAlt
- id: HeadsetSyndicateAlt
+ parent: ClothingHeadsetAlt
+ id: ClothingHeadsetAltSyndicate
name: syndicate overear-headset
description: A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/syndicate.rsi
- state: icon_alt
- type: Clothing
- Slots:
- - ears
sprite: Clothing/Ears/Headsets/syndicate.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base.yml
new file mode 100644
index 0000000000..42d2c9bf83
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/base.yml
@@ -0,0 +1,9 @@
+- type: entity
+ parent: Clothing
+ id: ClothingEyesBase
+ abstract: true
+ components:
+ - type: Sprite
+ state: icon
+ - type: Clothing
+ Slots: [eyes]
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
new file mode 100644
index 0000000000..f69ebf0b50
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -0,0 +1,103 @@
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesBeer
+ name: beer goggles
+ description: A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/beergoggles.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/beergoggles.rsi
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesGar
+ name: gar glasses
+ description: Go beyond impossible and kick reason to the curb!
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/gar.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/gar.rsi
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesGarOrange
+ name: orange gar glasses
+ description: Just who the hell do you think I am?!
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/gar.rsi
+ state: icon-alt
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/gar.rsi
+ HeldPrefix: alt
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesGarGiga
+ name: giga gar glasses
+ description: We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works!
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/gar.rsi
+ state: icon-super
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/gar.rsi
+ HeldPrefix: super
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesMeson
+ name: optical meson scanners
+ description: The pinnacle of modern science, wallhacks in real life
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/meson.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/meson.rsi
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlasses
+ name: glasses
+ description: You want to wear glasses in a game? Imagine rping as physically disabled.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/glasses.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/glasses.rsi
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesSunglasses
+ name: sun glasses
+ description: Useful both for security and cargonia
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesSecurity
+ name: security sunglasses
+ description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Often worn by budget security officers.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/secglasses.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/secglasses.rsi
+
+#Make a scanner category when these actually function and we get the trayson
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesGlassesThermal
+ name: optical thermal scanner
+ description: Thermals in the shape of glasses.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Glasses/thermal.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Glasses/thermal.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
new file mode 100644
index 0000000000..1493c321b9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -0,0 +1,32 @@
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesHudDiagnostic
+ name: diagnostic hud
+ description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Hud/diag.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Hud/diag.rsi
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesHudMedical
+ name: medical hud
+ description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Hud/med.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Hud/med.rsi
+
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesHudSecurity
+ name: security hud
+ description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Hud/sec.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Hud/sec.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
new file mode 100644
index 0000000000..2d0634d589
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
@@ -0,0 +1,10 @@
+- type: entity
+ parent: ClothingEyesBase
+ id: ClothingEyesEyepatch
+ name: eyepatch
+ description: Yarr.
+ components:
+ - type: Sprite
+ sprite: Clothing/Eyes/Misc/eyepatch.rsi
+ - type: Clothing
+ sprite: Clothing/Eyes/Misc/eyepatch.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml b/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
deleted file mode 100644
index a1c8326d53..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-- 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/Glasses/meson_scanners.rsi
- state: meson
-
- - type: Clothing
- sprite: Clothing/Glasses/meson_scanners.rsi
-
-- type: entity
- parent: GlassesBase
- id: SunGlasses
- name: sun glasses
- description: Useful both for security and cargonia
- components:
- - type: Sprite
- sprite: Clothing/Glasses/sunglasses.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Glasses/sunglasses.rsi
-
-- type: entity
- parent: GlassesBase
- id: SecGlasses
- name: security sunglasses
- description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Often worn by budget security officers.
- components:
- - type: Sprite
- sprite: Clothing/Glasses/sunglasses_sec.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Glasses/sunglasses_sec.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
deleted file mode 100644
index 4cbfea652e..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
+++ /dev/null
@@ -1,312 +0,0 @@
-- type: entity
- parent: Clothing
- id: GlovesBase
- abstract: true
- components:
- - type: Sprite
- state: icon
-
- - type: Clothing
- Slots:
- - gloves
-
-- type: entity
- parent: GlovesBase
- id: GlovesBlack
- name: black gloves
- description: Regular black gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/black.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/black.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesBlue
- name: blue gloves
- description: Regular blue gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/blue.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/blue.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesBoxingRed
- name: boxing gloves (red)
- description: Red gloves for competitive boxing.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/boxing.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/boxing.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesBoxingBlue
- name: boxing gloves (blue)
- description: Blue gloves for competitive boxing.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/boxingblue.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/boxingblue.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesBoxingGreen
- name: boxing gloves (green)
- description: Green gloves for competitive boxing.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/boxinggreen.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/boxinggreen.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesBoxingYellow
- name: boxing gloves (yellow)
- description: Yellow gloves for competitive boxing.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/boxingyellow.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/boxingyellow.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesBrown
- name: brown gloves
- description: Regular brown gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/brown.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/brown.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesCaptain
- name: captain gloves
- description: Regal blue gloves, with a nice gold trim. Swanky.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/captain.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/captain.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesGray
- name: grey gloves
- description: Regular grey gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/gray.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/gray.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesGreen
- name: green gloves
- description: Regular green gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/green.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/green.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesIhscombat
- name: IHS combat gloves
- description: These tactical gloves are somewhat fire and impact resistant.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/ihscombat.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/ihscombat.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesLatex
- name: latex gloves
- description: Thin sterile latex gloves.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/latex.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/latex.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesLeather
- name: "botanist's leather gloves"
- description: "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm."
- components:
- - type: Sprite
- sprite: Clothing/Gloves/leather.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/leather.rsi
- HeatResistance: 1400
-
-- type: entity
- parent: GlovesBase
- id: GlovesLightBrown
- name: light brown gloves
- description: Regular light brown gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/lightbrown.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/lightbrown.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesOrange
- name: orange gloves
- description: Regular orange gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/orange.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/orange.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesPowerglove
- name: power gloves
- description: Now I'm playin' with power! Wait, they are turned off.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/powerglove.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/powerglove.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesPowergloveActive
- name: powergloves (active)
- description: Now I'm playin' with power! BAM!
- components:
- - type: Sprite
- sprite: Clothing/Gloves/powerglove_active.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/powerglove_active.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesPurple
- name: purple gloves
- description: Regular purple gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/purple.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/purple.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesRed
- name: red gloves
- description: Regular red gloves that do not keep you from frying.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/red.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/red.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesRobohands
- name: robohands gloves
- description: Beep boop borp!
- components:
- - type: Sprite
- sprite: Clothing/Gloves/robohands.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/robohands.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesSNinja
- name: S ninja gloves
- description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/s_ninja.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/s_ninja.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesSNinjak
- name: S ninjak gloves
- description: These black and red nano-enhanced gloves insulate from electricity and provide fire resistance.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/s_ninjak.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/s_ninjak.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesSNinjan
- name: S ninjan gloves
- description: These black and green nano-enhanced gloves insulate from electricity and provide fire resistance.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/s_ninjan.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/s_ninjan.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesWhite
- name: white gloves
- description: Those gloves look fancy.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/white.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/white.rsi
-
-- type: entity
- parent: GlovesBase
- id: GlovesYellow
- name: insulated gloves
- description: These gloves will protect the wearer from electric shocks.
- components:
- - type: Sprite
- sprite: Clothing/Gloves/yellow.rsi
-
- - type: Clothing
- sprite: Clothing/Gloves/yellow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base.yml b/Resources/Prototypes/Entities/Clothing/Hands/base.yml
new file mode 100644
index 0000000000..0374ad0919
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base.yml
@@ -0,0 +1,9 @@
+- type: entity
+ parent: Clothing
+ id: ClothingHandsBase
+ abstract: true
+ components:
+ - type: Sprite
+ state: icon
+ - type: Clothing
+ Slots: [gloves]
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
new file mode 100644
index 0000000000..4720a49182
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -0,0 +1,120 @@
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorPurple
+ name: purple gloves
+ description: Regular purple gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/purple.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/purple.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorRed
+ name: red gloves
+ description: Regular red gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/red.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/red.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorBlack
+ name: black gloves
+ description: Regular black gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/black.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/black.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorBlue
+ name: blue gloves
+ description: Regular blue gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/blue.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorBrown
+ name: brown gloves
+ description: Regular brown gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/brown.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/brown.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorGray
+ name: grey gloves
+ description: Regular grey gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/gray.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/gray.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorGreen
+ name: green gloves
+ description: Regular green gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/green.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/green.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorLightBrown
+ name: light brown gloves
+ description: Regular light brown gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/lightbrown.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/lightbrown.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorOrange
+ name: orange gloves
+ description: Regular orange gloves that do not keep you from frying.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/orange.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/orange.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorWhite
+ name: white gloves
+ description: Those gloves look fancy.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/white.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/white.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesColorYellow
+ name: insulated gloves
+ description: These gloves will protect the wearer from electric shocks.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/Color/yellow.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/Color/yellow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
new file mode 100644
index 0000000000..34489d77ae
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -0,0 +1,127 @@
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesBoxingRed
+ name: boxing gloves
+ description: Red gloves for competitive boxing.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesBoxingBlue
+ name: blue boxing gloves
+ description: Blue gloves for competitive boxing.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+ state: icon-blue
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+ HeldPrefix: blue
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesBoxingGreen
+ name: green boxing gloves
+ description: Green gloves for competitive boxing.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+ state: icon-green
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+ HeldPrefix: green
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesBoxingYellow
+ name: yellow boxing gloves
+ description: Yellow gloves for competitive boxing.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+ state: icon-yellow
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/boxing.rsi
+ HeldPrefix: yellow
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesCaptain
+ name: captain gloves
+ description: Regal blue gloves, with a nice gold trim. Swanky.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/captain.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/captain.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesIhscombat
+ name: IHS combat gloves
+ description: These tactical gloves are somewhat fire and impact resistant.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/ihscombat.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/ihscombat.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesLatex
+ name: latex gloves
+ description: Thin sterile latex gloves.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/latex.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/latex.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesLeather
+ name: "botanist's leather gloves"
+ description: "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm."
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/leather.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/leather.rsi
+ HeatResistance: 1400
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesPowerglove
+ name: power gloves
+ description: Now I'm playin' with power! Wait, they are turned off. # Use "Now I'm playin' with power! BAM!" for when they're turned on
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/powerglove.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/powerglove.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesRobohands
+ name: robohands gloves
+ description: Beep boop borp!
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/robohands.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/robohands.rsi
+
+- type: entity
+ parent: ClothingHandsBase
+ id: ClothingHandsGlovesSpaceNinja
+ name: space ninja gloves
+ description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.
+ components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/spaceninja.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/spaceninja.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/animals.yml b/Resources/Prototypes/Entities/Clothing/Head/animals.yml
index a0b8b35713..4405f7fce3 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/animals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/animals.yml
@@ -1,131 +1,87 @@
- type: entity
- parent: HatBase
- id: HatMonkey
- name: monkey
- description: That's a monkey head. It has a hole on a mouth to eat bananas.
- components:
- - type: Sprite
- sprite: Clothing/Head/monkey.rsi
-
- - type: Clothing
- sprite: Clothing/Head/monkey.rsi
-
-- type: entity
- parent: HatBase
- id: HatMouseBrown
- name: mouse brown
- description: This is a head of a brown mouse. Squeak!
- components:
- - type: Sprite
- sprite: Clothing/Head/mouse_brown.rsi
-
- - type: Clothing
- sprite: Clothing/Head/mouse_brown.rsi
-
-- type: entity
- parent: HatBase
- id: HatMouseGray
- name: mouse gray
- description: This is a head of a grey mouse. Squeak!
- components:
- - type: Sprite
- sprite: Clothing/Head/mouse_gray.rsi
-
- - type: Clothing
- sprite: Clothing/Head/mouse_gray.rsi
-
-- type: entity
- parent: HatBase
- id: HatMouseWhite
- name: mouse white
- description: This is a head of a white mouse. Squeak!
- components:
- - type: Sprite
- sprite: Clothing/Head/mouse_white.rsi
-
- - type: Clothing
- sprite: Clothing/Head/mouse_white.rsi
-
-- type: entity
- parent: HatBase
- id: HatNymph
- name: nymph
- description: It's a nymph. You can put it on your head.
- components:
- - type: Sprite
- sprite: Clothing/Head/nymph.rsi
-
- - type: Clothing
- sprite: Clothing/Head/nymph.rsi
-
-- type: entity
- parent: HatBase
- id: HatPai-cat
- name: pai-cat
- description: Personal AI in a cat form.
- components:
- - type: Sprite
- sprite: Clothing/Head/pai-cat.rsi
-
- - type: Clothing
- sprite: Clothing/Head/pai-cat.rsi
-
-- type: entity
- parent: HatBase
- id: HatPai-monkey
- name: pai-monkey
- description: Personal AI in a monkey form.
- components:
- - type: Sprite
- sprite: Clothing/Head/pai-monkey.rsi
-
- - type: Clothing
- sprite: Clothing/Head/pai-monkey.rsi
-
-- type: entity
- parent: HatBase
- id: HatPai-mouse
- name: pai-mouse
- description: Personal AI in a mouse form.
- components:
- - type: Sprite
- sprite: Clothing/Head/pai-mouse.rsi
-
- - type: Clothing
- sprite: Clothing/Head/pai-mouse.rsi
-
-- type: entity
- parent: HatBase
- id: HatCatGrey
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalCat
name: grey cat
description: A cute and fluffy head of a grey cat.
components:
- type: Sprite
- sprite: Clothing/Head/cat.rsi
-
+ sprite: Clothing/Head/Animals/cat.rsi
- type: Clothing
- sprite: Clothing/Head/cat.rsi
+ sprite: Clothing/Head/Animals/cat.rsi
- type: entity
- parent: HatBase
- id: HatCatBrown
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalCatBrown
name: brown cat
description: A cute and fluffy head of a brown cat.
components:
- type: Sprite
- sprite: Clothing/Head/cat2.rsi
-
+ sprite: Clothing/Head/Animals/cat2.rsi
- type: Clothing
- sprite: Clothing/Head/cat2.rsi
+ sprite: Clothing/Head/Animals/cat2.rsi
- type: entity
- parent: HatBase
- id: HatCatBlack
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalCatBlack
name: black cat
description: A cute and fluffy head of a black cat.
components:
- type: Sprite
- sprite: Clothing/Head/cat3.rsi
-
+ sprite: Clothing/Head/Animals/cat3.rsi
- type: Clothing
- sprite: Clothing/Head/cat3.rsi
+ sprite: Clothing/Head/Animals/cat3.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalHeadslime
+ name: headslime
+ description: A green, sticky headslime, you put it on your head.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Animals/headslime.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Animals/headslime.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalMonkey
+ name: monkey
+ description: That's a monkey head. It has a hole on a mouth to eat bananas.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Animals/monkey.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Animals/monkey.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalMouseBrown
+ name: mouse brown
+ description: This is a head of a brown mouse. Squeak!
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Animals/mouse_brown.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Animals/mouse_brown.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalMouseGray
+ name: mouse gray
+ description: This is a head of a grey mouse. Squeak!
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Animals/mouse_gray.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Animals/mouse_gray.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatAnimalMouseWhite
+ name: mouse white
+ description: This is a head of a white mouse. Squeak!
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Animals/mouse_white.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Animals/mouse_white.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
new file mode 100644
index 0000000000..93e1dbb836
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -0,0 +1,87 @@
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandBlack
+ name: black bandana
+ description: A black bandana to make you look cool.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/black.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/black.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandBlue
+ name: blue bandana
+ description: A blue bandana to make you look cool.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/blue.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandBotany
+ name: botany bandana
+ description: A botany bandana to make you look cool, made from natural fibers.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/botany.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/botany.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandGold
+ name: gold bandana
+ description: A gold bandana to make you look cool.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/gold.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/gold.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandGreen
+ name: green bandana
+ description: A green bandana to make you look cool.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/green.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/green.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandGrey
+ name: grey bandana
+ description: A grey bandana to make you look cool.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/grey.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/grey.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandRed
+ name: red bandana
+ description: A red bandana to make you look cool.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/red.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/red.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: HatBandSkull
+ name: skull bandana
+ description: A bandana with a skull to make you look even cooler.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Bandanas/skull.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Bandanas/skull.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base.yml b/Resources/Prototypes/Entities/Clothing/Head/base.yml
new file mode 100644
index 0000000000..d35da8e880
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Head/base.yml
@@ -0,0 +1,31 @@
+- type: entity
+ parent: Clothing
+ id: ClothingHeadBase
+ abstract: true
+ components:
+ - type: Clothing
+ Slots:
+ - Helmet
+ - type: Sprite
+ state: icon
+
+- type: entity
+ parent: Clothing
+ id: HatBase
+ abstract: true
+ components:
+ - type: Clothing
+ Slots:
+ - Helmet
+ - type: Sprite
+ state: icon
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHardsuitBase
+ name: base hardsuit helmet
+ abstract: true
+ components:
+ - type: PressureProtection
+ highPressureMultiplier: 0.5
+ lowPressureMultiplier: 100
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
new file mode 100644
index 0000000000..236cfac568
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -0,0 +1,78 @@
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHardhatBase
+ abstract: true
+ components:
+ - type: Sprite
+ layers:
+ - state: icon
+ - state: light-icon
+ shader: unshaded
+ visible: false
+ - type: Clothing
+ HeldPrefix: off
+ ClothingPrefix: off
+ - type: PointLight
+ enabled: false
+ radius: 3
+ - type: LoopingSound
+ - type: Appearance
+ visuals:
+ - type: FlashLightVisualizer
+ - type: HandheldLight
+ - type: PowerCellSlot
+
+- type: entity
+ parent: ClothingHeadHatHardhatBase
+ id: ClothingHeadHatHardhatBlue
+ name: blue hard hat
+ description: A hard hat, painted in blue, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardhats/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardhats/blue.rsi
+
+- type: entity
+ parent: ClothingHeadHatHardhatBase
+ id: ClothingHeadHatHardhatOrange
+ name: orange hard hat
+ description: A hard hat, painted in orange, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardhats/orange.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardhats/orange.rsi
+
+- type: entity
+ parent: ClothingHeadHatHardhatBase
+ id: ClothingHeadHatHardhatRed
+ name: red hard hat
+ description: A hard hat, painted in red, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardhats/red.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardhats/red.rsi
+
+- type: entity
+ parent: ClothingHeadHatHardhatBase
+ id: ClothingHeadHatHardhatWhite
+ name: white hard hat
+ description: A hard hat, painted in white, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardhats/white.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardhats/white.rsi
+
+- type: entity
+ parent: ClothingHeadHatHardhatBase
+ id: ClothingHeadHatHardhatYellow
+ name: yellow hard hat
+ description: A hard hat, painted in yellow, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardhats/yellow.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardhats/yellow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 80968bc20a..f663e3ffd6 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -1,158 +1,163 @@
- type: entity
- parent: HatBase
- id: HelmetHardsuitBase
- name: base hardsuit helmet
- abstract: true
- components:
- - type: PressureProtection
- highPressureMultiplier: 0.75
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HelmetHardsuitBase
- id: HatHardsuitOld
- name: old hardsuit helmet
- description: An old helmet from a hardsuit. Still functional, for now.
- components:
- - type: Sprite
- sprite: Clothing/Head/hardsuit-old.rsi
-
- - type: Clothing
- sprite: Clothing/Head/hardsuit-old.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.85
- lowPressureMultiplier: 45
-
-
-- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitAtmos
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitAtmos
name: atmos hardsuit helmet
description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-atmos.rsi
-
+ sprite: Clothing/Head/Hardsuits/atmospherics.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-atmos.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.5
- lowPressureMultiplier: 100
+ sprite: Clothing/Head/Hardsuits/atmospherics.rsi
- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitEngineering
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitCap
+ name: captain's hardsuit helmet
+ description: Special hardsuit helmet, made for the captain of the station.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardsuits/capspace.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardsuits/capspace.rsi
+
+- type: entity
+ parent: HatBase
+ id: ClothingHeadHelmetHardsuitDeathsquad
+ name: deathsquad
+ description: A robust helmet for special operations.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardsuits/deathsquad.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardsuits/deathsquad.rsi
+
+- type: entity
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitEngineering
name: engineering hardsuit helmet
description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-engineering.rsi
-
+ sprite: Clothing/Head/Hardsuits/engineering.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-engineering.rsi
+ sprite: Clothing/Head/Hardsuits/engineering.rsi
- type: PressureProtection
- highPressureMultiplier: 0.65
+ highPressureMultiplier: 0.40
lowPressureMultiplier: 100
- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitHazard
- name: hazard hardsuit helmet
- description: Robust hardsuit helmet made for dangerous and hazardous situations.
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitEngineeringWhite
+ name: CE hardsuit helmet
+ description: Special hardsuit helmet, made for the chief engineer of the station.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
-
+ sprite: Clothing/Head/Hardsuits/engineering-white.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
+ sprite: Clothing/Head/Hardsuits/engineering-white.rsi
- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitMedical
+ parent: HatBase
+ id: ClothingHeadHelmetIHSVoidHelm
+ name: IHS voidhelm
+ description: A robust, tactical IHS helmet.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardsuits/ihsvoid.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardsuits/ihsvoid.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.60
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitMedical
name: medical hardsuit helmet
description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-medical.rsi
-
+ sprite: Clothing/Head/Hardsuits/medical.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-medical.rsi
+ sprite: Clothing/Head/Hardsuits/medical.rsi
- type: PressureProtection
highPressureMultiplier: 0.80
lowPressureMultiplier: 55
- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitMining
- name: mining hardsuit helmet
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitRd
+ name: rd hardsuit helmet
+ description: Lightweight hardsuit helmet that doesn't restrict your head movements.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardsuits/rd.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardsuits/rd.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.80
+ lowPressureMultiplier: 55
+
+- type: entity
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitSalvage
+ name: salvage hardsuit helmet
description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-mining.rsi
-
+ sprite: Clothing/Head/Hardsuits/salvage.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-mining.rsi
+ sprite: Clothing/Head/Hardsuits/salvage.rsi
- type: PressureProtection
highPressureMultiplier: 0.70
lowPressureMultiplier: 100
- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitSecurity
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitSecurity
name: security hardsuit helmet
description: Armored hardsuit helmet for security needs.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-sectg.rsi
-
+ sprite: Clothing/Head/Hardsuits/security.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-sectg.rsi
+ sprite: Clothing/Head/Hardsuits/security.rsi
- type: PressureProtection
highPressureMultiplier: 0.70
lowPressureMultiplier: 100
- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitSyndie
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitSecurityRed
+ name: hos hardsuit helmet
+ description: Red armored hardsuit helmet for security needs. Belongs to the HoS.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hardsuits/security-red.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hardsuits/security-red.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.60
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitSyndie
name: blood red hardsuit helmet
description: An advanced red hardsuit helmet designed for work in special operations.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-syndie.rsi
- state: icon
-
+ sprite: Clothing/Head/Hardsuits/syndicate.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-syndie.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.45
- lowPressureMultiplier: 100
+ sprite: Clothing/Head/Hardsuits/syndicate.rsi
- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitCE
- name: CE hardsuit helmet
- description: Special hardsuit helmet, made for the chief engineer of the station.
- components:
- - type: Sprite
- sprite: Clothing/Head/hardsuit-white.rsi
-
- - type: Clothing
- sprite: Clothing/Head/hardsuit-white.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.5
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HelmetHardsuitBase
- id: HelmetHardsuitWizard
+ parent: ClothingHeadHardsuitBase
+ id: ClothingHeadHelmetHardsuitWizard
name: wizard hardsuit helmet
description: A bizarre gem-encrusted helmet that radiates magical energies.
components:
- type: Sprite
- sprite: Clothing/Head/hardsuit-wiz.rsi
-
+ sprite: Clothing/Head/Hardsuits/wizard.rsi
- type: Clothing
- sprite: Clothing/Head/hardsuit-wiz.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.45
- lowPressureMultiplier: 100
+ sprite: Clothing/Head/Hardsuits/wizard.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index c812f0e4b8..1de485dd3f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -1,1199 +1,362 @@
- type: entity
- parent: Clothing
- id: HatBase
- abstract: true
- components:
- - type: Clothing
- Slots:
- - Helmet
- - type: Sprite
- state: icon
-
-
-- type: entity
- parent: HatBase
- id: HatBandana
- name: bandana
- description: A bandana. You wear it on your head.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandana.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandana.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandblack
- name: bandana black
- description: A black bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandblack.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandblack.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandblue
- name: bandana blue
- description: A blue bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandblue.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandblue.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandbotany
- name: bandana botany
- description: A botany bandana to make you look cool, made from natural fibers.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandbotany.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandbotany.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandcamo
- name: bandana camo
- description: A camo bandana to make you look cool. No stealth bonus provided.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandcamo.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandcamo.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandgold
- name: bandana gold
- description: A gold bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandgold.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandgold.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandgreen
- name: bandana green
- description: A green bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandgreen.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandgreen.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandorange
- name: bandana orange
- description: An orange bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandorange.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandorange.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandpurple
- name: bandana purple
- description: A purple bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandpurple.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandpurple.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandred
- name: bandana red
- description: A red bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandred.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandred.rsi
-
-- type: entity
- parent: HatBase
- id: HatBandskull
- name: bandana skull
- description: A bandana with a skull to make you look even cooler.
- components:
- - type: Sprite
- sprite: Clothing/Head/bandskull.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bandskull.rsi
-
-- type: entity
- parent: HatBase
- id: HatBearpelt
- name: bear pelt
- description: It's a cute bear pelt.
- components:
- - type: Sprite
- sprite: Clothing/Head/bearpelt.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bearpelt.rsi
-
-- type: entity
- parent: HatBase
- id: HatBeaverHat
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBeaverHat
name: beaver hat
description: 'Gentlemen?'
components:
- type: Sprite
- sprite: Clothing/Head/beaver_hat.rsi
-
+ sprite: Clothing/Head/Hats/beaver_hat.rsi
- type: Clothing
- sprite: Clothing/Head/beaver_hat.rsi
+ sprite: Clothing/Head/Hats/beaver_hat.rsi
- type: entity
- parent: HatBase
- id: HatBeret
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBeret
name: beret
description: A beret, an artists favorite headwear.
components:
- type: Sprite
- sprite: Clothing/Head/beret.rsi
-
+ sprite: Clothing/Head/Hats/beret.rsi
- type: Clothing
- sprite: Clothing/Head/beret.rsi
+ sprite: Clothing/Head/Hats/beret.rsi
- type: entity
- parent: HatBase
- id: HatBeretEngineering
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBeretEngineering
name: beret engineering
description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety.
components:
- type: Sprite
- sprite: Clothing/Head/beret_engineering.rsi
-
+ sprite: Clothing/Head/Hats/beret_engineering.rsi
- type: Clothing
- sprite: Clothing/Head/beret_engineering.rsi
+ sprite: Clothing/Head/Hats/beret_engineering.rsi
- type: entity
- parent: HatBase
- id: HatBeretHoS
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBeretHoS
name: beret HoS
description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
components:
- type: Sprite
- sprite: Clothing/Head/beret_hos.rsi
- state: beret_hos
-
+ sprite: Clothing/Head/Hats/beret_hos.rsi
- type: Clothing
- sprite: Clothing/Head/beret_hos.rsi
+ sprite: Clothing/Head/Hats/beret_hos.rsi
- type: entity
- parent: HatBase
- id: HatBeretWarden
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBeretWarden
name: beret warden
- description: A corporate red beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
+ description: A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
components:
- type: Sprite
- sprite: Clothing/Head/beret_warden.rsi
-
+ sprite: Clothing/Head/Hats/beret_warden.rsi
- type: Clothing
- sprite: Clothing/Head/beret_warden.rsi
+ sprite: Clothing/Head/Hats/beret_warden.rsi
- type: entity
- parent: HatBase
- id: HatBluesoft
- name: bluesoft
- description: "It's a baseball hat in a tasteless blue colour."
- components:
- - type: Sprite
- sprite: Clothing/Head/bluesoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bluesoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatBluesoftFlipped
- name: bluesoft flipped
- description: "It's a baseball hat in a tasteless blue colour. Flipped."
- components:
- - type: Sprite
- sprite: Clothing/Head/bluesoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bluesoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatBoaterHat
- name: boater hat
- description: Stylish boater hat.
- components:
- - type: Sprite
- sprite: Clothing/Head/boater_hat.rsi
-
- - type: Clothing
- sprite: Clothing/Head/boater_hat.rsi
-
-- type: entity
- parent: HatBase
- id: HatBowler
- name: bowler
- description: Stylish bowler hat.
- components:
- - type: Sprite
- sprite: Clothing/Head/bowler.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bowler.rsi
-
-- type: entity
- parent: HatBase
- id: HatBowlerHat
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBowlerHat
name: bowler hat
description: Stylish bowler hat.
components:
- type: Sprite
- sprite: Clothing/Head/bowler_hat.rsi
-
+ sprite: Clothing/Head/Hats/bowler_hat.rsi
- type: Clothing
- sprite: Clothing/Head/bowler_hat.rsi
+ sprite: Clothing/Head/Hats/bowler_hat.rsi
- type: entity
- parent: HatBase
- id: HatBunny
- name: bunny
- description: Cute bunny ears.
- components:
- - type: Sprite
- sprite: Clothing/Head/bunny.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bunny.rsi
-
-- type: entity
- parent: HatBase
- id: HatCake
- name: cake hat
- description: You put the cake on your head. Brilliant.
- components:
- - type: Sprite
- sprite: Clothing/Head/cake.rsi
-
- - type: Clothing
- sprite: Clothing/Head/cake.rsi
-
-- type: entity
- parent: HatBase
- id: HatPumpkin
- name: pumpkin hat
- description: A jack o' lantern! Believed to ward off evil spirits.
- components:
- - type: Sprite
- sprite: Clothing/Head/pumpkin.rsi
-
- - type: Clothing
- sprite: Clothing/Head/pumpkin.rsi
-
-- type: entity
- parent: HatBase
- id: HatCapcap
- name: cap cap
- description: An usual cap, nothing special about it.
- components:
- - type: Sprite
- sprite: Clothing/Head/capcap.rsi
-
- - type: Clothing
- sprite: Clothing/Head/capcap.rsi
-
-- type: entity
- parent: HatBase
- id: HatCapspace
- name: cap space
- description: A blue cap for patrolling the daily beat.
- components:
- - type: Sprite
- sprite: Clothing/Head/capspace.rsi
-
- - type: Clothing
- sprite: Clothing/Head/capspace.rsi
-
-- type: entity
- parent: HatBase
- id: HatCaptain
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCaptain
name: captain
description: It's good being the king.
components:
- type: Sprite
- sprite: Clothing/Head/captain.rsi
-
+ sprite: Clothing/Head/Hats/captain.rsi
- type: Clothing
- sprite: Clothing/Head/captain.rsi
+ sprite: Clothing/Head/Hats/captain.rsi
- type: entity
- parent: HatBase
- id: HatCardborgH
- name: cardborg h
- description: A helmet made out of a box.
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCardborg
+ name: cardborg
+ description: A hat made out of a box.
components:
- type: Sprite
- sprite: Clothing/Head/cardborg_h.rsi
-
+ sprite: Clothing/Head/Hats/cardborg_h.rsi
- type: Clothing
- sprite: Clothing/Head/cardborg_h.rsi
+ sprite: Clothing/Head/Hats/cardborg_h.rsi
- type: entity
- parent: HatBase
- id: HatCargosoft
- name: cargosoft
- description: "It's a baseball hat painted in Cargo colours."
- components:
- - type: Sprite
- sprite: Clothing/Head/cargosoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/cargosoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatCargosoftFlipped
- name: cargosoft flipped
- description: "It's a baseball hat painted in Cargo colours. Flipped."
- components:
- - type: Sprite
- sprite: Clothing/Head/cargosoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/cargosoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatCentcom
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCentcom
name: centcom
description: "It's good to be the emperor."
components:
- type: Sprite
- sprite: Clothing/Head/centcom.rsi
-
+ sprite: Clothing/Head/Hats/centcom.rsi
- type: Clothing
- sprite: Clothing/Head/centcom.rsi
+ sprite: Clothing/Head/Hats/centcom.rsi
- type: entity
- parent: HatBase
- id: HatChefhat
+ parent: ClothingHeadBase
+ id: ClothingHeadHatChef
name: chef hat
description: "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
components:
- type: Sprite
- sprite: Clothing/Head/chefhat.rsi
-
+ sprite: Clothing/Head/Hats/chefhat.rsi
- type: Clothing
- sprite: Clothing/Head/chefhat.rsi
+ sprite: Clothing/Head/Hats/chefhat.rsi
- type: entity
- parent: HatBase
- id: HatChickenhead
- name: chicken head
- description: "It's a chicken head. Bok bok bok!"
- components:
- - type: Sprite
- sprite: Clothing/Head/chickenhead.rsi
-
- - type: Clothing
- sprite: Clothing/Head/chickenhead.rsi
-
-- type: entity
- parent: HatBase
- id: HatCorpsoft
- name: corpsoft
- description: A baseball bat in corporation colors.
- components:
- - type: Sprite
- sprite: Clothing/Head/corpsoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/corpsoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatCorpsoftFlipped
- name: corpsoft flipped
- description: A baseball bat in corporation colors. Flipped.
- components:
- - type: Sprite
- sprite: Clothing/Head/corpsoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/corpsoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatCosmonaut
- name: cosmonaut
- description: A cosmonaut helmet. Does not provide protection from vacuum.
- components:
- - type: Sprite
- sprite: Clothing/Head/cosmonaut.rsi
-
- - type: Clothing
- sprite: Clothing/Head/cosmonaut.rsi
-
-- type: entity
- parent: HatBase
- id: HatCowboy
- name: cowboy
- description: A cowboy hat, for a real cowboy.
- components:
- - type: Sprite
- sprite: Clothing/Head/cowboy.rsi
-
- - type: Clothing
- sprite: Clothing/Head/cowboy.rsi
-
-- type: entity
- parent: HatBase
- id: HatDeathsquad
- name: deathsquad
- description: A robust red helmet for special operations.
- components:
- - type: Sprite
- sprite: Clothing/Head/deathsquad.rsi
-
- - type: Clothing
- sprite: Clothing/Head/deathsquad.rsi
-
-- type: entity
- parent: HatBase
- id: HatFedoraBrown
+ parent: ClothingHeadBase
+ id: ClothingHeadHatFedoraBrown
name: brown fedora
description: It's a brown fedora.
components:
- type: Sprite
- sprite: Clothing/Head/brownfedora.rsi
-
+ sprite: Clothing/Head/Hats/brownfedora.rsi
- type: Clothing
- sprite: Clothing/Head/brownfedora.rsi
+ sprite: Clothing/Head/Hats/brownfedora.rsi
- type: entity
- parent: HatBase
- id: HatFedoraGrey
+ parent: ClothingHeadBase
+ id: ClothingHeadHatFedoraGrey
name: grey fedora
description: It's a grey fedora.
components:
- type: Sprite
- sprite: Clothing/Head/greyfedora.rsi
-
+ sprite: Clothing/Head/Hats/greyfedora.rsi
- type: Clothing
- sprite: Clothing/Head/greyfedora.rsi
+ sprite: Clothing/Head/Hats/greyfedora.rsi
- type: entity
- parent: HatBase
- id: HatFez
+ parent: ClothingHeadBase
+ id: ClothingHeadHatFez
name: fez
description: A red fez.
components:
- type: Sprite
- sprite: Clothing/Head/fez.rsi
-
+ sprite: Clothing/Head/Hats/fez.rsi
- type: Clothing
- sprite: Clothing/Head/fez.rsi
+ sprite: Clothing/Head/Hats/fez.rsi
- type: entity
- parent: HatBase
- id: HatGladiator
- name: gladiator
- description: "Are you not entertained?"
- components:
- - type: Sprite
- sprite: Clothing/Head/gladiator.rsi
-
- - type: Clothing
- sprite: Clothing/Head/gladiator.rsi
-
-- type: entity
- parent: HatBase
- id: HatGreenbandana
- name: greenbandana
- description: A black bandana to make you look cool.
- components:
- - type: Sprite
- sprite: Clothing/Head/greenbandana.rsi
-
- - type: Clothing
- sprite: Clothing/Head/greenbandana.rsi
-
-- type: entity
- parent: HatBase
- id: HatGreensoft
- name: greensoft
- description: "It's a baseball hat in a tasteless green colour."
- components:
- - type: Sprite
- sprite: Clothing/Head/greensoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/greensoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatGreensoftFlipped
- name: greensoft flipped
- description: "It's a baseball hat in a tasteless green colour. Flipped."
- components:
- - type: Sprite
- sprite: Clothing/Head/greensoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/greensoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatGreysoft
- name: greysoft
- description: "It's a baseball hat in a tasteless grey colour."
- components:
- - type: Sprite
- sprite: Clothing/Head/greysoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/greysoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatGreysoftFlipped
- name: greysoft flipped
- description: "It's a baseball hat in a tasteless grey colour. Flipped."
- components:
- - type: Sprite
- sprite: Clothing/Head/greysoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/greysoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatHairflower
- name: hairflower
- description: A red rose for beautiful ladies.
- components:
- - type: Sprite
- sprite: Clothing/Head/hairflower.rsi
-
- - type: Clothing
- sprite: Clothing/Head/hairflower.rsi
-
-- type: entity
- parent: HatBase
- id: HatHeadslime
- name: headslime
- description: A green, sticky lime, you put it on your head.
- components:
- - type: Sprite
- sprite: Clothing/Head/headslime.rsi
-
- - type: Clothing
- sprite: Clothing/Head/headslime.rsi
-
-- type: entity
- parent: HatBase
- id: HatHelmet
- name: helmet
- description: A usual helmet.
- components:
- - type: Sprite
- sprite: Clothing/Head/helmet.rsi
-
- - type: Clothing
- sprite: Clothing/Head/helmet.rsi
-
-- type: entity
- parent: HatBase
- id: HatHelmetold
- name: helmet old
- description: An old usual helmet.
- components:
- - type: Sprite
- sprite: Clothing/Head/helmetold.rsi
-
- - type: Clothing
- sprite: Clothing/Head/helmetold.rsi
-
-- type: entity
- parent: HatBase
- id: HatHopcap
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHopcap
name: hop cap
description: A grand, stylish captain cap.
components:
- type: Sprite
- sprite: Clothing/Head/hopcap.rsi
-
+ sprite: Clothing/Head/Hats/hopcap.rsi
- type: Clothing
- sprite: Clothing/Head/hopcap.rsi
+ sprite: Clothing/Head/Hats/hopcap.rsi
- type: entity
- parent: HatBase
- id: HatHoshat
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoshat
name: HoS hat
description: "There's a new sheriff in station."
components:
- type: Sprite
- sprite: Clothing/Head/hoshat.rsi
-
+ sprite: Clothing/Head/Hats/hoshat.rsi
- type: Clothing
- sprite: Clothing/Head/hoshat.rsi
+ sprite: Clothing/Head/Hats/hoshat.rsi
- type: entity
- parent: HatBase
- id: HatIhsvoidhelm
- name: IHS voidhelm
- description: A robust, tactical IHS helmet.
- components:
- - type: Sprite
- sprite: Clothing/Head/ihsvoidhelm.rsi
-
- - type: Clothing
- sprite: Clothing/Head/ihsvoidhelm.rsi
-
-- type: entity
- parent: HatBase
- id: HatIhsvoidhelmOn
- name: IHS voidhelm (on)
- description: A robust, tactical IHS helmet.
- components:
- - type: Sprite
- sprite: Clothing/Head/ihsvoidhelm_on.rsi
-
- - type: Clothing
- sprite: Clothing/Head/ihsvoidhelm_on.rsi
-
-- type: entity
- parent: HatBase
- id: HatWitch1
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWitch1
name: witch hat
description: A witch hat.
components:
- type: Sprite
- sprite: Clothing/Head/witchhat.rsi
-
+ sprite: Clothing/Head/Hats/witchhat.rsi
- type: Clothing
- sprite: Clothing/Head/witchhat.rsi
+ sprite: Clothing/Head/Hats/witchhat.rsi
- type: entity
- parent: HatBase
- id: HatWizardHelm
- name: wizard helm
- description: "Strange-looking helmet that most certainly belongs to a real magic user."
- components:
- - type: Sprite
- sprite: Clothing/Head/wizardhelm.rsi
-
- - type: Clothing
- sprite: Clothing/Head/wizardhelm.rsi
-
-- type: entity
- parent: HatBase
- id: HatMimesoft
- name: mimesoft
- description: "It's a baseball hat in a tasteless white colour."
- components:
- - type: Sprite
- sprite: Clothing/Head/mimesoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/mimesoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatMimesoftFlipped
- name: mimesoft flipped
- description: It's a baseball hat in a tasteless white colour. Flipped.
- components:
- - type: Sprite
- sprite: Clothing/Head/mimesoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/mimesoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatNursehat
- name: nurse hat
- description: A sterile nurse hat.
- components:
- - type: Sprite
- sprite: Clothing/Head/nursehat.rsi
-
- - type: Clothing
- sprite: Clothing/Head/nursehat.rsi
-
-- type: entity
- parent: HatBase
- id: HatOrangesoft
- name: orangesoft
- description: It's a baseball hat in a good-looking orange colour.
- components:
- - type: Sprite
- sprite: Clothing/Head/orangesoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/orangesoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatOrangesoftFlipped
- name: orangesoft flipped
- description: It's a baseball hat in a good-looking orange colour. Flipped.
- components:
- - type: Sprite
- sprite: Clothing/Head/orangesoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/orangesoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatOrangeBandana
- name: orange bandana
- description: An orange bandata with a yellow stripe.
- components:
- - type: Sprite
- sprite: Clothing/Head/orange_bandana.rsi
-
- - type: Clothing
- sprite: Clothing/Head/orange_bandana.rsi
-
-- type: entity
- parent: HatBase
- id: HatPaper
+ parent: ClothingHeadBase
+ id: ClothingHeadHatPaper
name: paper
description: A hat made of paper.
components:
- type: Sprite
- sprite: Clothing/Head/paper.rsi
-
+ sprite: Clothing/Head/Hats/paper.rsi
- type: Clothing
- sprite: Clothing/Head/paper.rsi
-- type: entity
- parent: HatBase
- id: HatPhilosopherWig
- name: philosopher wig
- description: A bunch of hair that make you look like a philosopher.
- components:
- - type: Sprite
- sprite: Clothing/Head/philosopher_wig.rsi
-
- - type: Clothing
- sprite: Clothing/Head/philosopher_wig.rsi
+ sprite: Clothing/Head/Hats/paper.rsi
- type: entity
- parent: HatBase
- id: HatPirate
+ parent: ClothingHeadBase
+ id: ClothingHeadHatPirate
name: pirate
description: 'Yo ho ho and a bottle of rum!'
components:
- type: Sprite
- sprite: Clothing/Head/pirate.rsi
-
+ sprite: Clothing/Head/Hats/pirate.rsi
- type: Clothing
- sprite: Clothing/Head/pirate.rsi
+ sprite: Clothing/Head/Hats/pirate.rsi
- type: entity
- parent: HatBase
- id: HatPlaguedoctor
+ parent: ClothingHeadBase
+ id: ClothingHeadHatPlaguedoctor
name: plague doctor
description: These were once used by plague doctors.
components:
- type: Sprite
- sprite: Clothing/Head/plaguedoctor.rsi
-
+ sprite: Clothing/Head/Hats/plaguedoctor.rsi
- type: Clothing
- sprite: Clothing/Head/plaguedoctor.rsi
+ sprite: Clothing/Head/Hats/plaguedoctor.rsi
- type: entity
- parent: HatBase
- id: HatPurplesoft
- name: purple soft
- description: It's a baseball hat in a tasteless purple colour.
- components:
- - type: Sprite
- sprite: Clothing/Head/purplesoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/purplesoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatPurplesoftFlipped
- name: purplesoft flipped
- description: It's a baseball hat in a tasteless purple colour. Flipped.
- components:
- - type: Sprite
- sprite: Clothing/Head/purplesoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/purplesoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatPwig
- name: pwig
- description: To be honest, those look ridiculous.
- components:
- - type: Sprite
- sprite: Clothing/Head/pwig.rsi
-
- - type: Clothing
- sprite: Clothing/Head/pwig.rsi
-
-- type: entity
- parent: HatBase
- id: HatRedsoft
- name: redsoft
- description: It's a baseball hat in a tasteless red colour.
- components:
- - type: Sprite
- sprite: Clothing/Head/redsoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/redsoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatRedsoftFlipped
- name: redsoft flipped
- description: It's a baseball hat in a tasteless purple colour. Flipped.
- components:
- - type: Sprite
- sprite: Clothing/Head/redsoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/redsoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatRedwizard
+ parent: ClothingHeadBase
+ id: ClothingHeadHatRedwizard
name: red wizard
description: Strange-looking red hat-wear that most certainly belongs to a real magic user.
components:
- type: Sprite
- sprite: Clothing/Head/redwizard.rsi
-
+ sprite: Clothing/Head/Hats/redwizard.rsi
- type: Clothing
- sprite: Clothing/Head/redwizard.rsi
+ sprite: Clothing/Head/Hats/redwizard.rsi
- type: entity
- parent: HatBase
- id: HatRichard
- name: richard
- description: 'Do you like hurting other people?'
- components:
- - type: Sprite
- sprite: Clothing/Head/richard.rsi
-
- - type: Clothing
- sprite: Clothing/Head/richard.rsi
-
-- type: entity
- parent: HatBase
- id: HatS-ninja
- name: s-ninja
- description: ''
- components:
- - type: Sprite
- sprite: Clothing/Head/s-ninja.rsi
-
- - type: Clothing
- sprite: Clothing/Head/s-ninja.rsi
-
-- type: entity
- parent: HatBase
- id: HatSantahat
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSantahat
name: santa hat
description: "A festive hat worn by Santa Claus"
components:
- type: Sprite
- sprite: Clothing/Head/santahat.rsi
-
+ sprite: Clothing/Head/Hats/santahat.rsi
- type: Clothing
- sprite: Clothing/Head/santahat.rsi
+ sprite: Clothing/Head/Hats/santahat.rsi
- type: entity
- parent: HatBase
- id: HatSecsoft
- name: secsoft
- description: It's a robust baseball hat in tasteful red colour.
- components:
- - type: Sprite
- sprite: Clothing/Head/secsoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/secsoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatSecsoftFlipped
- name: secsoft flipped
- description: It's a robust baseball hat in tasteful red colour. Flipped.
- components:
- - type: Sprite
- sprite: Clothing/Head/secsoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/secsoft_flipped.rsi
-
-- type: entity
- parent: HatBase
- id: HatSombrero
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSombrero
name: sombrero
description: "Perfectly for Space Mexico, si?"
components:
- type: Sprite
- sprite: Clothing/Head/sombrero.rsi
-
+ sprite: Clothing/Head/Hats/sombrero.rsi
- type: Clothing
- sprite: Clothing/Head/sombrero.rsi
+ sprite: Clothing/Head/Hats/sombrero.rsi
- type: entity
- parent: HatBase
- id: HatSurgcapBlue
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSurgcapBlue
name: surgcap blue
description: A blue cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
components:
- type: Sprite
- sprite: Clothing/Head/surgcap_blue.rsi
-
+ sprite: Clothing/Head/Hats/surgcap_blue.rsi
- type: Clothing
- sprite: Clothing/Head/surgcap_blue.rsi
+ sprite: Clothing/Head/Hats/surgcap_blue.rsi
- type: entity
- parent: HatBase
- id: HatSurgcapGreen
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSurgcapGreen
name: surgcap green
description: A green cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
components:
- type: Sprite
- sprite: Clothing/Head/surgcap_green.rsi
-
+ sprite: Clothing/Head/Hats/surgcap_green.rsi
- type: Clothing
- sprite: Clothing/Head/surgcap_green.rsi
+ sprite: Clothing/Head/Hats/surgcap_green.rsi
- type: entity
- parent: HatBase
- id: HatSurgcapPurple
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSurgcapPurple
name: surgcap purple
description: A purple cap surgeons wear during operations. Keeps their hair from tickling your internal organs.
components:
- type: Sprite
- sprite: Clothing/Head/surgcap_purple.rsi
-
+ sprite: Clothing/Head/Hats/surgcap_purple.rsi
- type: Clothing
- sprite: Clothing/Head/surgcap_purple.rsi
+ sprite: Clothing/Head/Hats/surgcap_purple.rsi
- type: entity
- parent: HatBase
- id: HatSyndicate
- name: syndicate
- description: 'A stylish, robust syndicate helmet.'
- components:
- - type: Sprite
- sprite: Clothing/Head/syndicate.rsi
-
- - type: Clothing
- sprite: Clothing/Head/syndicate.rsi
-
-- type: entity
- parent: HatBase
- id: HatThunderdome
- name: thunderdome
- description: 'Let the battle commence!'
- components:
- - type: Sprite
- sprite: Clothing/Head/thunderdome.rsi
-
- - type: Clothing
- sprite: Clothing/Head/thunderdome.rsi
-
-- type: entity
- parent: HatBase
- id: HatTophat
+ parent: ClothingHeadBase
+ id: ClothingHeadHatTophat
name: tophat
description: A stylish black tophat.
components:
- type: Sprite
- sprite: Clothing/Head/tophat.rsi
-
+ sprite: Clothing/Head/Hats/tophat.rsi
- type: Clothing
- sprite: Clothing/Head/tophat.rsi
+ sprite: Clothing/Head/Hats/tophat.rsi
- type: entity
- parent: HatBase
- id: HatUshankadown
- name: ushanka (down)
+ parent: ClothingHeadBase
+ id: ClothingHeadHatUshanka
+ name: ushanka
description: "Perfect for winter in Siberia, da?"
components:
- type: Sprite
- sprite: Clothing/Head/ushankadown.rsi
-
+ sprite: Clothing/Head/Hats/ushanka.rsi
- type: Clothing
- sprite: Clothing/Head/ushankadown.rsi
+ sprite: Clothing/Head/Hats/ushanka.rsi
- type: entity
- parent: HatBase
- id: HatUshankaup
- name: ushanka (up)
- description: "Perfect for winter in Siberia, da?"
- components:
- - type: Sprite
- sprite: Clothing/Head/ushankaup.rsi
-
- - type: Clothing
- sprite: Clothing/Head/ushankaup.rsi
-
-- type: entity
- parent: HatBase
- id: HatNightVis
- name: night vision
- description: Special night vision glasses, that provide vision in dark places.
- components:
- - type: Sprite
- sprite: Clothing/Head/nightvis.rsi
-
- - type: Clothing
- sprite: Clothing/Head/nightvis.rsi
-
-- type: entity
- parent: HatBase
- id: HatVioletwizard
+ parent: ClothingHeadBase
+ id: ClothingHeadHatVioletwizard
name: violetwizard
description: "Strange-looking violet hat-wear that most certainly belongs to a real magic user."
components:
- type: Sprite
- sprite: Clothing/Head/violetwizard.rsi
-
+ sprite: Clothing/Head/Hats/violetwizard.rsi
- type: Clothing
- sprite: Clothing/Head/violetwizard.rsi
+ sprite: Clothing/Head/Hats/violetwizard.rsi
- type: entity
- parent: HatBase
- id: HatVoid
- name: void
- description: Robust red helmet for high-speed races.
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWarden
+ name: warden's cap
+ description: A police officer's Hat. This hat emphasizes that you are THE LAW
components:
- type: Sprite
- sprite: Clothing/Head/void.rsi
-
+ sprite: Clothing/Head/Hats/warden.rsi
- type: Clothing
- sprite: Clothing/Head/void.rsi
+ sprite: Clothing/Head/Hats/warden.rsi
- type: entity
- parent: HatBase
- id: HatWitch
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWitch
name: witch
description: A witch hat.
components:
- type: Sprite
- sprite: Clothing/Head/witch.rsi
-
+ sprite: Clothing/Head/Hats/witch.rsi
- type: Clothing
- sprite: Clothing/Head/witch.rsi
+ sprite: Clothing/Head/Hats/witch.rsi
- type: entity
- parent: HatBase
- id: HatWizard-fake
- name: wizard-fake
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWizardFake
+ name: wizardFake
description: It has WIZZARD written across it in sequins. Comes with a cool beard.
components:
- type: Sprite
- sprite: Clothing/Head/wizard-fake.rsi
-
+ sprite: Clothing/Head/Hats/wizard_fake.rsi
- type: Clothing
- sprite: Clothing/Head/wizard-fake.rsi
+ sprite: Clothing/Head/Hats/wizard_fake.rsi
- type: entity
- parent: HatBase
- id: HatWizard
- name: wizard
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWizard
+ name: wizard hat
description: Strange-looking blue hat-wear that most certainly belongs to a powerful magic user.
components:
- type: Sprite
- sprite: Clothing/Head/wizardhat.rsi
-
+ sprite: Clothing/Head/Hats/wizardhat.rsi
- type: Clothing
- sprite: Clothing/Head/wizardhat.rsi
+ sprite: Clothing/Head/Hats/wizardhat.rsi
- type: entity
- parent: HatBase
- id: HatXenoMom
- name: xeno matriarch
- description: Hiss hiss hiss!
- components:
- - type: Sprite
- sprite: Clothing/Head/xenom.rsi
-
- - type: Clothing
- sprite: Clothing/Head/xenom.rsi
-
-- type: entity
- parent: HatBase
- id: HatXeno
- name: xenos
- description: Hiss hiss hiss!
- components:
- - type: Sprite
- sprite: Clothing/Head/xenos.rsi
-
- - type: Clothing
- sprite: Clothing/Head/xenos.rsi
-
-- type: entity
- parent: HatBase
- id: HatXmashat
- name: xmashat
+ parent: ClothingHeadBase
+ id: ClothingHeadHatXmasCrown
+ name: xmas crown
description: 'Happy Christmas!'
components:
- type: Sprite
- sprite: Clothing/Head/xmashat.rsi
-
+ sprite: Clothing/Head/Hats/xmascrown.rsi
- type: Clothing
- sprite: Clothing/Head/xmashat.rsi
-
-- type: entity
- parent: HatBase
- id: HatYellowsoft
- name: yellowsoft
- description: A yellow baseball hat.
- components:
- - type: Sprite
- sprite: Clothing/Head/yellowsoft.rsi
-
- - type: Clothing
- sprite: Clothing/Head/yellowsoft.rsi
-
-- type: entity
- parent: HatBase
- id: HatYellowsoftFlipped
- name: yellowsoft flipped
- description: A yellow flipped baseball hat.
- components:
- - type: Sprite
- sprite: Clothing/Head/yellowsoft_flipped.rsi
-
- - type: Clothing
- sprite: Clothing/Head/yellowsoft_flipped.rsi
+ sprite: Clothing/Head/Hats/xmascrown.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 9c51d65db6..ec5dbdb9b2 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -1,119 +1,131 @@
- type: entity
- parent: HatBase
- id: HatAtmosHelm
- name: atmos helm
- description: A helmet, designed for work in low-pressure enviroments.
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetBombSuit
+ name: bombsuit helmet
+ description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
components:
- type: Sprite
- sprite: Clothing/Head/atmos_helm.rsi
-
+ sprite: Clothing/Head/Helmets/bombsuit.rsi
- type: Clothing
- sprite: Clothing/Head/atmos_helm.rsi
+ sprite: Clothing/Head/Helmets/bombsuit.rsi
- type: entity
- parent: HatBase
- id: HatCultHelmet
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetCosmonaut
+ name: cosmonaut
+ description:
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Helmets/cosmonaut.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Helmets/cosmonaut.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetCult
name: cult helmet
description: A robust, evil-looking cult helmet.
components:
- type: Sprite
- sprite: Clothing/Head/cult_helmet.rsi
-
+ sprite: Clothing/Head/Helmets/cult.rsi
- type: Clothing
- sprite: Clothing/Head/cult_helmet.rsi
+ sprite: Clothing/Head/Helmets/cult.rsi
- type: entity
- parent: HatBase
- id: HatHardhatBlue
- name: blue hard hat
- description: A hard hat, painted in blue, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetHelmet
+ name: helmet
+ description: A usual helmet.
components:
- type: Sprite
- sprite: Clothing/Head/hardhat_blue.rsi
-
+ sprite: Clothing/Head/Helmets/security.rsi
- type: Clothing
- sprite: Clothing/Head/hardhat_blue.rsi
+ sprite: Clothing/Head/Helmets/security.rsi
- type: entity
- parent: HatBase
- id: HatHardhatOrange
- name: orange hard hat
- description: A hard hat, painted in orange, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetHelmetOld
+ name: helmet
+ description: An old usual helmet.
components:
- type: Sprite
- sprite: Clothing/Head/hardhat_orange.rsi
-
+ sprite: Clothing/Head/Helmets/securityold.rsi
- type: Clothing
- sprite: Clothing/Head/hardhat_orange.rsi
+ sprite: Clothing/Head/Helmets/securityold.rsi
- type: entity
- parent: HatBase
- id: HatHardhatRed
- name: red hard hat
- description: A hard hat, painted in red, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
- components:
- - type: Sprite
- sprite: Clothing/Head/hardhat_red.rsi
-
- - type: Clothing
- sprite: Clothing/Head/hardhat_red.rsi
-
-- type: entity
- parent: HatBase
- id: HatHardhatWhite
- name: white hard hat
- description: A hard hat, painted in white, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
- components:
- - type: Sprite
- sprite: Clothing/Head/hardhat_white.rsi
-
- - type: Clothing
- sprite: Clothing/Head/hardhat_white.rsi
-
-- type: entity
- parent: HatBase
- id: HatHardhatYellow
- name: yellow hard hat
- description: A hard hat, painted in yellow, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
- components:
- - type: Sprite
- sprite: Clothing/Head/hardhat_yellow.rsi
-
- - type: Clothing
- sprite: Clothing/Head/hardhat_yellow.rsi
-
-- type: entity
- parent: HatBase
- id: HatLightRiot
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetRiot
name: light riot helmet
description: It's a helmet specifically designed to protect against close range attacks.
components:
- type: Sprite
- sprite: Clothing/Head/light_riot.rsi
-
+ sprite: Clothing/Head/Helmets/light_riot.rsi
- type: Clothing
- sprite: Clothing/Head/light_riot.rsi
+ sprite: Clothing/Head/Helmets/light_riot.rsi
- type: entity
- parent: HatBase
- id: HatScaf
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetScaf
name: scaf
description: A robust, strong helmet.
components:
- type: Sprite
- sprite: Clothing/Head/scaf.rsi
-
+ sprite: Clothing/Head/Helmets/scaf.rsi
- type: Clothing
- sprite: Clothing/Head/scaf.rsi
+ sprite: Clothing/Head/Helmets/scaf.rsi
- type: entity
- parent: HatBase
- id: HatSecurity
- name: security
- description: Standard issue security helmet.
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetSpaceNinja
+ name: space ninja helmet
+ description:
components:
- type: Sprite
- sprite: Clothing/Head/security.rsi
-
+ sprite: Clothing/Head/Helmets/spaceninja.rsi
- type: Clothing
- sprite: Clothing/Head/security.rsi
+ sprite: Clothing/Head/Helmets/spaceninja.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetSyndicate
+ name: syndicate
+ description: A stylish, robust syndicate helmet
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Helmets/syndicate.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Helmets/syndicate.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetTemplar
+ name: templar helmet
+ description: DEUS VULT
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Helmets/templar.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Helmets/templar.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetThunderdome
+ name: thunderdome
+ description: Let the battle commence!
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Helmets/thunderdome.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Helmets/thunderdome.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHelmetWizardHelm
+ name: wizard helm
+ description: Strange-looking helmet that most certainly belongs to a real magic user.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Helmets/wizardhelm.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Helmets/wizardhelm.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 11478a352b..7fbb02dfe6 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -1,155 +1,115 @@
- type: entity
- parent: HatBase
- id: HatBioCmo
- name: bio - cmo
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodBioGeneral
+ name: bio hood
+ suffix: Generic
+ description: A hood that protects the head and face from biological contaminants.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Hoods/Bio/general.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Hoods/Bio/general.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodBioCmo
+ name: bio hood
+ suffix: CMO
description: An advanced hood for chief medical officer that protects the head and face from biological contaminants.
components:
- type: Sprite
- sprite: Clothing/Head/bio_cmo.rsi
-
+ sprite: Clothing/Head/Hoods/Bio/cmo.rsi
- type: Clothing
- sprite: Clothing/Head/bio_cmo.rsi
+ sprite: Clothing/Head/Hoods/Bio/cmo.rsi
- type: entity
- parent: HatBase
- id: HatBioGeneral
- name: bio - general
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodBioJanitor
+ name: bio hood
+ suffix: Janitor
description: A hood that protects the head and face from biological contaminants.
components:
- type: Sprite
- sprite: Clothing/Head/bio_general.rsi
-
+ sprite: Clothing/Head/Hoods/Bio/janitor.rsi
- type: Clothing
- sprite: Clothing/Head/bio_general.rsi
+ sprite: Clothing/Head/Hoods/Bio/janitor.rsi
- type: entity
- parent: HatBase
- id: HatBioJanitor
- name: bio - janitor
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodBioScientist
+ name: bio hood
+ suffix: Science
description: A hood that protects the head and face from biological contaminants.
components:
- type: Sprite
- sprite: Clothing/Head/bio_janitor.rsi
-
+ sprite: Clothing/Head/Hoods/Bio/scientist.rsi
- type: Clothing
- sprite: Clothing/Head/bio_janitor.rsi
+ sprite: Clothing/Head/Hoods/Bio/scientist.rsi
- type: entity
- parent: HatBase
- id: HatBioScientist
- name: bio - scientist
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodBioSecurity
+ name: bio hood
+ suffix: Security
description: A hood that protects the head and face from biological contaminants.
components:
- type: Sprite
- sprite: Clothing/Head/bio_scientist.rsi
-
+ sprite: Clothing/Head/Hoods/Bio/security.rsi
- type: Clothing
- sprite: Clothing/Head/bio_scientist.rsi
+ sprite: Clothing/Head/Hoods/Bio/security.rsi
- type: entity
- parent: HatBase
- id: HatBioSecurity
- name: bio - security
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodBioVirology
+ name: bio hood
+ suffix: Virology
description: A hood that protects the head and face from biological contaminants.
components:
- type: Sprite
- sprite: Clothing/Head/bio_security.rsi
-
+ sprite: Clothing/Head/Hoods/Bio/virology.rsi
- type: Clothing
- sprite: Clothing/Head/bio_security.rsi
+ sprite: Clothing/Head/Hoods/Bio/virology.rsi
- type: entity
- parent: HatBase
- id: HatBioVirology
- name: bio - virology
- description: A hood that protects the head and face from biological contaminants.
- components:
- - type: Sprite
- sprite: Clothing/Head/bio_virology.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bio_virology.rsi
-
-- type: entity
- parent: HatBase
- id: HatBombsuit
- name: bombsuit
- description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
- components:
- - type: Sprite
- sprite: Clothing/Head/bombsuit.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bombsuit.rsi
-
-- type: entity
- parent: HatBase
- id: HatBombsuitsec
- name: bombsuit sec
- description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
- components:
- - type: Sprite
- sprite: Clothing/Head/bombsuitsec.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bombsuitsec.rsi
-
-- type: entity
- parent: HatBase
- id: HatBombsuitWhite
- name: bombsuit white
- description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
- components:
- - type: Sprite
- sprite: Clothing/Head/bombsuit_white.rsi
-
- - type: Clothing
- sprite: Clothing/Head/bombsuit_white.rsi
-
-- type: entity
- parent: HatBase
- id: HatChaplainHood
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodChaplainHood
name: chaplain hood
description: Maximum piety in this star system.
components:
- type: Sprite
- sprite: Clothing/Head/chaplain_hood.rsi
-
+ sprite: Clothing/Head/Hoods/chaplain.rsi
- type: Clothing
- sprite: Clothing/Head/chaplain_hood.rsi
+ sprite: Clothing/Head/Hoods/chaplain.rsi
- type: entity
- parent: HatBase
- id: HatCulthood
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodCulthood
name: cult hood
description: There's no cult without cult hoods.
components:
- type: Sprite
- sprite: Clothing/Head/culthood.rsi
-
+ sprite: Clothing/Head/Hoods/cult.rsi
- type: Clothing
- sprite: Clothing/Head/culthood.rsi
+ sprite: Clothing/Head/Hoods/cult.rsi
- type: entity
- parent: HatBase
- id: HatNunHood
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodNunHood
name: nun hood
description: Maximum piety in this star system.
components:
- type: Sprite
- sprite: Clothing/Head/nun_hood.rsi
-
+ sprite: Clothing/Head/Hoods/nun.rsi
- type: Clothing
- sprite: Clothing/Head/nun_hood.rsi
+ sprite: Clothing/Head/Hoods/nun.rsi
- type: entity
- parent: HatBase
- id: HatRad
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodRad
name: rad
description: A hood of the hazmat suit, designed for protection from high radioactivity.
components:
- type: Sprite
- sprite: Clothing/Head/rad.rsi
-
+ sprite: Clothing/Head/Hoods/rad.rsi
- type: Clothing
- sprite: Clothing/Head/rad.rsi
+ sprite: Clothing/Head/Hoods/rad.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index a0fd49fdad..04590a0e93 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -1,11 +1,120 @@
- type: entity
- parent: HatBase
- id: HatSkub
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBearpelt
+ name: bear pelt
+ description: It's a cute bear pelt.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/bearpelt.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/bearpelt.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBunny
+ name: bunny
+ description: Cute bunny ears.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/bunny.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/bunny.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCake
+ name: cake hat
+ description: You put the cake on your head. Brilliant.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/cake.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/cake.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatChickenhead
+ name: chicken head
+ description: "It's a chicken head. Bok bok bok!"
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/chickenhead.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/chickenhead.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHairflower
+ name: hairflower
+ description: A red rose for beautiful ladies.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/hairflower.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/hairflower.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatPumpkin
+ name: pumpkin hat
+ description: A jack o' lantern! Believed to ward off evil spirits.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/pumpkin.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/pumpkin.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatPwig
+ name: pwig
+ description: To be honest, those look ridiculous.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/pwig.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/pwig.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatRichard
+ name: richard
+ description: 'Do you like hurting people?'
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/richard.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/richard.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSkub
name: Skub Hat
description: 'Best paired with the Skub Suit.'
components:
- type: Sprite
- sprite: Clothing/Head/skubhead.rsi
-
+ sprite: Clothing/Head/Misc/skubhead.rsi
- type: Clothing
- sprite: Clothing/Head/skubhead.rsi
+ sprite: Clothing/Head/Misc/skubhead.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatXenoMom
+ name: xeno matriarch
+ description: Hiss hiss hiss!
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/xenom.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/xenom.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatXeno
+ name: xenos
+ description: Hiss hiss hiss!
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Misc/xenos.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Misc/xenos.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
new file mode 100644
index 0000000000..b437bb6339
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -0,0 +1,241 @@
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBluesoft
+ name: bluesoft
+ description: "It's a baseball hat in a tasteless blue colour."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/bluesoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/bluesoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatBluesoftFlipped
+ name: bluesoft flipped
+ description: "It's a baseball hat in a tasteless blue colour. Flipped."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCargosoft
+ name: cargosoft
+ description: "It's a baseball hat painted in Cargo colours."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/cargosoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/cargosoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCargosoftFlipped
+ name: cargosoft flipped
+ description: "It's a baseball hat painted in Cargo colours. Flipped."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCorpsoft
+ name: corpsoft
+ description: A baseball bat in corporation colors.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/corpsoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/corpsoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatCorpsoftFlipped
+ name: corpsoft flipped
+ description: A baseball bat in corporation colors. Flipped.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatGreensoft
+ name: greensoft
+ description: "It's a baseball hat in a tasteless green colour."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/greensoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/greensoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatGreensoftFlipped
+ name: greensoft flipped
+ description: "It's a baseball hat in a tasteless green colour. Flipped."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/greensoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/greensoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatGreysoft
+ name: greysoft
+ description: "It's a baseball hat in a tasteless grey colour."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/greysoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/greysoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatGreysoftFlipped
+ name: greysoft flipped
+ description: "It's a baseball hat in a tasteless grey colour. Flipped."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/greysoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/greysoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatMimesoft
+ name: mimesoft
+ description: "It's a baseball hat in a tasteless white colour."
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/mimesoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/mimesoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatMimesoftFlipped
+ name: mimesoft flipped
+ description: It's a baseball hat in a tasteless white colour. Flipped.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatOrangesoft
+ name: orangesoft
+ description: It's a baseball hat in a good-looking orange colour.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/orangesoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/orangesoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatOrangesoftFlipped
+ name: orangesoft flipped
+ description: It's a baseball hat in a good-looking orange colour. Flipped.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatPurplesoft
+ name: purple soft
+ description: It's a baseball hat in a tasteless purple colour.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/purplesoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/purplesoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatPurplesoftFlipped
+ name: purplesoft flipped
+ description: It's a baseball hat in a tasteless purple colour. Flipped.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatRedsoft
+ name: redsoft
+ description: It's a baseball hat in a tasteless red colour.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/redsoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/redsoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatRedsoftFlipped
+ name: redsoft flipped
+ description: It's a baseball hat in a tasteless purple colour. Flipped.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/redsoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/redsoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSecsoft
+ name: secsoft
+ description: It's a robust baseball hat in tasteful red colour.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/secsoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/secsoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatSecsoftFlipped
+ name: secsoft flipped
+ description: It's a robust baseball hat in tasteful red colour. Flipped.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/secsoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/secsoft_flipped.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatYellowsoft
+ name: yellowsoft
+ description: A yellow baseball hat.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/yellowsoft.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/yellowsoft.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatYellowsoftFlipped
+ name: yellowsoft flipped
+ description: A yellow flipped baseball hat.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml b/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml
deleted file mode 100644
index 3643783710..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-- type: entity
- parent: HatBase
- id: HatWelding
- name: welding mask
- description: A head-mounted face cover designed to protect the wearer completely from space-arc eye.
- components:
- - type: Sprite
- sprite: Clothing/Head/welding.rsi
-
- - type: Clothing
- sprite: Clothing/Head/welding.rsi
-
-- type: entity
- parent: HatBase
- id: HatWeldingup
- name: welding mask (up)
- description: A head-mounted face cover designed to protect the wearer completely from space-arc eye.
- components:
- - type: Sprite
- sprite: Clothing/Head/weldingup.rsi
-
- - type: Clothing
- sprite: Clothing/Head/weldingup.rsi
-
-- type: entity
- parent: HatBase
- id: HatFireWeldingMask
- name: fire welding mask
- description: A painted welding helmet, this one has flames on it.
- components:
- - type: Sprite
- sprite: Clothing/Head/fire_welding_mask_1.rsi
-
- - type: Clothing
- sprite: Clothing/Head/fire_welding_mask_1.rsi
-
-- type: entity
- parent: HatBase
- id: HatFireWeldingMaskup
- name: fire welding mask (up)
- description: A painted welding helmet, this one has flames on it.
- components:
- - type: Sprite
- sprite: Clothing/Head/fire_welding_mask_1up.rsi
-
- - type: Clothing
- sprite: Clothing/Head/fire_welding_mask_1up.rsi
-
-- type: entity
- parent: HatBase
- id: HatBlueFlameWeldingMask
- name: blue flame welding mask
- description: A painted welding helmet, this one has blue flames on it.
- components:
- - type: Sprite
- sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
-
- - type: Clothing
- sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
-
-- type: entity
- parent: HatBase
- id: HatBlueFlameWeldingMaskup
- name: blue flame welding mask (up)
- description: A painted welding helmet, this one has blue flames on it.
- components:
- - type: Sprite
- sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
-
- - type: Clothing
- sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
-
-- type: entity
- parent: HatBase
- id: HatPaintedwelding
- name: painted welding mask
- description: A welding helmet, painted in crimson.
- components:
- - type: Sprite
- sprite: Clothing/Head/paintedwelding.rsi
-
- - type: Clothing
- sprite: Clothing/Head/paintedwelding.rsi
-
-- type: entity
- parent: HatBase
- id: HatPaintedweldingup
- name: painted welding mask (up)
- description: A welding helmet, painted in crimson.
- components:
- - type: Sprite
- sprite: Clothing/Head/paintedweldingup.rsi
-
- - type: Clothing
- sprite: Clothing/Head/paintedweldingup.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
new file mode 100644
index 0000000000..7b57503afb
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -0,0 +1,43 @@
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWelding
+ name: welding mask
+ description: A head-mounted face cover designed to protect the wearer completely from space-arc eye.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Welding/welding.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Welding/welding.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWeldingMaskFlame
+ name: flame welding mask
+ description: A painted welding helmet, this one has flames on it.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Welding/flame_welding_mask.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Welding/flame_welding_mask.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWeldingMaskFlameBlue
+ name: blue-flame welding mask
+ description: A painted welding helmet, this one has blue flames on it.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi
+
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatWeldingMaskPainted
+ name: painted welding mask
+ description: A welding helmet, painted in crimson.
+ components:
+ - type: Sprite
+ sprite: Clothing/Head/Welding/paintedwelding.rsi
+ - type: Clothing
+ sprite: Clothing/Head/Welding/paintedwelding.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base.yml b/Resources/Prototypes/Entities/Clothing/Masks/base.yml
new file mode 100644
index 0000000000..028c8ecb1e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base.yml
@@ -0,0 +1,9 @@
+- type: entity
+ parent: Clothing
+ id: ClothingMaskBase
+ abstract: true
+ components:
+ - type: Sprite
+ state: icon
+ - type: Clothing
+ Slots: [mask]
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 9767140b7c..cb9afb25a7 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -1,98 +1,71 @@
- type: entity
- parent: Clothing
- id: MasksBase
- abstract: true
- components:
- - type: Clothing
- Slots: [mask]
-
-- type: entity
- parent: MasksBase
- id: OldGasMaskClothing
+ parent: ClothingMaskBase
+ id: ClothingMaskGas
name: old gas mask
description: An old, dusty mask. Yet still dutifully functional.
components:
- type: Sprite
- sprite: Clothing/Masks/mask_gasalt.rsi
- state: icon
- - type: BreathMask
+ sprite: Clothing/Mask/gas.rsi
- type: Clothing
- sprite: Clothing/Masks/mask_gasalt.rsi
+ sprite: Clothing/Mask/gas.rsi
+ - type: BreathMask
- type: entity
- parent: MasksBase
- id: GasMaskClothing
- name: gas mask
- description: Regulations require these to be stocked after the fourth coolant leak.
- components:
- - type: Sprite
- sprite: Clothing/Masks/mask_gas.rsi
- state: icon
- - type: BreathMask
- - type: Clothing
- sprite: Clothing/Masks/mask_gas.rsi
-
-- type: entity
- parent: MasksBase
- id: BreathMaskClothing
+ parent: ClothingMaskBase
+ id: ClothingMaskBreath
name: breath mask
description: Might as well keep this on 24/7.
components:
- type: Sprite
- sprite: Clothing/Masks/mask_breath.rsi
- state: icon
- - type: BreathMask
+ sprite: Clothing/Mask/breath.rsi
- type: Clothing
- sprite: Clothing/Masks/mask_breath.rsi
+ sprite: Clothing/Mask/breath.rsi
+ - type: BreathMask
- type: entity
- parent: MasksBase
- id: MaskClown
+ parent: ClothingMaskBase
+ id: ClothingMaskClown
name: clown wig and mask
description: A true prankster's facial attire. A clown is incomplete without his wig and mask.
components:
- type: Sprite
- sprite: Clothing/Masks/mask_clown.rsi
- state: icon
- - type: BreathMask
+ sprite: Clothing/Mask/clown.rsi
- type: Clothing
- sprite: Clothing/Masks/mask_clown.rsi
+ sprite: Clothing/Mask/clown.rsi
+ - type: BreathMask
- type: entity
- parent: MasksBase
- id: MaskJoy
+ parent: ClothingMaskBase
+ id: ClothingMaskJoy
name: joy mask
description: Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout.
components:
- type: Sprite
- sprite: Clothing/Masks/mask_joy.rsi
- state: icon
- - type: BreathMask
+ sprite: Clothing/Mask/joy.rsi
- type: Clothing
- sprite: Clothing/Masks/mask_joy.rsi
+ sprite: Clothing/Mask/joy.rsi
+ - type: BreathMask
- type: entity
- parent: MasksBase
- id: MaskMime
+ parent: ClothingMaskBase
+ id: ClothingMaskMime
name: mime mask
description: The traditional mime's mask. It has an eerie facial posture.
components:
- type: Sprite
- sprite: Clothing/Masks/mask_mime.rsi
- state: icon
- - type: BreathMask
+ sprite: Clothing/Mask/mime.rsi
- type: Clothing
- sprite: Clothing/Masks/mask_mime.rsi
+ sprite: Clothing/Mask/mime.rsi
+ - type: BreathMask
- type: entity
- parent: MasksBase
- id: MaskSterile
+ parent: ClothingMaskBase
+ id: ClothingMaskSterile
name: sterile mask
description: A sterile mask designed to help prevent the spread of diseases.
components:
- type: Sprite
- sprite: Clothing/Masks/mask_sterile.rsi
- state: icon
- - type: BreathMask
+ sprite: Clothing/Mask/sterile.rsi
- type: Clothing
- sprite: Clothing/Masks/mask_sterile.rsi
+ sprite: Clothing/Mask/sterile.rsi
+ - type: BreathMask
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base.yml b/Resources/Prototypes/Entities/Clothing/Neck/base.yml
new file mode 100644
index 0000000000..50d464fed2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base.yml
@@ -0,0 +1,14 @@
+- type: entity
+ parent: Clothing
+ id: ClothingNeckBase
+ abstract: true
+ name: neck
+ description:
+ components:
+ - type: Clothing
+ size: 10
+ QuickEquip: true
+ Slots:
+ - neck
+ - type: Sprite
+ state: icon
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index 0f890c0334..3f715de010 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -1,124 +1,88 @@
- type: entity
- parent: Clothing
- id: CloakClothing
- name: cloak
- abstract: true
- description:
- components:
- - type: Clothing
- size: 10
- QuickEquip: true
- Slots:
- - neck
-
-- type: entity
- parent: CloakClothing
- id: CapCloak
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakCap
name: captain's cloak
description: A pompous and comfy blue cloak with a nice gold trim.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/cap_cloak.rsi
- state: capcloak
-
+ sprite: Clothing/Neck/Cloaks/cap.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/cap_cloak.rsi
- HeldPrefix: capcloak
+ sprite: Clothing/Neck/Cloaks/cap.rsi
- type: entity
- parent: CloakClothing
- id: HosCloak
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakHos
name: HoS's cloak
description: An exquisite dark and red cloak of a Head of Security.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/hos_cloak.rsi
- state: hoscloak
-
+ sprite: Clothing/Neck/Cloaks/hos.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/hos_cloak.rsi
- HeldPrefix: hoscloak
+ sprite: Clothing/Neck/Cloaks/hos.rsi
- type: entity
- parent: CloakClothing
- id: CeCloak
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakCe
name: CE's cloak
description: A dark green cloak with light blue ornaments.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/ce_cloak.rsi
- state: cecloak
-
+ sprite: Clothing/Neck/Cloaks/ce.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/ce_cloak.rsi
- HeldPrefix: cecloak
+ sprite: Clothing/Neck/Cloaks/ce.rsi
+
- type: entity
- parent: CloakClothing
- id: CmoCloak
+ parent: ClothingNeckBase
+ id: CloathingCloakCmo
name: CMO's cloak
description: A sterile blue cloak with a green cross.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi
- state: cmocloak
-
+ sprite: Clothing/Neck/Cloaks/cmo.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi
- HeldPrefix: cmocloak
+ sprite: Clothing/Neck/Cloaks/cmo.rsi
- type: entity
- parent: CloakClothing
- id: RdCloak
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakRd
name: RD's cloak
description: A white cloak with violet stripes.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/rd_cloak.rsi
- state: rdcloak
-
+ sprite: Clothing/Neck/Cloaks/rd.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/rd_cloak.rsi
- HeldPrefix: rdcloak
+ sprite: Clothing/Neck/Cloaks/rd.rsi
- type: entity
- parent: CloakClothing
- id: QmCloak
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakQm
name: QM's cloak
description: A strong brown cloak with a reflective stripe.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/qm_cloak.rsi
- state: qmcloak
-
+ sprite: Clothing/Neck/Cloaks/qm.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/qm_cloak.rsi
- HeldPrefix: qmcloak
+ sprite: Clothing/Neck/Cloaks/qm.rsi
- type: entity
- parent: CloakClothing
- id: HopCloak
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakHop
name: HoP's cloak
description: A blue cloak with red shoudlers and gold buttons.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/hop_cloak.rsi
- state: hopcloak
-
+ sprite: Clothing/Neck/Cloaks/hop.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/hop_cloak.rsi
- HeldPrefix: hopcloak
+ sprite: Clothing/Neck/Cloaks/hop.rsi
- type: entity
- parent: CloakClothing
- id: HeraldCloak
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakHerald
name: Herald's cloak
description: An evil-looking red cloak with spikes on its shoulders.
components:
- type: Sprite
- sprite: Clothing/Neck/Cloaks/herald_cloak.rsi
- state: heraldcloak
-
+ sprite: Clothing/Neck/Cloaks/herald.rsi
- type: Clothing
- sprite: Clothing/Neck/Cloaks/herald_cloak.rsi
- HeldPrefix: heraldcloak
+ sprite: Clothing/Neck/Cloaks/herald.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
new file mode 100644
index 0000000000..bca559971b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -0,0 +1,32 @@
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckHeadphones
+ name: headphones
+ description: Quality headphones from Drunk Masters, with good sound insulation.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Misc/headphones.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Misc/headphones.rsi
+
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckStethoscope
+ name: stethoscope
+ description: An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Misc/stethoscope.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Misc/stethoscope.rsi
+
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckBling
+ name: bling
+ description: Damn, it feels good to be a gangster.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Misc/bling.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Misc/bling.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/neck.yml b/Resources/Prototypes/Entities/Clothing/Neck/neck.yml
deleted file mode 100644
index 3da1e52a96..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Neck/neck.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-- type: entity
- parent: Clothing
- id: NeckClothing
- abstract: true
- name: neck
- description:
- components:
- - type: Clothing
- size: 10
- QuickEquip: true
- Slots:
- - neck
-
-- type: entity
- parent: NeckClothing
- id: HeadPhonesOn
- name: headphones
- description: Quality headphones from Drunk Masters, with good sound insulation.
- components:
- - type: Sprite
- sprite: Clothing/Neck/headphones.rsi
- state: headphones_on
-
- - type: Clothing
- sprite: Clothing/Neck/headphones.rsi
- HeldPrefix: headphones_on
-
-- type: entity
- parent: NeckClothing
- id: RedTie
- name: red-tie
- description: A neosilk clip-on red tie.
- components:
- - type: Sprite
- sprite: Clothing/Neck/redtie.rsi
- state: redtie
-
- - type: Clothing
- sprite: Clothing/Neck/redtie.rsi
- HeldPrefix: redtie
-
-- type: entity
- parent: NeckClothing
- id: DetTie
- name: detective's tie
- description: A loosely tied necktie, a perfect accessory for the over-worked detective.
- components:
- - type: Sprite
- sprite: Clothing/Neck/dettie.rsi
- state: dettie
-
- - type: Clothing
- sprite: Clothing/Neck/dettie.rsi
- HeldPrefix: dettie
-
-- type: entity
- parent: NeckClothing
- id: Stethoscope
- name: stethoscope
- description: An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing.
- components:
- - type: Sprite
- sprite: Clothing/Neck/stethoscope.rsi
- state: stethoscope
-
- - type: Clothing
- sprite: Clothing/Neck/stethoscope.rsi
- HeldPrefix: stethoscope
-
-- type: entity
- parent: NeckClothing
- id: StripedRedScarf
- name: striped red scarf
- description: A stylish striped red scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
- components:
- - type: Sprite
- sprite: Clothing/Neck/Scarfs/red_scarf.rsi
- state: stripedredscarf
-
- - type: Clothing
- sprite: Clothing/Neck/Scarfs/red_scarf.rsi
- HeldPrefix: stripedredscarf
-
-- type: entity
- parent: NeckClothing
- id: StripedBlueScarf
- name: striped blue scarf
- description: A stylish striped blue scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
- components:
- - type: Sprite
- sprite: Clothing/Neck/Scarfs/blue_scarf.rsi
- state: stripedbluescarf
-
- - type: Clothing
- sprite: Clothing/Neck/Scarfs/blue_scarf.rsi
- HeldPrefix: stripedbluescarf
-
-- type: entity
- parent: NeckClothing
- id: StripedGreenScarf
- name: striped green scarf
- description: A stylish striped green scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
- components:
- - type: Sprite
- sprite: Clothing/Neck/Scarfs/green_scarf.rsi
- state: stripedgreenscarf
-
- - type: Clothing
- sprite: Clothing/Neck/Scarfs/green_scarf.rsi
- HeldPrefix: stripedgreenscarf
-
-- type: entity
- parent: NeckClothing
- id: ZebraScarf
- name: zebra scarf
- description: A striped scarf, a mandatory accessory for artists.
- components:
- - type: Sprite
- sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi
- state: zebrascarf
-
- - type: Clothing
- sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi
- HeldPrefix: zebrascarf
-
-- type: entity
- parent: NeckClothing
- id: Bling
- name: bling
- description: Damn, it feels good to be a gangster.
- components:
- - type: Sprite
- sprite: Clothing/Neck/bling.rsi
- state: bling
-
- - type: Clothing
- sprite: Clothing/Neck/bling.rsi
- HeldPrefix: bling
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
new file mode 100644
index 0000000000..2a61f33b92
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
@@ -0,0 +1,43 @@
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckScarfStripedRed
+ name: striped red scarf
+ description: A stylish striped red scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Scarfs/red.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Scarfs/red.rsi
+
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckScarfStripedBlue
+ name: striped blue scarf
+ description: A stylish striped blue scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Scarfs/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Scarfs/blue.rsi
+
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckScarfStripedGreen
+ name: striped green scarf
+ description: A stylish striped green scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Scarfs/green.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Scarfs/green.rsi
+
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckScarfStripedZebra
+ name: zebra scarf
+ description: A striped scarf, a mandatory accessory for artists.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Scarfs/zebra.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Scarfs/zebra.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
new file mode 100644
index 0000000000..b1b879c7d4
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
@@ -0,0 +1,21 @@
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckTieRed
+ name: red-tie
+ description: A neosilk clip-on red tie.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Ties/redtie.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Ties/redtie.rsi
+
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckTieDet
+ name: detective's tie
+ description: A loosely tied necktie, a perfect accessory for the over-worked detective.
+ components:
+ - type: Sprite
+ sprite: Clothing/Neck/Ties/dettie.rsi
+ - type: Clothing
+ sprite: Clothing/Neck/Ties/dettie.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index c40f9b6504..ff12784eb7 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -1,265 +1,109 @@
- type: entity
- parent: Clothing
- id: OuterclothingBase
- abstract: true
- components:
- - type: Clothing
- Slots:
- - outerclothing
- - type: Sprite
- state: icon
-
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingArmorVest
- name: armor vest
- description: "A slim Type I armored vest that provides decent protection against most types of damage."
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/armor.rsi
- state: armor
-
- - type: Clothing
- sprite: Clothing/OuterClothing/armor.rsi
- ClothingPrefix: armor
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingArmorreflec
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorReflective
name: armor (reflective)
description: An armored vest with advanced shielding to protect against energy weapons.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/armor_reflec.rsi
-
+ sprite: Clothing/OuterClothing/Armor/armor_reflec.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/armor_reflec.rsi
+ sprite: Clothing/OuterClothing/Armor/armor_reflec.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingBulletproof
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorBulletproof
name: bulletproof
description: An armored vest with heavy plates to protect against ballistic projectiles.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/bulletproof.rsi
-
+ sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/bulletproof.rsi
+ sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingCaparmor
- name: captain's armor
- description: A suit of protective formal armor made for the station's captain.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/caparmor.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/caparmor.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingAcolyte
- name: acolyte
- description: An armored suit for acolytes of the cult.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/acolyte.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/acolyte.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingCultarmour
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorCult
name: cult armor
description: An evil-looking cult armor, made of bones.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/cult_armour.rsi
-
+ sprite: Clothing/OuterClothing/Armor/cult_armour.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/cult_armour.rsi
+ sprite: Clothing/OuterClothing/Armor/cult_armour.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingCustodian
- name: custodian
- description: A special armormed custodian suit for cleaning trash in very dangerous places.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/custodian.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/custodian.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingHeavy
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorHeavy
name: heavy
description: A heavily armored suit that protects against excessive damage.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/heavy.rsi
-
+ sprite: Clothing/OuterClothing/Armor/heavy.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/heavy.rsi
+ sprite: Clothing/OuterClothing/Armor/heavy.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingHmarmorvest
- name: HM armor vest
- description: A handmade armor vest with a big and thick steel plate.
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorHeavyGreen
+ name: heavy
+ description: A heavily armored suit with green accents that protects against excessive damage.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/hm_armorvest.rsi
-
+ sprite: Clothing/OuterClothing/Armor/heavygreen.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/hm_armorvest.rsi
+ sprite: Clothing/OuterClothing/Armor/heavygreen.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingHos
- name: HoS armor vest
- description: A synthetic armor vest with COMMANDER printed in gold lettering on the chest. This one has added webbing and ballistic plates.
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorHeavyRed
+ name: heavy
+ description: A heavily armored suit with red accents that protects against excessive damage.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/hos.rsi
-
+ sprite: Clothing/OuterClothing/Armor/heavyred.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/hos.rsi
+ sprite: Clothing/OuterClothing/Armor/heavyred.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingKvest
- name: kvest
- description: An armor vest made of synthetic fibers.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/kvest.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/kvest.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingMagusblue
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorMagusblue
name: magus blue
description: An blue armored suit that provides good protection.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/magusblue.rsi
-
+ sprite: Clothing/OuterClothing/Armor/magusblue.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/magusblue.rsi
+ sprite: Clothing/OuterClothing/Armor/magusblue.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingMagusred
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorMagusred
name: magus red
description: A red armored suit that provides good protection.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/magusred.rsi
-
+ sprite: Clothing/OuterClothing/Armor/magusred.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/magusred.rsi
+ sprite: Clothing/OuterClothing/Armor/magusred.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingMercwebvest
- name: merc web vest
- description: A high-quality armored vest made from a hard synthetic material. It is surprisingly flexible and light, despite formidable armor plating.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/mercwebvest.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/mercwebvest.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingReactive
- name: reactive
- description: An experimental suit with a reactive armor that stops very fast projectiles. Currently on.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/reactive.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/reactive.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingReactiveoff
- name: reactive (off)
- description: An experimental suit with a reactive armor that stops very fast projectiles. Currently off.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/reactiveoff.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/reactiveoff.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingRiot
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorRiot
name: riot
description: An armored vest with heavy padding to protect against melee attacks.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/riot.rsi
-
+ sprite: Clothing/OuterClothing/Armor/riot.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/riot.rsi
+ sprite: Clothing/OuterClothing/Armor/riot.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingScaf
+ parent: ClothingOuterBase
+ id: ClothingOuterArmorScaf
name: scaf
description: A green and brown tactical suit for combat situations.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/scaf.rsi
-
+ sprite: Clothing/OuterClothing/Armor/scaf.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/scaf.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingSwat
- name: swat
- description: Very durable vest that provides excellent protection from ranged and melee weapons.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/swat.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/swat.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingSninja
- name: S ninja
- description: This black technologically advanced, cybernetically-enhanced suit provides good protection and many abilities like invisibility or teleportation.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/s_ninja.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/s_ninja.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingWebvest
- name: web vest
- description: A synthetic armor vest. This one has added webbing and ballistic plates.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/webvest.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/webvest.rsi
+ sprite: Clothing/OuterClothing/Armor/scaf.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml
new file mode 100644
index 0000000000..4cb934f8b5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml
@@ -0,0 +1,20 @@
+- type: entity
+ parent: Clothing
+ id: ClothingOuterBase
+ abstract: true
+ components:
+ - type: Clothing
+ Slots:
+ - outerclothing
+ - type: Sprite
+ state: icon
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterHardsuitBase
+ name: base hardsuit
+ abstract: true
+ components:
+ - type: PressureProtection
+ highPressureMultiplier: 0.75
+ lowPressureMultiplier: 100
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
new file mode 100644
index 0000000000..082f02a872
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
@@ -0,0 +1,71 @@
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterBioGeneral
+ name: bio suit
+ suffix: Generic
+ description: A suit that protects against biological contamination.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Bio/general.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Bio/general.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterBioCmo
+ name: bio suit
+ suffix: CMO
+ description: An advanced suit that protects against biological contamination, in CMO colors.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Bio/cmo.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Bio/cmo.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterBioJanitor
+ name: bio suit
+ suffix: Janitor
+ description: A suit that protects against biological contamination, in Janitor colors.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Bio/janitor.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Bio/janitor.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterBioScientist
+ name: bio suit
+ suffix: Science
+ description: A suit that protects against biological contamination, in Scientist colors.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Bio/scientist.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Bio/scientist.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterBioSecurity
+ name: bio suit
+ suffix: Security
+ description: A suit that protects against biological contamination, in Security colors.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Bio/security.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Bio/security.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterBioVirology
+ name: bio suit
+ suffix: Virology
+ description: A suit that protects against biological contamination, in Virology colors.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Bio/virology.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Bio/virology.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index b73740564b..b6654eec1b 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -1,276 +1,109 @@
- type: entity
- parent: OuterclothingBase
- id: OuterclothingBomber
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatBomber
name: bomber
description: A thick, well-worn WW2 leather bomber jacket.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/bomber.rsi
-
+ sprite: Clothing/OuterClothing/Coats/bomber.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/bomber.rsi
+ sprite: Clothing/OuterClothing/Coats/bomber.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingBomberopen
- name: bomber (open)
- description: A thick, well-worn WW2 leather bomber jacket.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bomber_open.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bomber_open.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingCargojacket
- name: cargo jacket
- description: A cargo jacket.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/cargo_jacket.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/cargo_jacket.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingChurchcoat
- name: church coat
- description: A piety, blessed church coat.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/church_coat.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/church_coat.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingDetective
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatDetective
name: detective
description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!
components:
- type: Sprite
- sprite: Clothing/OuterClothing/detective.rsi
-
+ sprite: Clothing/OuterClothing/Coats/detective.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/detective.rsi
+ sprite: Clothing/OuterClothing/Coats/detective.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingGentlecoat
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatGentle
name: gentle coat
description: A gentle coat for a gentle man, or woman.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/gentlecoat.rsi
-
+ sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/gentlecoat.rsi
+ sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingGreyhoodie
- name: grey hoodie
- description: A grey hoodie.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/grey_hoodie.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/grey_hoodie.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingGreyhoodieopen
- name: grey hoodie (open)
- description: A grey hoodie.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingInspcoat
- name: inspector coat
- description: A strict inspector coat for being intimidating during inspections.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/insp_coat.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/insp_coat.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingJensencoat
- name: jensen coat
- description: A jensen coat.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/jensencoat.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/jensencoat.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoat
- name: lab coat
- description: A suit that protects against minor chemical spills.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoatopen
- name: lab coat (open)
- description: A suit that protects against minor chemical spills.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat_open.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat_open.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoatchem
- name: lab coat (chem)
- description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat_chem.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat_chem.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoatchemopen
- name: lab coat (chem open)
- description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoatcmo
- name: lab coat (CMO)
- description: Bluer than the standard model.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat_cmo.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat_cmo.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoatcmoopen
- name: lab coat (CMO open)
- description: Bluer than the standard model.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoatmedspec
- name: lab coat (medical)
- description: A snow-white, sterilised coat that protects against minor chemical spills.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat_medspec.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat_medspec.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLabcoatmedspecopen
- name: lab coat (medical open)
- description: A snow-white, sterilised coat that protects against minor chemical spills.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingLeatherjacket
- name: leather jacket
- description: A badass leather jacket.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/leather_jacket.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/leather_jacket.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingPirate
- name: pirate
- description: Yarr.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/pirate.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/pirate.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingQmcoat
- name: QM coat
- description: A robust and comfy coat for quartermasters.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/qm_coat.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/qm_coat.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingRedwizard
- name: red wizard
- description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/redwizard.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/redwizard.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingHoSTrenchcoat
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatHoSTrench
name: head of security trenchcoat
description: This trenchcoat was specifically designed for asserting superior authority.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
- state: hos_trenchcoat
-
+ sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+ sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatInspector
+ name: inspector coat
+ description: A strict inspector coat for being intimidating during inspections.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatJensen
+ name: jensen coat
+ description: A jensen coat.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatLab
+ name: lab coat
+ description: A suit that protects against minor chemical spills.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Coats/labcoat.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Coats/labcoat.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatLabChem
+ name: lab coat (chem)
+ description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatLabCmo
+ name: lab coat (CMO)
+ description: Bluer than the standard model.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterCoatPirate
+ name: pirate
+ description: Yarr.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Coats/pirate.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Coats/pirate.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 1f34b7c155..d155d9aced 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -1,206 +1,180 @@
- type: entity
- parent: OuterclothingBase
- id: HardsuitBase
- name: base hardsuit
- abstract: true
- components:
- - type: PressureProtection
- highPressureMultiplier: 0.75
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: HardsuitDeathsquad
- name: deathsquad hardsuit
- description: An advanced hardsuit favored by commandos for use in special operations.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/deathsquad.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/deathsquad.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.45
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: IHVoidsuit
- name: IH voidsuit
- description: A special void suit that protects against hazardous, low pressure environments.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/ihvoidsuit.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/ihvoidsuit.rsi
- - type: PressureProtection
- highPressureMultiplier: 1
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: HardsuitAtmos
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitAtmos
name: atmos hardsuit
description: A special suit that protects against hazardous, low pressure environments. Has thermal shielding.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
-
+ sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+ sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 100
- type: entity
- parent: HardsuitBase
- id: HardsuitEngineering
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitCap
+ name: captain's armor
+ description: A suit of protective formal armor made for the station's captain.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi
+ highPressureMultiplier: 0.5
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitDeathsquad
+ name: deathsquad hardsuit
+ description: An advanced hardsuit favored by commandos for use in special operations.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.45
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitEngineering
name: engineering hardsuit
description: A special suit that protects against hazardous, low pressure environments. Has radiation shielding.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
-
+ sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+ sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi
- type: PressureProtection
highPressureMultiplier: 0.65
lowPressureMultiplier: 100
- type: entity
- parent: HardsuitBase
- id: HardsuitHazard
- name: hazard hardsuit
- description: A robust hardsuit made for dangerous and hazardous situations.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.75
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: HardsuitMedical
- name: medical hardsuit
- description: A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_medical.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_medical.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.75
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: HardsuitMining
- name: mining hardsuit
- description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_mining.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_mining.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.75
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: HardsuitSecurity
- name: security hardsuit
- description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.75
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: HardsuitSyndie
- name: blood red hardsuit
- description: A dual-mode advanced hardsuit designed for work in special operations.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
- - type: PressureProtection
- highPressureMultiplier: 0.45
- lowPressureMultiplier: 100
-
-# Some massive smoothbrain had this named "hardsuit white" yeah thanks fuckhead really useful.
-- type: entity
- parent: HardsuitBase
- id: HardsuitCE
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitEngineeringWhite
name: CE hardsuit
description: A special hardsuit that protects against hazardous, low pressure environments, made for the chief engineer of the station.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_ce.rsi
-
+ sprite: Clothing/OuterClothing/Hardsuits/engineering-white.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+ sprite: Clothing/OuterClothing/Hardsuits/engineering-white.rsi
- type: PressureProtection
highPressureMultiplier: 0.45
lowPressureMultiplier: 100
- type: entity
- parent: HardsuitBase
- id: HardsuitWizard
+ parent: ClothingOuterHardsuitBase
+ id: IHSVoidsuit
+ name: IHS voidsuit
+ description: A special void suit that protects against hazardous, low pressure environments.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 1
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitMedical
+ name: medical hardsuit
+ description: A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/medical.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/medical.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.75
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitRd
+ name: research director's hardsuit
+ description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/rd.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/rd.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.75
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitSalvage
+ name: salvage hardsuit
+ description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.75
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitSecurity
+ name: security hardsuit
+ description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/security.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/security.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.75
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitSecurityRed
+ name: head of security's hardsuit
+ description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.75
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitSyndie
+ name: blood-red hardsuit
+ description: A dual-mode advanced hardsuit designed for work in special operations.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.45
+ lowPressureMultiplier: 100
+
+- type: entity
+ parent: ClothingOuterHardsuitBase
+ id: ClothingOuterHardsuitWizard
name: wizard hardsuit
description: A bizarre gem-encrusted suit that radiates magical energies.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
-
+ sprite: Clothing/OuterClothing/Hardsuits/wizard.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+ sprite: Clothing/OuterClothing/Hardsuits/wizard.rsi
- type: PressureProtection
highPressureMultiplier: 0.45
lowPressureMultiplier: 100
-
-# I don't know what the hell "td" is but whatever i'll dump it here.
-- type: entity
- parent: HardsuitBase
- id: HardsuitTDGreen
- name: green TD hardsuit
- description: Heavily armored black and green suit for long combat situations, also provides protection from low-pressure/vacuum damage.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/tdgreen.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/tdgreen.rsi
- - type: PressureProtection
- highPressureMultiplier: 1
- lowPressureMultiplier: 100
-
-- type: entity
- parent: HardsuitBase
- id: HardsuitTDRed
- name: red TD hardsuit
- description: Heavily armored black and red suit for long combat situations, also provides protection from low-pressure/vacuum damage.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/tdred.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/tdred.rsi
- - type: PressureProtection
- highPressureMultiplier: 1
- lowPressureMultiplier: 100
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index 2738b0a09b..d47371ad8f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -1,289 +1,199 @@
- type: entity
- parent: OuterclothingBase
- id: OuterclothingApron
+ parent: ClothingOuterBase
+ id: ClothingOuterApron
name: apron
- description: A fancy purple apron for a stylish person.
+ description: A fancy apron for a stylish person.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/apron.rsi
-
+ sprite: Clothing/OuterClothing/Misc/apron.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/apron.rsi
+ sprite: Clothing/OuterClothing/Misc/apron.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingApronchef
- name: apron (chef)
+ parent: ClothingOuterBase
+ id: ClothingOuterApronChef
+ name: apron
+ suffix: Chef
description: An apron-jacket used by a high class chef.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/apronchef.rsi
-
+ sprite: Clothing/OuterClothing/Misc/apronchef.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/apronchef.rsi
+ sprite: Clothing/OuterClothing/Misc/apronchef.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingAssjacket
- name: ass jacket
- description: Very damaged orange jacket. Don't be silly, do not wear it.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/ass_jacket.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/ass_jacket.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBedsheet
- name: ghost costume
- description: This is obviously just a bedsheet, but maybe try it on?
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bedsheet.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bedsheet.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBlackhoodie
- name: black hoodie
- description: Oh my God, it's a black hoodie!
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/black_hoodie.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/black_hoodie.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBlackhoodieopen
- name: black hoodie (open)
- description: Oh my God, it's a black hoodie!
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/black_hoodie_open.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/black_hoodie_open.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingCardborg
- name: cardborg
- description: An ordinary cardboard box with holes cut in the sides.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/cardborg.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/cardborg.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingChaplainhoodie
- name: chaplain hoodie
- description: Black and strict chaplain hoodie.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingChef
+ parent: ClothingOuterBase
+ id: ClothingOuterJacketChef
name: chef
description: An apron-jacket used by a high class chef.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/chef.rsi
-
+ sprite: Clothing/OuterClothing/Misc/chef.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/chef.rsi
+ sprite: Clothing/OuterClothing/Misc/chef.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingChickensuit
- name: chicken suit
- description: Bok bok bok!
+ parent: ClothingOuterBase
+ id: ClothingOuterHoodieBlack
+ name: black hoodie
+ description: Oh my God, it's a black hoodie!
components:
- type: Sprite
- sprite: Clothing/OuterClothing/chickensuit.rsi
-
+ sprite: Clothing/OuterClothing/Misc/black_hoodie.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/chickensuit.rsi
+ sprite: Clothing/OuterClothing/Misc/black_hoodie.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingClassicponcho
+ parent: ClothingOuterBase
+ id: ClothingOuterHoodieGrey
+ name: grey hoodie
+ description: A grey hoodie.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Misc/grey_hoodie.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Misc/grey_hoodie.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterCardborg
+ name: cardborg
+ description: An ordinary cardboard box with holes cut in the sides.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Misc/cardborg.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Misc/cardborg.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterHoodieChaplain
+ name: chaplain hoodie
+ description: Black and strict chaplain hoodie.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Misc/chaplain_hoodie.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Misc/chaplain_hoodie.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterPonchoClassic
name: classic poncho
description: A warm and comfy classic poncho.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/classicponcho.rsi
-
+ sprite: Clothing/OuterClothing/Misc/classicponcho.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/classicponcho.rsi
+ sprite: Clothing/OuterClothing/Misc/classicponcho.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingCultrobes
+ parent: ClothingOuterBase
+ id: ClothingOuterRobesCult
name: cult robes
description: There's no cult without classic red/crimson cult robes.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/cultrobes.rsi
-
+ sprite: Clothing/OuterClothing/Misc/cultrobes.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/cultrobes.rsi
+ sprite: Clothing/OuterClothing/Misc/cultrobes.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingDetvest
- name: detective's vest
- description: A hard-boiled private investigator's grey trenchcoat.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/detvest.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/detvest.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingHazard
- name: hazard
- description: A high-visibility vest used in work zones.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/hazard.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/hazard.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingJudge
+ parent: ClothingOuterBase
+ id: ClothingOuterRobesJudge
name: judge
description: This robe commands authority.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/judge.rsi
-
+ sprite: Clothing/OuterClothing/Misc/judge.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/judge.rsi
+ sprite: Clothing/OuterClothing/Misc/judge.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingMonkeysuit
- name: monkey suit
- description: A suit that looks like a primate.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/monkeysuit.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/monkeysuit.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingPoncho
+ parent: ClothingOuterBase
+ id: ClothingOuterPoncho
name: poncho
description: A warm and comfy poncho.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/poncho.rsi
-
+ sprite: Clothing/OuterClothing/Misc/poncho.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/poncho.rsi
+ sprite: Clothing/OuterClothing/Misc/poncho.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingSanta
+ parent: ClothingOuterBase
+ id: ClothingOuterSanta
name: santa
description: Ho ho ho!
components:
- type: Sprite
- sprite: Clothing/OuterClothing/santa.rsi
-
+ sprite: Clothing/OuterClothing/Misc/santa.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/santa.rsi
+ sprite: Clothing/OuterClothing/Misc/santa.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingStraightjacket
+ parent: ClothingOuterBase
+ id: ClothingOuterStraightjacket
name: straight jacket
description: A straight jacket.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/straight_jacket.rsi
-
+ sprite: Clothing/OuterClothing/Misc/straight_jacket.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/straight_jacket.rsi
-
-# This sprite looks like shit too but whatever...
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingSurgeon
- name: surgeon
- description: A sterile blue surgical apron.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/surgeon.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/surgeon.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingVest
- name: vest
- description: A thick vest with a rubbery, water-resistant shell.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/vest.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/vest.rsi
+ sprite: Clothing/OuterClothing/Misc/straight_jacket.rsi
# Is this wizard wearing a fanny pack???
- type: entity
- parent: OuterclothingBase
- id: OuterclothingVioletwizard
+ parent: ClothingOuterBase
+ id: ClothingOuterWizardViolet
name: violet wizard
description: A bizarre gem-encrusted violet robe that radiates magical energies.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/violetwizard.rsi
-
+ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/violetwizard.rsi
+ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingWizard
+ parent: ClothingOuterBase
+ id: ClothingOuterWizard
name: wizard
description: A bizarre gem-encrusted blue robe that radiates magical energies.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/wizard.rsi
-
+ sprite: Clothing/OuterClothing/Misc/wizard.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/wizard.rsi
+ sprite: Clothing/OuterClothing/Misc/wizard.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingXenos
+ parent: ClothingOuterBase
+ id: ClothingOuterXenos
name: xenos
description: A suit made out of chitinous alien hide.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/xenos.rsi
-
+ sprite: Clothing/OuterClothing/Misc/xenos.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/xenos.rsi
+ sprite: Clothing/OuterClothing/Misc/xenos.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterWizardRed
+ name: red wizard
+ description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Misc/redwizard.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Misc/redwizard.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterSkub
+ name: Skub Suit
+ description: 'Skub is crudely written on the outside of this cylindrical suit.'
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Misc/skubbody.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Misc/skubbody.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 4d310059a1..52c44ff0b5 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -1,206 +1,91 @@
- type: entity
- parent: OuterclothingBase
- id: OuterclothingBio
- name: bio
- description: A suit that protects against biological contamination.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bio.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bio.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBiocmo
- name: bio suit (CMO)
- description: An advanced suit that protects against biological contamination, in CMO colors.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bio_cmo.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bio_cmo.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBiogeneral
- name: bio suit
- description: A suit that protects against biological contamination.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bio_general.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bio_general.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBiojanitor
- name: bio suit (janitor)
- description: A suit that protects against biological contamination, in Janitor colors.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bio_janitor.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bio_janitor.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBioscientist
- name: bio suit (scientist)
- description: A suit that protects against biological contamination, in Scientist colors.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bio_scientist.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bio_scientist.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBiosecurity
- name: bio suit (security)
- description: A suit that protects against biological contamination, in Security colors.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bio_security.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bio_security.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBiovirology
- name: bio suit (virology)
- description: A suit that protects against biological contamination, in Virology colors.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bio_virology.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bio_virology.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBombsuit
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitBomb
name: bombsuit
description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/bombsuit.rsi
-
+ sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/bombsuit.rsi
+ sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingBombsuitsec
- name: bombsuit (security)
- description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce, in Security colors.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bombsuitsec.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bombsuitsec.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingBombsuitwhite
- name: bombsuit (white)
- description: A white heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/bombsuit_white.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/bombsuit_white.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingAnomalysuit
- name: anomaly suit
- description: A special suit designed for safe examining of anomalies.
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/anomaly_suit.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/anomaly_suit.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingEmergencysuit
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitEmergency
name: emergency suit
description: An emergency suit in cases of... emergencies.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/emergency_suit.rsi
-
+ sprite: Clothing/OuterClothing/Suits/emergency.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/emergency_suit.rsi
+ sprite: Clothing/OuterClothing/Suits/emergency.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingFiresuit
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitFire
name: fire suit
description: A suit that helps protect against fire and heat.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/firesuit.rsi
+ sprite: Clothing/OuterClothing/Suits/fire.rsi
- type: PressureProtection
highPressureMultiplier: 0.85
lowPressureMultiplier: 25
- type: Clothing
- sprite: Clothing/OuterClothing/firesuit.rsi
+ sprite: Clothing/OuterClothing/Suits/fire.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingRadSuit
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitRad
name: rad suit
description: "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'"
components:
- type: Sprite
- sprite: Clothing/OuterClothing/radsuit.rsi
-
+ sprite: Clothing/OuterClothing/Suits/rad.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/radsuit.rsi
-
-- type: entity
- parent: OuterclothingBase
- id: OuterclothingSkub
- name: Skub Suit
- description: 'Skub is crudely written on the outside of this cylindrical suit.'
- components:
- - type: Sprite
- sprite: Clothing/OuterClothing/skubbody.rsi
-
- - type: Clothing
- sprite: Clothing/OuterClothing/skubbody.rsi
+ sprite: Clothing/OuterClothing/Suits/rad.rsi
# I think this is a suit? Looks baggy enough
- type: entity
- parent: OuterclothingBase
- id: OuterclothingSyndicate
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitSyndicate
name: syndicate
description: "Has a tag on it 'Totally not property of an enemy corporation, honest!'"
components:
- type: Sprite
- sprite: Clothing/OuterClothing/syndicate.rsi
-
+ sprite: Clothing/OuterClothing/Suits/syndicate.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/syndicate.rsi
+ sprite: Clothing/OuterClothing/Suits/syndicate.rsi
- type: entity
- parent: OuterclothingBase
- id: OuterclothingVoid
- name: void
- description: A special suit for space walking.
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitSpaceninja
+ name: S ninja
+ description: This black technologically advanced, cybernetically-enhanced suit provides good protection and many abilities like invisibility or teleportation.
components:
- type: Sprite
- sprite: Clothing/OuterClothing/void.rsi
-
+ sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
- type: Clothing
- sprite: Clothing/OuterClothing/void.rsi
+ sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitChicken
+ name: chicken suit
+ description: Bok bok bok!
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Suits/chicken.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Suits/chicken.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterSuitMonkey
+ name: monkey suit
+ description: A suit that looks like a primate.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Suits/monkey.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Suits/monkey.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
new file mode 100644
index 0000000000..d67a6ce0c6
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -0,0 +1,65 @@
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterVestWebMerc
+ name: merc web vest
+ description: A high-quality armored vest made from a hard synthetic material. It is surprisingly flexible and light, despite formidable armor plating.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterVestWeb
+ name: web vest
+ description: A synthetic armor vest. This one has added webbing and ballistic plates.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Vests/webvest.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Vests/webvest.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterVestKevlar
+ name: kevlar vest
+ description: An armor vest made of synthetic fibers.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Vests/kevlar.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Vests/kevlar.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterVestDetective
+ name: detective's vest
+ description: A hard-boiled private investigator's grey trenchcoat.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Vests/detvest.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Vests/detvest.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterVestHazard
+ name: hazard
+ description: A high-visibility vest used in work zones.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Vests/hazard.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Vests/hazard.rsi
+
+- type: entity
+ parent: ClothingOuterBase
+ id: ClothingOuterVest
+ name: vest
+ description: A thick vest with a rubbery, water-resistant shell.
+ components:
+ - type: Sprite
+ sprite: Clothing/OuterClothing/Vests/vest.rsi
+ - type: Clothing
+ sprite: Clothing/OuterClothing/Vests/vest.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base.yml
new file mode 100644
index 0000000000..a0509dd2b3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base.yml
@@ -0,0 +1,10 @@
+- type: entity
+ parent: Clothing
+ id: ClothingShoesBase
+ abstract: true
+ components:
+ - type: Clothing
+ Slots:
+ - shoes
+ - type: Sprite
+ state: icon
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
new file mode 100644
index 0000000000..b007d8e761
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -0,0 +1,33 @@
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesBootsMag
+ name: magboots
+ description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Boots/magboots.rsi
+ state: icon
+ - type: Clothing
+ sprite: Clothing/Shoes/Boots/magboots.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesBootsWork
+ name: workboots shoes
+ description: Engineering lace-up work boots for the especially blue-collar.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Boots/workboots.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Boots/workboots.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesBootsJack
+ name: jackboots
+ description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Boots/jackboots.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Boots/jackboots.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml b/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml
deleted file mode 100644
index 079501ccd3..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- type: entity
- parent: ShoesBase
- id: ShoesClown
- name: clown shoes
- description: "The prankster's standard-issue clowning shoes. Damn they're huge!"
- components:
- - type: Sprite
- sprite: Clothing/Shoes/clown.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/clown.rsi
- - type: LoopingSound
- - type: FootstepModifier
- footstepSoundCollection: footstep_clown
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/color.yml b/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
new file mode 100644
index 0000000000..bb79bfe492
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/color.yml
@@ -0,0 +1,98 @@
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorBlack
+ name: black shoes
+ description: Stylish black shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/black.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/black.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorBlue
+ name: blue shoes
+ description: Stylish blue shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/blue.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorBrown
+ name: brown shoes
+ description: A pair of brown shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/brown.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/brown.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorGreen
+ name: green shoes
+ description: Stylish green shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/green.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/green.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorOrange
+ name: orange shoes
+ description: Stylish orange shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/orange.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/orange.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorPurple
+ name: purple shoes
+ description: Stylish purple shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/purple.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/purple.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorRed
+ name: red shoes
+ description: Stylish red shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/red.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/red.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorWhite
+ name: white shoes
+ description: Don't take them off at your office Christmas party.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/white.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/white.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesColorYellow
+ name: yellow shoes
+ description: Stylish yellow shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Color/yellow.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Color/yellow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
new file mode 100644
index 0000000000..1c84261290
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -0,0 +1,43 @@
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesFlippers
+ name: flippers
+ description: A pair of rubber flippers that improves swimming ability when worn.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Misc/flippers.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Misc/flippers.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesLeather
+ name: leather shoes
+ description: Very stylish pair of boots, made from fine leather.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Misc/leather.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Misc/leather.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesSlippers
+ name: slippers
+ description: Fluffy!
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Misc/slippers.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Misc/slippers.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesTourist
+ name: tourist shoes
+ description: These cheap sandals don't look very comfortable.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Misc/tourist.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Misc/tourist.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
deleted file mode 100644
index c26e0368be..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
+++ /dev/null
@@ -1,358 +0,0 @@
-- type: entity
- parent: Clothing
- id: ShoesBase
- abstract: true
- components:
- - type: Clothing
- Slots:
- - shoes
- - type: Sprite
- state: icon
-
-- type: entity
- parent: ShoesBase
- id: ShoesBlack
- name: black shoes
- description: Stylish black shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/black.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/black.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesBlue
- name: blue shoes
- description: Stylish blue shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/blue.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/blue.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesBoots
- name: boots
- description: Comfortable-looking boots.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/boots.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/boots.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesBrown
- name: brown shoes
- description: A pair of brown shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/brown.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/brown.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesChef
- name: chef shoes
- description: Sturdy shoes that minimize injury from falling objects or knives.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/chef.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/chef.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesCowboy
- name: cowboy shoes
- description: A small sticker lets you know they've been inspected for snakes, It is unclear how long ago the inspection took place...
- components:
- - type: Sprite
- sprite: Clothing/Shoes/cowboy.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/cowboy.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesCult
- name: cult shoes
- description: A pair of boots worn by the followers of Nar'Sie.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/cult.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/cult.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesDetective
- name: detective shoes
- description: This pair of leather boots has seen better days.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/detective.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/detective.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesFlippers
- name: flippers
- description: A pair of rubber flippers that improves swimming ability when worn.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/flippers.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/flippers.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesGaloshes
- name: galoshes shoes
- description: Rubber boots.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/galoshes.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/galoshes.rsi
- - type: NoSlip
-
-- type: entity
- parent: ShoesBase
- id: ShoesGreen
- name: green shoes
- description: Stylish green shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/green.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/green.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesLeather
- name: leather shoes
- description: Very stylish pair of boots, made from fine leather.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/leather.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/leather.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesMagboots
- name: magboots
- description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/magboots.rsi
- state: icon
- - type: Clothing
- sprite: Clothing/Shoes/magboots.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesMime
- name: mime shoes
- description: ...
- components:
- - type: Sprite
- sprite: Clothing/Shoes/mime.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/mime.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesOrange
- name: orange shoes
- description: Stylish orange shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/orange.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/orange.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesPurple
- name: purple shoes
- description: Stylish purple shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/purple.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/purple.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesRed
- name: red shoes
- description: Stylish red shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/red.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/red.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesSlippers
- name: slippers
- description: Fluffy!
- components:
- - type: Sprite
- sprite: Clothing/Shoes/slippers.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/slippers.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesSpringjacks
- name: springjacks
- description: Uh... Those are spring jacks.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/springjacks.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/springjacks.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesSwat
- name: swat shoes
- description: When you want to turn up the heat.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/swat.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/swat.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesSNinja
- name: S ninja shoes
- description: A pair of nano-enhanced oots with built-in magnetic suction cups.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/s_ninja.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/s_ninja.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesTourist
- name: tourist shoes
- description: These cheap sandals don't look very comfortable.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/tourist.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/tourist.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesWhite
- name: white shoes
- description: Don't take them off at your office Christmas party.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/white.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/white.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesWizard
- name: wizard shoes
- description: A pair of magic shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/wizard.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/wizard.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesWorkboots
- name: workboots shoes
- description: Engineering lace-up work boots for the especially blue-collar.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/workboots.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/workboots.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesYellow
- name: yellow shoes
- description: Stylish yellow shoes.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/yellow.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/yellow.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesBee
- name: bee socks
- description: Make them loins buzz!
- components:
- - type: Sprite
- sprite: Clothing/Shoes/beesocks.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/beesocks.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesCoder
- name: coder socks
- description: It's time to code sisters!!11!
- components:
- - type: Sprite
- sprite: Clothing/Shoes/codersocks.rsi
-
- - type: Clothing
- sprite: Clothing/Shoes/codersocks.rsi
-
-- type: entity
- parent: ShoesBase
- id: ShoesJackboots
- name: jackboots
- description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/jackboots.rsi
- - type: Clothing
- sprite: Clothing/Shoes/jackboots.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
new file mode 100644
index 0000000000..37e5bb9aa0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -0,0 +1,81 @@
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesChef
+ name: chef shoes
+ description: Sturdy shoes that minimize injury from falling objects or knives.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Specific/chef.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Specific/chef.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesClown
+ name: clown shoes
+ description: "The prankster's standard-issue clowning shoes. Damn they're huge!"
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Specific/clown.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Specific/clown.rsi
+ - type: LoopingSound
+ - type: FootstepModifier
+ footstepSoundCollection: footstep_clown
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesCult
+ name: cult shoes
+ description: A pair of boots worn by the followers of Nar'Sie.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Specific/cult.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Specific/cult.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesGaloshes
+ name: galoshes shoes
+ description: Rubber boots.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Specific/galoshes.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Specific/galoshes.rsi
+ - type: NoSlip
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesSNinja
+ name: S ninja shoes
+ description: A pair of nano-enhanced oots with built-in magnetic suction cups.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Specific/spaceninja.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Specific/spaceninja.rsi
+ - type: NoSlip
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesSwat
+ name: swat shoes
+ description: When you want to turn up the heat.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Specific/swat.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Specific/swat.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingShoesWizard
+ name: wizard shoes
+ description: A pair of magic shoes.
+ components:
+ - type: Sprite
+ sprite: Clothing/Shoes/Specific/wizard.rsi
+ - type: Clothing
+ sprite: Clothing/Shoes/Specific/wizard.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Entities/Clothing/Under/under.yml
new file mode 100644
index 0000000000..ce2ffc629e
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Under/under.yml
@@ -0,0 +1,24 @@
+# These are technically shoes for now, as we don't actually have underwear. But
+# I would cry if we didn't have them. -swept
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingUnderSocksBee
+ name: bee socks
+ description: Make them loins buzz!
+ components:
+ - type: Sprite
+ sprite: Clothing/Under/Socks/bee.rsi
+ - type: Clothing
+ sprite: Clothing/Under/Socks/bee.rsi
+
+- type: entity
+ parent: ClothingShoesBase
+ id: ClothingUnderSocksCoder
+ name: coder socks
+ description: It's time to code sisters!!11!
+ components:
+ - type: Sprite
+ sprite: Clothing/Under/Socks/coder.rsi
+ - type: Clothing
+ sprite: Clothing/Under/Socks/coder.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Under/will be filled out when implemented -S b/Resources/Prototypes/Entities/Clothing/Under/will be filled out when implemented -S
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml
new file mode 100644
index 0000000000..0bc0c42d78
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml
@@ -0,0 +1,20 @@
+- type: entity
+ parent: Clothing
+ id: ClothingUniformBase
+ abstract: true
+ components:
+ - type: Sprite
+ state: icon
+ - type: Clothing
+ Slots: [innerclothing]
+
+- type: entity
+ parent: Clothing
+ id: ClothingUniformSkirtBase
+ abstract: true
+ components:
+ - type: Sprite
+ state: icon
+ - type: Clothing
+ Slots: [innerclothing]
+ femaleMask: UniformTop
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
deleted file mode 100644
index d496a33015..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
+++ /dev/null
@@ -1,475 +0,0 @@
-- type: entity
- parent: UniformBase
- id: UniformColorBase
- abstract: true
- description: A standard issue colored jumpsuit. Variety is the spice of life!
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/color.rsi
-
-
-
- - type: Clothing
- sprite: Clothing/Uniforms/color.rsi
-
-# worldwide
-- type: entity
- parent: UniformColorBase
- id: UniformColorGrey
- description: A tasteful grey jumpsuit that reminds you of the good old days.
- name: grey jumpsuit
- components:
- - type: Sprite
- state: grey
-
- - type: Clothing
- HeldPrefix: grey
-
-- type: entity
- parent: UniformColorGrey
- id: UniformColorGreySkirt
- description: A tasteful grey jumpskirt that reminds you of the good old days.
- name: grey jumpskirt
- components:
- - type: Sprite
- state: grey_skirt
-
- - type: Clothing
- ClothingPrefix: grey_skirt
- femaleMask: UniformTop
- HeldPrefix: grey
-
-# Black
-- type: entity
- parent: UniformColorBase
- id: UniformColorBlack
- name: black jumpsuit
- description: A generic black jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: black
-
- - type: Clothing
- HeldPrefix: black
-
-- type: entity
- parent: UniformColorBlack
- id: UniformColorBlackSkirt
- name: black jumpskirt
- description: A generic black jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: black_skirt
-
- - type: Clothing
- ClothingPrefix: black_skirt
- femaleMask: UniformTop
- HeldPrefix: black
-
-# Blue
-- type: entity
- parent: UniformColorBase
- id: UniformColorBlue
- name: blue jumpsuit
- description: A generic blue jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: blue
-
- - type: Clothing
- HeldPrefix: blue
-
-- type: entity
- parent: UniformColorBlue
- id: UniformColorBlueSkirt
- name: blue jumpskirt
- description: A generic blue jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: blue_skirt
-
- - type: Clothing
- ClothingPrefix: blue_skirt
- femaleMask: UniformTop
- HeldPrefix: blue
-
-# Green
-- type: entity
- parent: UniformColorBase
- id: UniformColorGreen
- name: green jumpsuit
- description: A generic green jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: green
-
- - type: Clothing
- HeldPrefix: green
-
-- type: entity
- parent: UniformColorGreen
- id: UniformColorGreenSkirt
- name: green jumpskirt
- description: A generic green jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: green_skirt
-
- - type: Clothing
- ClothingPrefix: green_skirt
- femaleMask: UniformTop
- HeldPrefix: green
-
-# Orange
-- type: entity
- parent: UniformColorBase
- id: UniformColorOrange
- name: orange jumpsuit
- description: "Don't wear this near paranoid security officers."
- components:
- - type: Sprite
- state: orange
-
- - type: Clothing
- HeldPrefix: orange
-
-- type: entity
- parent: UniformColorOrange
- id: UniformColorOrangeSkirt
- name: orange jumpskirt
- description: "Don't wear this near paranoid security officers."
- components:
- - type: Sprite
- state: orange_skirt
-
- - type: Clothing
- ClothingPrefix: orange_skirt
- femaleMask: UniformTop
- HeldPrefix: orange
-
-# Pink
-- type: entity
- parent: UniformColorBase
- id: UniformColorPink
- name: pink jumpsuit
- description: "Just looking at this makes you feel fabulous."
- components:
- - type: Sprite
- state: pink
-
- - type: Clothing
- ClothingPrefix: pink
- HeldPrefix: pink
-
-- type: entity
- parent: UniformColorPink
- id: UniformColorPinkSkirt
- name: pink jumpskirt
- description: "Just looking at this makes you feel fabulous."
- components:
- - type: Sprite
- state: pink_skirt
-
- - type: Clothing
- ClothingPrefix: pink_skirt
- femaleMask: UniformTop
- HeldPrefix: pink
-
-- type: entity
- parent: UniformColorBase
- id: S
- name: s
- components:
- - type: Sprite
- state: s
-
- - type: Clothing
- HeldPrefix: s
-
-# Red
-- type: entity
- parent: UniformColorBase
- id: UniformColorRed
- name: red jumpsuit
- description: A generic red jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: red
-
- - type: Clothing
- HeldPrefix: red
-
-- type: entity
- parent: UniformColorRed
- id: UniformColorRedSkirt
- name: red jumpskirt
- description: A generic red jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: red_skirt
-
- - type: Clothing
- ClothingPrefix: red_skirt
- femaleMask: UniformTop
- HeldPrefix: red
-
-# White
-- type: entity
- parent: UniformColorBase
- id: UniformColorWhite
- name: white jumpsuit
- description: A generic white jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: white
-
- - type: Clothing
- HeldPrefix: white
-
-- type: entity
- parent: UniformColorWhite
- id: UniformColorWhiteSkirt
- name: white jumpskirt
- description: A generic white jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: white_skirt
-
- - type: Clothing
- ClothingPrefix: white_skirt
- femaleMask: UniformTop
- HeldPrefix: white
-
-# Yellow
-- type: entity
- parent: UniformColorBase
- id: UniformColorYellow
- name: yellow jumpsuit
- description: A generic yellow jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: yellow
-
- - type: Clothing
- HeldPrefix: yellow
-
-- type: entity
- parent: UniformColorYellow
- id: UniformColorYellowSkirt
- name: yellow jumpskirt
- description: A generic yellow jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: yellow_skirt
-
- - type: Clothing
- ClothingPrefix: yellow_skirt
- femaleMask: UniformTop
- HeldPrefix: yellow
-
-# Dark blue
-- type: entity
- parent: UniformColorBase
- id: UniformColorDarkBlue
- name: dark blue jumpsuit
- description: A generic dark blue jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: darkblue
-
- - type: Clothing
- ClothingPrefix: darkblue
- HeldPrefix: darkblue
-
-- type: entity
- parent: UniformColorDarkBlue
- id: UniformColorDarkBlueSkirt
- name: dark blue jumpskirt
- description: A generic dark blue jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: darkblue_skirt
-
- - type: Clothing
- ClothingPrefix: darkblue_skirt
- femaleMask: UniformTop
- HeldPrefix: darkblue
-
-# Teal
-- type: entity
- parent: UniformColorBase
- id: UniformColorTeal
- name: teal jumpsuit
- description: A generic teal jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: teal
-
- - type: Clothing
- ClothingPrefix: teal
- HeldPrefix: teal
-
-- type: entity
- parent: UniformColorTeal
- id: UniformColorTealSkirt
- name: teal jumpskirt
- description: A generic teal jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: teal_skirt
-
- - type: Clothing
- ClothingPrefix: teal_skirt
- femaleMask: UniformTop
- HeldPrefix: teal
-
-# Purple
-- type: entity
- parent: UniformColorBase
- id: UniformColorPurple
- name: purple jumpsuit
- description: A generic purple jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: lightpurple
-
- - type: Clothing
- ClothingPrefix: lightpurple
- HeldPrefix: lightpurple
-
-- type: entity
- parent: UniformColorPurple
- id: UniformColorPurpleSkirt
- name: purple jumpskirt
- description: A generic purple jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: lightpurple_skirt
-
- - type: Clothing
- ClothingPrefix: lightpurple_skirt
- femaleMask: UniformTop
- HeldPrefix: lightpurple
-
-# Dark Green
-- type: entity
- parent: UniformColorBase
- id: UniformColorDarkGreen
- name: dark green jumpsuit
- description: A generic dark green jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: darkgreen
-
- - type: Clothing
- ClothingPrefix: darkgreen
- HeldPrefix: green
-
-- type: entity
- parent: UniformColorDarkGreen
- id: UniformColorDarkGreenSkirt
- name: dark green jumpskirt
- description: A generic dark green jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: darkgreen_skirt
-
- - type: Clothing
- ClothingPrefix: darkgreen_skirt
- femaleMask: UniformTop
- HeldPrefix: green
-
-# Light Brown
-- type: entity
- parent: UniformColorBase
- id: UniformColorLightBrown
- name: light brown jumpsuit
- description: A generic light brown jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: lightbrown
-
- - type: Clothing
- HeldPrefix: lightbrown
-
-- type: entity
- parent: UniformColorLightBrown
- id: UniformColorLightBrownSkirt
- name: light brown jumpskirt
- description: A generic light brown jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: lightbrown_skirt
-
- - type: Clothing
- ClothingPrefix: lightbrown_skirt
- femaleMask: UniformTop
- HeldPrefix: lightbrown
-
-# Brown
-- type: entity
- parent: UniformColorBase
- id: UniformColorBrown
- name: brown jumpsuit
- description: A generic brown jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: brown
-
- - type: Clothing
- ClothingPrefix: brown
- HeldPrefix: lightbrown
-
-- type: entity
- parent: UniformColorBrown
- id: UniformColorBrownSkirt
- name: brown jumpskirt
- description: A generic brown jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: brown_skirt
-
- - type: Clothing
- ClothingPrefix: brown_skirt
- femaleMask: UniformTop
-
-# Maroon
-- type: entity
- parent: UniformColorBase
- id: UniformColorMaroon
- name: maroon jumpsuit
- description: A generic maroon jumpsuit with no rank markings.
- components:
- - type: Sprite
- state: maroon
-
- - type: Clothing
- ClothingPrefix: maroon
- HeldPrefix: maroon
-
-- type: entity
- parent: UniformColorMaroon
- id: UniformColorMaroonSkirt
- name: maroon jumpskirt
- description: A generic maroon jumpskirt with no rank markings.
- components:
- - type: Sprite
- state: maroon_skirt
-
- - type: Clothing
- ClothingPrefix: maroon_skirt
- femaleMask: UniformTop
- HeldPrefix: maroon
-
-# Rainbow
-- type: entity
- parent: UniformColorBase
- id: UniformColorRainbow
- name: rainbow jumpsuit
- description: A multi-colored jumpsuit!
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/rainbow.rsi
- state: icon
- - type: Clothing
- sprite: Clothing/Uniforms/rainbow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
new file mode 100644
index 0000000000..a2b8f84d36
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -0,0 +1,452 @@
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtBartender
+ name: bartender's uniform
+ description: A nice and tidy uniform. Shame about the bar though.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtCargo
+ name: cargo tech jumpskirt
+ description: A sturdy jumpskirt, issued to members of the Cargo department.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtChiefEngineer
+ name: ce jumpskirt
+ description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtChaplain
+ name: chaplain's jumpskirt
+ description: It's a black jumpskirt, often worn by religious folk.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/chaplain.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/chaplain.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtChef
+ name: chef uniform
+ description: Can't cook without this.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/chef.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/chef.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtChemistry
+ name: chemistry jumpskirt
+ description: There's some odd stains on this jumpskirt. Hm.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtCMO
+ name: cmo jumpskirt
+ description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtDetective
+ name: hard-worn suit
+ description: Someone who wears this means business.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/detective.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/detective.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtDetectiveGrey
+ name: noir suit
+ description: A hard-boiled private investigator's grey suit, complete with tie clip.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/detective_grey.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/detective_grey.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtEngineering
+ name: engineering jumpskirt
+ description: If this suit was non-conductive, maybe engineers would actually do their damn job.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtHoP
+ name: hop jumpskirt
+ description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtHoS
+ name: head of security jumpskirt
+ description: It's bright red and rather crisp, much like security's victims tend to be.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtHoSAlt
+ name: head of security turtleneck
+ description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtHoSParadeMale
+ name: head of security's parade uniform
+ description: A male head of security's luxury-wear, for special occasions.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtHydroponics
+ name: hydroponics jumpskirt
+ description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtJanitor
+ name: janitor jumpskirt
+ description: The jumpskirt for the poor sop with a mop.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtMedicalDoctor
+ name: medical doctor jumpskirt
+ description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/medical.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/medical.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtMime
+ name: mime suit
+ description: ...
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/mime.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/mime.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtParamedic
+ name: paramedic jumpskirt
+ description: It's got a plus on it, that's a good thing right?
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtPrisoner
+ name: prisoner jumpskirt
+ description: Busted.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtQM
+ name: quartermaster's jumpskirt
+ description: 'What can brown do for you?'
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/qm.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/qm.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtResearchDirector
+ name: research director's turtleneck
+ description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtScientist
+ name: scientist jumpskirt
+ description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtSec
+ name: security jumpskirt
+ description: A jumpskirt made of strong material, providing robust protection.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtWarden
+ name: warden's uniform
+ description: A formal security suit for officers complete with Nanotrasen belt buckle.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+
+# COLORS
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorGrey
+ description: A tasteful grey jumpskirt that reminds you of the good old days.
+ name: grey jumpskirt
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorBlack
+ name: black jumpskirt
+ description: A generic black jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/black.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/black.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorBlue
+ name: blue jumpskirt
+ description: A generic blue jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/blue.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorGreen
+ name: green jumpskirt
+ description: A generic green jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/green.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/green.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorOrange
+ name: orange jumpskirt
+ description: "Don't wear this near paranoid security officers."
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/orange.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/orange.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorPink
+ name: pink jumpskirt
+ description: "Just looking at this makes you feel fabulous."
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/pink.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/pink.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorRed
+ name: red jumpskirt
+ description: A generic red jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/red.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/red.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorWhite
+ name: white jumpskirt
+ description: A generic white jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/white.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/white.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorYellow
+ name: yellow jumpskirt
+ description: A generic yellow jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/yellow.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/yellow.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorDarkBlue
+ name: dark blue jumpskirt
+ description: A generic dark blue jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorTeal
+ name: teal jumpskirt
+ description: A generic teal jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/teal.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/teal.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorPurple
+ name: purple jumpskirt
+ description: A generic purple jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorDarkGreen
+ name: dark green jumpskirt
+ description: A generic dark green jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorLightBrown
+ name: light brown jumpskirt
+ description: A generic light brown jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorBrown
+ name: brown jumpskirt
+ description: A generic brown jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/brown.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/brown.rsi
+
+- type: entity
+ parent: ClothingUniformSkirtBase
+ id: ClothingUniformJumpskirtColorMaroon
+ name: maroon jumpskirt
+ description: A generic maroon jumpskirt with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
new file mode 100644
index 0000000000..740398223d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -0,0 +1,550 @@
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitBartender
+ name: bartender's uniform
+ description: A nice and tidy uniform. Shame about the bar though.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitBartenderPurple
+ name: purple bartender's uniform
+ description: A special purple outfit to serve drinks.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitCaptain
+ name: captain's jumpsuit
+ description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/captain.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/captain.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitCargo
+ name: cargo tech jumpsuit
+ description: A sturdy jumpsuit, issued to members of the Cargo department.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitChiefEngineer
+ name: ce jumpsuit
+ description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
+
+- type: entity
+ parent: ClothingUniformJumpsuitChiefEngineer
+ id: S
+ name: s
+ components:
+ - type: Sprite
+ state: s
+ - type: Clothing
+ HeldPrefix: s
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitChaplain
+ name: chaplain's jumpsuit
+ description: It's a black jumpsuit, often worn by religious folk.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitChef
+ name: chef uniform
+ description: Can't cook without this.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/chef.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/chef.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitChemistry
+ name: chemistry jumpsuit
+ description: There's some odd stains on this jumpsuit. Hm.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitClown
+ name: clown suit
+ description: HONK!
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitCMO
+ name: cmo jumpsuit
+ description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitDetective
+ name: hard-worn suit
+ description: Someone who wears this means business.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/detective.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/detective.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitDetectiveGrey
+ name: noir suit
+ description: A hard-boiled private investigator's grey suit, complete with tie clip.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitEngineering
+ name: engineering jumpsuit
+ description: If this suit was non-conductive, maybe engineers would actually do their damn job.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitHoP
+ name: hop jumpsuit
+ description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitHoS
+ name: head of security jumpsuit
+ description: It's bright red and rather crisp, much like security's victims tend to be.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitHoSAlt
+ name: head of security turtleneck
+ description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitHoSBlue
+ name: head of security's blue jumpsuit
+ description: A blue jumpsuit of Head of Security.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitHoSGrey
+ name: head of security's grey jumpsuit
+ description: A grey jumpsuit of Head of Security, which make him look somewhat like an assistant.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitHoSParadeMale
+ name: head of security's parade uniform
+ description: A male head of security's luxury-wear, for special occasions.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitHydroponics
+ name: hydroponics jumpsuit
+ description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitJanitor
+ name: janitor jumpsuit
+ description: The jumpsuit for the poor sop with a mop.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitMedicalDoctor
+ name: medical doctor jumpsuit
+ description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/medical.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/medical.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitMime
+ name: mime suit
+ description: ...
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/mime.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/mime.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitParamedic
+ name: paramedic jumpsuit
+ description: It's got a plus on it, that's a good thing right?
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitPrisoner
+ name: prisoner jumpsuit
+ description: Busted.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitQM
+ name: quartermaster's jumpsuit
+ description: 'What can brown do for you?'
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/qm.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/qm.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitResearchDirector
+ name: research director's turtleneck
+ description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitScientist
+ name: scientist jumpsuit
+ description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitSec
+ name: security jumpsuit
+ description: A jumpsuit made of strong material, providing robust protection.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitSecBlue
+ name: blue shirt and tie
+ description: I'm a little busy right now, Calhoun.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitSecGrey
+ name: grey security jumpsuit
+ description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitWarden
+ name: warden's uniform
+ description: A formal security suit for officers complete with Nanotrasen belt buckle.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+
+# COLORS
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorGrey
+ description: A tasteful grey jumpsuit that reminds you of the good old days.
+ name: grey jumpsuit
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorBlack
+ name: black jumpsuit
+ description: A generic black jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorBlue
+ name: blue jumpsuit
+ description: A generic blue jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/blue.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorGreen
+ name: green jumpsuit
+ description: A generic green jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/green.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/green.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorOrange
+ name: orange jumpsuit
+ description: "Don't wear this near paranoid security officers."
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/orange.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/orange.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorPink
+ name: pink jumpsuit
+ description: "Just looking at this makes you feel fabulous."
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/pink.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/pink.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorRed
+ name: red jumpsuit
+ description: A generic red jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/red.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/red.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorWhite
+ name: white jumpsuit
+ description: A generic white jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/white.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/white.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorYellow
+ name: yellow jumpsuit
+ description: A generic yellow jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/yellow.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/yellow.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorDarkBlue
+ name: dark blue jumpsuit
+ description: A generic dark blue jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorTeal
+ name: teal jumpsuit
+ description: A generic teal jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/teal.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/teal.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorPurple
+ name: purple jumpsuit
+ description: A generic purple jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorDarkGreen
+ name: dark green jumpsuit
+ description: A generic dark green jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorLightBrown
+ name: light brown jumpsuit
+ description: A generic light brown jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorBrown
+ name: brown jumpsuit
+ description: A generic brown jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/brown.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/brown.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformJumpsuitColorMaroon
+ name: maroon jumpsuit
+ description: A generic maroon jumpsuit with no rank markings.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/Color/maroon.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/Color/maroon.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: ClothingUniformColorRainbow
+ name: rainbow jumpsuit
+ description: A multi-colored jumpsuit!
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml
new file mode 100644
index 0000000000..a75a07c699
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml
@@ -0,0 +1,32 @@
+- type: entity
+ parent: ClothingUniformBase
+ id: UniformScrubsColorPurple
+ name: purple scrubs
+ description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Scrubs/purple.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Scrubs/purple.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: UniformScrubsColorGreen
+ name: green scrubs
+ description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Scrubs/green.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Scrubs/green.rsi
+
+- type: entity
+ parent: ClothingUniformBase
+ id: UniformScrubsColorBlue
+ name: blue scrubs
+ description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+ components:
+ - type: Sprite
+ sprite: Clothing/Uniforms/Scrubs/blue.rsi
+ - type: Clothing
+ sprite: Clothing/Uniforms/Scrubs/blue.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
deleted file mode 100644
index 99b61c089a..0000000000
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
+++ /dev/null
@@ -1,918 +0,0 @@
-- type: entity
- parent: Clothing
- id: UniformBase
- abstract: true
- components:
- - type: Clothing
- Slots: [innerclothing]
-
-- type: entity
- parent: UniformBase
- id: UniformJanitor
- name: janitor jumpsuit
- description: The jumpsuit for the poor sop with a mop.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_janitor.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_janitor.rsi
-
-- type: entity
- parent: UniformJanitor
- id: UniformJanitorSkirt
- name: janitor jumpskirt
- description: The jumpskirt for the poor sop with a mop.
- components:
- - type: Sprite
- state: jan_skirt
-
- - type: Clothing
- ClothingPrefix: jan_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformEngineering
- name: engineering jumpsuit
- description: If this suit was non-conductive, maybe engineers would actually do their damn job.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_engineering.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_engineering.rsi
-
-- type: entity
- parent: UniformEngineering
- id: UniformEngineeringSkirt
- name: engineering jumpskirt
- description: If this skirt was non-conductive, maybe engineers would actually do their damn job.
- components:
- - type: Sprite
- state: engine_skirt
-
- - type: Clothing
- ClothingPrefix: engine_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformAssistant
- name: assistant jumpsuit
- description: It's a generic grey jumpsuit. That's about what assistants are worth, anyway.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_assistant.rsi
- state: assistant
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_assistant.rsi
-
-- type: entity
- parent: UniformBase
- id: UniformChemistry
- name: chemistry jumpsuit
- description: There's some odd stains on this jumpsuit. Hm.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_medical.rsi
- state: chemistry
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_medical.rsi
- ClothingPrefix: chemistry
-
-- type: entity
- parent: UniformChemistry
- id: UniformChemistrySkirt
- name: chemistry jumpskirt
- description: A sterile jumpskirt in Chemistry colors.
- components:
- - type: Sprite
- state: chemistry_skirt
-
- - type: Clothing
- ClothingPrefix: chemistry_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformParamedic
- name: paramedic jumpsuit
- description: It's got a red plus on it, that's a good thing right?
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_medical.rsi
- state: paramedic
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_medical.rsi
- ClothingPrefix: paramedic
-
-- type: entity
- parent: UniformParamedic
- id: UniformParamedicSkirt
- name: paramedic jumpskirt
- description: A sterile jumpskirt in Paramedic colors.
- components:
- - type: Sprite
- state: paramedic_skirt
-
- - type: Clothing
- ClothingPrefix: paramedic_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformScrubsPurple
- name: purple scrubs
- description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_medical.rsi
- state: scrubspurple
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_medical.rsi
- ClothingPrefix: scrubspurple
-
-- type: entity
- parent: UniformBase
- id: UniformScrubsGreen
- name: green scrubs
- description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_medical.rsi
- state: scrubsgreen
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_medical.rsi
- ClothingPrefix: scrubsgreen
-
-- type: entity
- parent: UniformBase
- id: UniformScrubsBlue
- name: blue scrubs
- description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_medical.rsi
- state: scrubsblue
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_medical.rsi
- ClothingPrefix: scrubsblue
-
-- type: entity
- parent: UniformBase
- id: UniformClown
- name: clown suit
- description: HONK!
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_clown.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_clown.rsi
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformSec
- name: security jumpsuit
- description: A jumpsuit made of strong material, providing robust protection.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_sec.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_sec.rsi
-
-- type: entity
- parent: UniformSec
- id: UniformSecSkirt
- name: security jumpskirt
- description: A jumpskirt made of strong material, providing robust protection.
- components:
- - type: Sprite
- state: sec_skirt
-
- - type: Clothing
- ClothingPrefix: sec_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformSec
- id: UniformSecBlueShirt
- name: blue shirt and tie
- description: I'm a little busy right now, Calhoun.
- components:
- - type: Sprite
- state: blueshift
-
- - type: Clothing
- ClothingPrefix: blueshift
-
-- type: entity
- parent: UniformSec
- id: UniformSecConstable
- name: constable outfit
- description: A british looking outfit.
- components:
- - type: Sprite
- state: constable
-
- - type: Clothing
- ClothingPrefix: constable
-
-- type: entity
- parent: UniformSec
- id: UniformSecFormal
- name: security officer's formal uniform
- description: The latest in fashionable security outfits.
- components:
- - type: Sprite
- state: officerblueclothes
-
- - type: Clothing
- ClothingPrefix: officerblueclothes
-
-- type: entity
- parent: UniformSec
- id: UniformSecFormalTan
- name: security officer's formal uniform (tan)
- description: The latest in fashionable security outfits.
- components:
- - type: Sprite
- state: officertanclothes
-
- - type: Clothing
- ClothingPrefix: officertanclothes
-
-- type: entity
- parent: UniformSec
- id: UniformSecGrey
- name: grey security jumpsuit
- description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
- components:
- - type: Sprite
- state: security_grey
-
- - type: Clothing
- ClothingPrefix: security_grey
- HeldPrefix: gy_suit
-
-- type: entity
- parent: UniformSec
- id: UniformSecSpacePol
- name: police uniform
- description: Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol.
- components:
- - type: Sprite
- state: spacepol
-
- - type: Clothing
- ClothingPrefix: spacepol
-
-- type: entity
- parent: UniformSec
- id: UniformSecSpacePolFamilies
- name: space police uniform
- description: A police uniform often found in the lines at donut shops.
- components:
- - type: Sprite
- state: spacepolice_families
-
- - type: Clothing
- ClothingPrefix: spacepolice_families
-
-- type: entity
- parent: UniformBase
- id: UniformDetective
- name: hard-worn suit
- description: Someone who wears this means business.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_detective.rsi
- state: detective
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_detective.rsi
- ClothingPrefix: detective
- HeldPrefix: detective
-
-- type: entity
- parent: UniformDetective
- id: UniformDetectiveSkirt
- name: detective's suitskirt
- description: Someone who wears this means business.
- components:
- - type: Sprite
- state: detective_skirt
-
- - type: Clothing
- ClothingPrefix: detective_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformDetective
- id: UniformDetectiveGrey
- name: noir suit
- description: A hard-boiled private investigator's grey suit, complete with tie clip.
- components:
- - type: Sprite
- state: greydetective
-
- - type: Clothing
- ClothingPrefix: greydetective
-
-- type: entity
- parent: UniformDetectiveGrey
- id: UniformDetectiveGreySkirt
- name: noir suitskirt
- description: A hard-boiled private investigator's grey suitskirt, complete with tie clip.
- components:
- - type: Sprite
- state: greydetective_skirt
-
- - type: Clothing
- ClothingPrefix: greydetective_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformCargoTech
- name: cargo tech jumpsuit
- description: A sturdy jumpsuit, issued to members of the Cargo department.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_cargotech.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_cargotech.rsi
-
-- type: entity
- parent: UniformCargoTech
- id: UniformCargoTechSkirt
- name: cargo tech jumpskirt
- description: A sturdy jumpskirt, issued to members of the Cargo department.
- components:
- - type: Sprite
- state: cargo_skirt
-
- - type: Clothing
- ClothingPrefix: cargo_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformQM
- name: quartermaster's jumpsuit
- description: 'What can brown do for you?'
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_cargotech.rsi
- state: qm
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_cargotech.rsi
-
-- type: entity
- parent: UniformQM
- id: UniformQMSkirt
- name: quartermaster's jumpskirt
- description: 'What can brown do for you?'
- components:
- - type: Sprite
- state: qm_skirt
-
- - type: Clothing
- ClothingPrefix: qm_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformChef
- name: chef uniform
- description: Can't cook without this.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_chef.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_chef.rsi
-
-- type: entity
- parent: UniformChef
- id: UniformChefSkirt
- name: chef skirt
- description: Can't cook without this.
- components:
- - type: Sprite
- state: chef_skirt
-
- - type: Clothing
- ClothingPrefix: chef_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformCaptain
- name: captain's jumpsuit
- description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_captain.rsi
- state: captain
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_captain.rsi
-
-- type: entity
- parent: UniformBase
- id: UniformChiefEngineer
- name: ce jumpsuit
- description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_ce.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_ce.rsi
-
-- type: entity
- parent: UniformChiefEngineer
- id: UniformChiefEngineerSkirt
- name: ce jumpskirt
- description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
- components:
- - type: Sprite
- state: chief_skirt
-
- - type: Clothing
- ClothingPrefix: chief_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformCMO
- name: cmo jumpsuit
- description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_cmo.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_cmo.rsi
-
-- type: entity
- parent: UniformCMO
- id: UniformCMOSkirt
- name: cmo jumpskirt
- description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
- components:
- - type: Sprite
- state: cmo_skirt
-
- - type: Clothing
- ClothingPrefix: cmo_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformMedicalDoctor
- name: medical doctor jumpsuit
- description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_medical.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_medical.rsi
-
-- type: entity
- parent: UniformMedicalDoctor
- id: UniformMedicalDoctorSkirt
- name: medical doctor jumpskirt
- description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
- components:
- - type: Sprite
- state: medical_skirt
-
- - type: Clothing
- ClothingPrefix: medical_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformScientist
- name: scientist jumpsuit
- description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_scientist.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_scientist.rsi
-
-- type: entity
- parent: UniformScientist
- id: UniformScientistSkirt
- name: scientist jumpskirt
- description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
- components:
- - type: Sprite
- state: sci_skirt
-
- - type: Clothing
- ClothingPrefix: sci_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformResearchDirector
- name: research director's turtleneck
- description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_rnd.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_rnd.rsi
-
-- type: entity
- parent: UniformResearchDirector
- id: UniformResearchDirectorSkirt
- name: research director's skirtleneck
- description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
- components:
- - type: Sprite
- state: rnd_skirt
-
- - type: Clothing
- ClothingPrefix: rnd_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformMime
- name: mime suit
- description: ...
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_mime.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_mime.rsi
-
-- type: entity
- parent: UniformMime
- id: UniformMimeSkirt
- name: mime skirt
- description: ...
- components:
- - type: Sprite
- state: mime_skirt
-
- - type: Clothing
- ClothingPrefix: mime_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformChaplain
- name: chaplain's jumpsuit
- description: It's a black jumpsuit, often worn by religious folk.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_chaplain.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_chaplain.rsi
-
-- type: entity
- parent: UniformChaplain
- id: UniformChaplainSkirt
- name: chaplain's jumpskirt
- description: It's a black jumpskirt. If you wear this, you probably need religious help more than you will be providing it.
- components:
- - type: Sprite
- state: chaplain_skirt
-
- - type: Clothing
- ClothingPrefix: chaplain_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformHoSAlt
- name: head of security turtleneck
- description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_hos.rsi
- state: hosalt
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_hos.rsi
- HeldPrefix: hosalt
-
-- type: entity
- parent: UniformHoSAlt
- id: UniformHoSAltSkirt
- name: head of security skirtleneck
- description: It's a skirtleneck worn by those who were strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
- components:
- - type: Sprite
- state: hosalt_skirt
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_hos.rsi
- ClothingPrefix: hosalt_skirt
- femaleMask: UniformTop
- HeldPrefix: hosalt
-
-- type: entity
- parent: UniformBase
- id: UniformHoS
- name: head of security jumpsuit
- description: It's bright red and rather crisp, much like security's victims tend to be.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_hos.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_hos.rsi
-
-- type: entity
- parent: UniformHoS
- id: UniformHoSSkirt
- name: head of security jumpskirt
- description: It's bright red and rather crisp, much like security's victims tend to be.
- components:
- - type: Sprite
- state: hos_skirt
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_hos.rsi
- ClothingPrefix: hos_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformHoS
- id: UniformHoSGrey
- name: head of security's grey jumpsuit
- description: A grey jumpsuit of Head of Security, which make him look somewhat like an assistant.
- components:
- - type: Sprite
- state: hos_grey
-
- - type: Clothing
- ClothingPrefix: hos_grey
- HeldPrefix: gy_suit
-
-- type: entity
- parent: UniformHoS
- id: UniformHoSParadeMale
- name: head of security's parade uniform
- description: A male head of security's luxury-wear, for special occasions.
- components:
- - type: Sprite
- state: hos_parade_male
-
- - type: Clothing
- ClothingPrefix: hos_parade_male
-
-- type: entity
- parent: UniformHoSParadeMale
- id: UniformHoSParadeFem
- name: head of security's parade uniform
- description: A female head of security's luxury-wear, for special occasions.
- components:
- - type: Sprite
- state: hos_parade_fem
-
- - type: Clothing
- ClothingPrefix: hos_parade_fem
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformHoS
- id: UniformHoSFormal
- name: head of security's formal uniform
- description: The insignia on this uniform tells you that this uniform belongs to the Head of Security.
- components:
- - type: Sprite
- state: hosblueclothes
-
- - type: Clothing
- ClothingPrefix: hosblueclothes
-
-- type: entity
- parent: UniformHoS
- id: UniformHoSFormalTan
- name: head of security's formal uniform (tan)
- description: The insignia on this uniform tells you that this uniform belongs to the Head of Security.
- components:
- - type: Sprite
- state: hostanclothes
-
- - type: Clothing
- ClothingPrefix: hostanclothes
-
-- type: entity
- parent: UniformBase
- id: UniformWarden
- name: warden's uniform
- description: A formal security suit for officers complete with Nanotrasen belt buckle.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_warden.rsi
- state: rwarden
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_warden.rsi
- ClothingPrefix: rwarden
- HeldPrefix: rwarden
-
-- type: entity
- parent: UniformWarden
- id: UniformWardenSkirt
- name: warden's suitskirt
- description: A formal security suitskirt for officers complete with Nanotrasen belt buckle.
- components:
- - type: Sprite
- state: rwarden_skirt
-
- - type: Clothing
- femaleMask: UniformTop
- ClothingPrefix: rwarden_skirt
-
-- type: entity
- parent: UniformWarden
- id: UniformWardenGrey
- name: grey security suit
- description: A formal relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
- components:
- - type: Sprite
- state: warden
-
- - type: Clothing
- ClothingPrefix: warden
- HeldPrefix: gy_suit
-
-- type: entity
- parent: UniformWarden
- id: UniformWardenFormal
- name: warden's formal uniform
- description: The insignia on this uniform tells you that this uniform belongs to the Warden.
- components:
- - type: Sprite
- state: wardenblueclothes
-
- - type: Clothing
- ClothingPrefix: wardenblueclothes
-
-- type: entity
- parent: UniformWarden
- id: UniformWardenFormalTan
- name: warden's formal uniform (tan)
- description: The insignia on this uniform tells you that this uniform belongs to the Warden.
- components:
- - type: Sprite
- state: wardentanclothes
-
- - type: Clothing
- ClothingPrefix: wardentanclothes
-
-- type: entity
- parent: UniformBase
- id: UniformPrisoner
- name: prisoner jumpsuit
- description: Busted.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_prisoner.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_prisoner.rsi
-
-- type: entity
- parent: UniformPrisoner
- id: UniformPrisonerSkirt
- name: prisoner jumpskirt
- description: Busted.
- components:
- - type: Sprite
- state: prisoner_skirt
-
- - type: Clothing
- ClothingPrefix: prisoner_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformHoP
- name: hop jumpsuit
- description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_hop.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_hop.rsi
-
-- type: entity
- parent: UniformHoP
- id: UniformHoPSkirt
- name: hop jumpskirt
- description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
- components:
- - type: Sprite
- state: hop_skirt
-
- - type: Clothing
- ClothingPrefix: hop_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformHydroponics
- name: hydroponics jumpsuit
- description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/uniform_hydro.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/uniform_hydro.rsi
-
-- type: entity
- parent: UniformHydroponics
- id: UniformHydroponicsSkirt
- name: hydroponics jumpskirt
- description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
- components:
- - type: Sprite
- state: hydro_skirt
-
- - type: Clothing
- ClothingPrefix: hydro_skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBase
- id: UniformBartender
- name: bartender's uniform
- description: A nice and tidy uniform. Shame about the bar though.
- components:
- - type: Sprite
- sprite: Clothing/Uniforms/bartender.rsi
- state: icon
-
- - type: Clothing
- sprite: Clothing/Uniforms/bartender.rsi
-
-- type: entity
- parent: UniformBartender
- id: UniformBartenderSkirt
- name: bartender's skirt
- description: A nice and tidy skirt. Shame about the bar though.
- components:
- - type: Sprite
- state: skirt
-
- - type: Clothing
- ClothingPrefix: skirt
- femaleMask: UniformTop
-
-- type: entity
- parent: UniformBartender
- id: UniformBartenderPurple
- name: purple bartender's uniform
- description: A special purple outfit to serve drinks.
- components:
- - type: Sprite
- state: purple
-
- - type: Clothing
- ClothingPrefix: purple
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
index af5abe905c..fd89e37025 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
@@ -3,7 +3,10 @@
parent: Airlock
id: AirlockExternal
suffix: External
+ description: "It opens, it closes, it might crush you, and there might be only space behind it.\nHas to be manually activated."
components:
+ - type: Airlock
+ bumpOpen: false
- type: Sprite
sprite: Constructible/Structures/Doors/airlock_external.rsi
- type: Appearance
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
index b37a374bbe..21affcdef7 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
@@ -22,7 +22,8 @@
- type: IconSmooth
key: catwalk
base: catwalk_
- - type: Catwalk
+ - type: FootstepModifier
+ footstepSoundCollection: footstep_catwalk
- type: Construction
graph: Catwalk
node: Catwalk
diff --git a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
index 3b35c9b988..b5e285e2a2 100644
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -68,8 +68,8 @@
- type: Sprite
netsync: false
sprite: Constructible/Power/smes.rsi
- state: smes
layers:
+ - state: smes
- state: smes-display
shader: unshaded
- type: Smes
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
index 97e6310a7c..87ee34936b 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
@@ -33,7 +33,7 @@
spawnOnDestroy:
ShardGlass:
Min: 1
- Max: 3
+ Max: 2
- type: SnapGrid
offset: Center
- type: Airtight
@@ -58,6 +58,10 @@
sprite: Constructible/Structures/Windows/reinforced_window.rsi
- type: Destructible
deadThreshold: 75
+ spawnOnDestroy:
+ ShardGlassReinforced:
+ Min: 1
+ Max: 2
resistances: metallicResistances
- type: Window
base: rwindow
@@ -77,6 +81,10 @@
sprite: Constructible/Structures/Windows/phoron_window.rsi
- type: Destructible
deadThreshold: 100
+ spawnOnDestroy:
+ ShardGlassPhoron:
+ Min: 1
+ Max: 2
resistances: metallicResistances
- type: Window
base: pwindow
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
index 7d30fd762f..9efecea57d 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
@@ -72,7 +72,7 @@
components:
- type: StorageFill
contents:
- - name: MesonGlasses
+ - name: ClothingEyesGlassesMeson
amount: 4
- type: Sprite
layers:
@@ -90,7 +90,7 @@
components:
- type: StorageFill
contents:
- - name: BreathMaskClothing
+ - name: ClothingMaskBreath
- name: EmergencyOxygenTankFilled
#- name: Injector
- type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
index 33da1d0990..87d1f568e6 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
@@ -25,7 +25,7 @@
components:
- type: StorageFill
contents:
- - name: MaskSterile
+ - name: ClothingMaskSterile
amount: 4
- type: Sprite
layers:
@@ -44,7 +44,7 @@
components:
- type: StorageFill
contents:
- - name: GlovesLatex
+ - name: ClothingHandsGlovesLatex
amount: 4
- type: Sprite
layers:
diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
index afecee773f..d099b39b7a 100644
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
@@ -44,7 +44,7 @@
components:
- type: StorageFill
contents:
- - name: SecGlasses
+ - name: ClothingEyesGlassesSecurity
amount: 4
- type: Sprite
layers:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index f9da2ce23b..014ca554bd 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -11,7 +11,6 @@
components:
- type: Sprite
sprite: Objects/Misc/bedsheets.rsi
-
- type: Clothing
size: 10
QuickEquip: true
@@ -27,14 +26,12 @@
components:
- type: Sprite
state: sheetblack
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_black.rsi
- HeldPrefix: sheetblack
+ sprite: Clothing/Neck/Bedsheets/black.rsi
- type: entity
id: BedsheetBlue
@@ -43,14 +40,12 @@
components:
- type: Sprite
state: sheetblue
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_blue.rsi
- HeldPrefix: sheetblue
+ sprite: Clothing/Neck/Bedsheets/blue.rsi
- type: entity
id: BedsheetBrown
@@ -59,14 +54,12 @@
components:
- type: Sprite
state: sheetbrown
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_brown.rsi
- HeldPrefix: sheetbrown
+ sprite: Clothing/Neck/Bedsheets/brown.rsi
- type: entity
id: BedsheetCaptain
@@ -76,14 +69,12 @@
components:
- type: Sprite
state: sheetcaptain
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_captain.rsi
- HeldPrefix: sheetcaptain
+ sprite: Clothing/Neck/Bedsheets/captain.rsi
- type: entity
id: BedsheetCE
@@ -92,14 +83,12 @@
components:
- type: Sprite
state: sheetce
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_ce.rsi
- HeldPrefix: sheetce
+ sprite: Clothing/Neck/Bedsheets/ce.rsi
- type: entity
id: BedsheetCentcom
@@ -108,14 +97,12 @@
components:
- type: Sprite
state: sheetcentcom
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_centcom.rsi
- HeldPrefix: sheetcentcom
+ sprite: Clothing/Neck/Bedsheets/centcom.rsi
- type: entity
id: BedsheetClown
@@ -124,14 +111,12 @@
components:
- type: Sprite
state: sheetclown
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_rainbow.rsi
- HeldPrefix: sheetrainbow
+ sprite: Clothing/Neck/Bedsheets/rainbow.rsi
- type: entity
id: BedsheetCMO
@@ -140,14 +125,12 @@
components:
- type: Sprite
state: sheetcmo
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_cmo.rsi
- HeldPrefix: sheetcmo
+ sprite: Clothing/Neck/Bedsheets/cmo.rsi
- type: entity
id: BedsheetCosmos
@@ -156,14 +139,12 @@
components:
- type: Sprite
state: sheetcosmos
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_cosmos.rsi
- HeldPrefix: sheetcosmos
+ sprite: Clothing/Neck/Bedsheets/cosmos.rsi
- type: entity
id: BedsheetCult
@@ -172,14 +153,12 @@
components:
- type: Sprite
state: sheetcult
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_cult.rsi
- HeldPrefix: sheetcult
+ sprite: Clothing/Neck/Bedsheets/cult.rsi
- type: entity
id: BedsheetGreen
@@ -188,14 +167,12 @@
components:
- type: Sprite
state: sheetgreen
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_green.rsi
- HeldPrefix: sheetgreen
+ sprite: Clothing/Neck/Bedsheets/green.rsi
- type: entity
id: BedsheetGrey
@@ -204,14 +181,12 @@
components:
- type: Sprite
state: sheetgrey
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_grey.rsi
- HeldPrefix: sheetgrey
+ sprite: Clothing/Neck/Bedsheets/grey.rsi
- type: entity
id: BedsheetHOP
@@ -220,14 +195,12 @@
components:
- type: Sprite
state: sheethop
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_hop.rsi
- HeldPrefix: sheethop
+ sprite: Clothing/Neck/Bedsheets/hop.rsi
- type: entity
id: BedsheetHOS
@@ -236,14 +209,12 @@
components:
- type: Sprite
state: sheethos
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_hos.rsi
- HeldPrefix: sheethos
+ sprite: Clothing/Neck/Bedsheets/hos.rsi
- type: entity
id: BedsheetIan
@@ -252,14 +223,12 @@
components:
- type: Sprite
state: sheetian
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_ian.rsi
- HeldPrefix: sheetian
+ sprite: Clothing/Neck/Bedsheets/ian.rsi
- type: entity
id: BedsheetMedical
@@ -268,14 +237,12 @@
components:
- type: Sprite
state: sheetmedical
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_medical.rsi
- HeldPrefix: sheetmedical
+ sprite: Clothing/Neck/Bedsheets/medical.rsi
- type: entity
id: BedsheetMime
@@ -284,14 +251,12 @@
components:
- type: Sprite
state: sheetmime
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_mime.rsi
- HeldPrefix: sheetmime
+ sprite: Clothing/Neck/Bedsheets/mime.rsi
- type: entity
id: BedsheetNT
@@ -300,14 +265,12 @@
components:
- type: Sprite
state: sheetNT
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_NT.rsi
- HeldPrefix: sheetNT
+ sprite: Clothing/Neck/Bedsheets/NT.rsi
- type: entity
id: BedsheetOrange
@@ -316,14 +279,12 @@
components:
- type: Sprite
state: sheetorange
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_orange.rsi
- HeldPrefix: sheetorange
+ sprite: Clothing/Neck/Bedsheets/orange.rsi
- type: entity
id: BedsheetPurple
@@ -332,14 +293,12 @@
components:
- type: Sprite
state: sheetpurple
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_purple.rsi
- HeldPrefix: sheetpurple
+ sprite: Clothing/Neck/Bedsheets/purple.rsi
- type: entity
id: BedsheetQM
@@ -348,14 +307,12 @@
components:
- type: Sprite
state: sheetqm
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_qm.rsi
- HeldPrefix: sheetqm
+ sprite: Clothing/Neck/Bedsheets/qm.rsi
- type: entity
id: BedsheetRainbow
@@ -364,14 +321,12 @@
components:
- type: Sprite
state: sheetrainbow
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_rainbow.rsi
- HeldPrefix: sheetrainbow
+ sprite: Clothing/Neck/Bedsheets/rainbow.rsi
- type: entity
id: BedsheetRD
@@ -380,14 +335,12 @@
components:
- type: Sprite
state: sheetrd
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_rd.rsi
- HeldPrefix: sheetrd
+ sprite: Clothing/Neck/Bedsheets/rd.rsi
- type: entity
id: BedsheetRed
@@ -396,14 +349,12 @@
components:
- type: Sprite
state: sheetred
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_red.rsi
- HeldPrefix: sheetred
+ sprite: Clothing/Neck/Bedsheets/red.rsi
- type: entity
id: BedsheetSyndie
@@ -412,14 +363,12 @@
components:
- type: Sprite
state: sheetsyndie
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_syndie.rsi
- HeldPrefix: sheetsyndie
+ sprite: Clothing/Neck/Bedsheets/syndie.rsi
- type: entity
id: BedsheetUSA
@@ -428,14 +377,12 @@
components:
- type: Sprite
state: sheetUSA
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_USA.rsi
- HeldPrefix: sheetUSA
+ sprite: Clothing/Neck/Bedsheets/USA.rsi
- type: entity
id: BedsheetWhite
@@ -444,14 +391,12 @@
components:
- type: Sprite
state: sheetwhite
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_white.rsi
- HeldPrefix: sheetwhite
+ sprite: Clothing/Neck/Bedsheets/white.rsi
- type: entity
id: BedsheetWiz
@@ -460,14 +405,12 @@
components:
- type: Sprite
state: sheetwiz
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_wiz.rsi
- HeldPrefix: sheetwiz
+ sprite: Clothing/Neck/Bedsheets/wiz.rsi
- type: entity
id: BedsheetYellow
@@ -476,11 +419,9 @@
components:
- type: Sprite
state: sheetyellow
-
- type: Clothing
size: 10
QuickEquip: true
Slots:
- neck
- sprite: Clothing/Neck/Bedsheets/sheet_yellow.rsi
- HeldPrefix: sheetyellow
+ sprite: Clothing/Neck/Bedsheets/yellow.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index f691652101..b310ee431a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -31,7 +31,7 @@
components:
- type: StorageFill
contents:
- - name: BreathMaskClothing
+ - name: ClothingMaskBreath
amount: 2
- name: FoodChocolateBar
- name: FlashlightLantern
@@ -79,7 +79,7 @@
- name: Wirecutter
- name: ApcExtensionCableStack
- name: MVWireStack
- - name: GlovesYellow
+ - name: ClothingHandsGlovesColorYellow
prob: 0.05
orGroup: GlovesOrWires
- name: HVWireStack
diff --git a/Resources/Prototypes/Entities/Objects/shards.yml b/Resources/Prototypes/Entities/Objects/shards.yml
index 0807101774..b9803cf51b 100644
--- a/Resources/Prototypes/Entities/Objects/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/shards.yml
@@ -25,10 +25,13 @@
description: A small piece of glass. It looks sharp, you wouldn't want to step on it barefoot.
parent: ShardBase
components:
- - type: Sprite
- color: "#bbeeff"
- - type: Item
- color: "#bbeeff"
+ - type: Sprite
+ color: "#bbeeff"
+ - type: Item
+ color: "#bbeeff"
+ - type: WelderRefinable
+ refineResult:
+ - GlassStack
- type: entity
id: ShardGlassReinforced
@@ -36,11 +39,14 @@
description: A small piece of reinforced glass. It looks sharp, you wouldn't want to step on it barefoot.
parent: ShardBase
components:
- - type: Sprite
- color: "#96cdef"
- - type: Item
- color: "#96cdef"
-
+ - type: Sprite
+ color: "#96cdef"
+ - type: Item
+ color: "#96cdef"
+ - type: WelderRefinable
+ refineResult:
+ - GlassStack
+ - MetalStack
- type: entity
id: ShardGlassPhoron
name: phoron glass shard
@@ -51,3 +57,7 @@
color: "#f3b489"
- type: Item
color: "#f3b489"
+ - type: WelderRefinable
+ refineResult:
+ - GlassStack
+ - PhoronStack
diff --git a/Resources/Prototypes/Objectives/traitorObjectives.yml b/Resources/Prototypes/Objectives/traitorObjectives.yml
new file mode 100644
index 0000000000..2423769e5c
--- /dev/null
+++ b/Resources/Prototypes/Objectives/traitorObjectives.yml
@@ -0,0 +1,9 @@
+- type: objective
+ id: SoapDeluxeStealObjective
+ prob: 0.3
+ issuer: The Syndicate
+ requirements:
+ - !type:SuspicionTraitorRequirement {}
+ conditions:
+ - !type:StealCondition
+ prototype: SoapDeluxe
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
index 79a423102c..80b764c620 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -14,8 +14,9 @@
- type: startingGear
id: CargoTechGear
equipment:
- innerclothing: UniformCargoTech
- backpack: BackpackClothingFilled
- shoes: ShoesBlack
+ head: ClothingHeadHatCargosoft
+ innerclothing: ClothingUniformJumpsuitCargo
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBlack
idcard: CargoPDA
- ears: HeadsetCargo
+ ears: ClothingHeadsetCargo
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 3125f420a0..c733b02d29 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -15,8 +15,9 @@
- type: startingGear
id: QuartermasterGear
equipment:
- innerclothing: UniformQM
- backpack: BackpackClothingFilled
- shoes: ShoesBrown
+ head: ClothingHeadHatCargosoft
+ innerclothing: ClothingUniformJumpsuitQM
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBrown
idcard: QuartermasterPDA
- ears: HeadsetCargo
+ ears: ClothingHeadsetCargo
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
index cb1835e746..3df6e98b9d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -12,8 +12,8 @@
- type: startingGear
id: AssistantGear
equipment:
- innerclothing: UniformColorGrey
- backpack: BackpackClothingFilled
- shoes: ShoesBlack
+ innerclothing: ClothingUniformJumpsuitColorGrey
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBlack
idcard: AssistantPDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
index d3f0d7cd1d..c40b5162c0 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -14,9 +14,10 @@
- type: startingGear
id: BartenderGear
equipment:
- innerclothing: UniformBartender
- outerclothing: OuterclothingArmorVest
- backpack: BackpackClothingFilled
- shoes: ShoesBlack
+ head: ClothingHeadHatTophat
+ innerclothing: ClothingUniformJumpsuitBartender
+ outerclothing: ClothingOuterVestKevlar
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBlack
idcard: BartenderPDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
index 53fdd5d039..ca36aaa2f3 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -15,8 +15,8 @@
- type: startingGear
id: BotanistGear
equipment:
- innerclothing: UniformHydroponics
- backpack: BackpackClothingFilled
- shoes: ShoesBrown
+ innerclothing: ClothingUniformJumpsuitHydroponics
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBrown
idcard: BotanistPDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index 34b9d5faef..a093c33dd0 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -13,8 +13,8 @@
- type: startingGear
id: ChaplainGear
equipment:
- innerclothing: UniformChaplain
- backpack: BackpackClothing
- shoes: ShoesBlack
+ innerclothing: ClothingUniformJumpsuitChaplain
+ backpack: ClothingBackpack
+ shoes: ClothingShoesColorBlack
idcard: ChaplainPDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
index adfdf941ac..2a17d051df 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -14,8 +14,9 @@
- type: startingGear
id: ChefGear
equipment:
- innerclothing: UniformChef
- backpack: BackpackClothingFilled
- shoes: ShoesBlack
+ innerclothing: ClothingUniformJumpsuitChef
+ head: ClothingHeadHatChef
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBlack
idcard: ChefPDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 8e03c3716a..c709f8ff76 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -14,10 +14,10 @@
- type: startingGear
id: ClownGear
equipment:
- innerclothing: UniformClown
- backpack: ClownPackFilled
- shoes: ShoesClown
- mask: MaskClown
+ innerclothing: ClothingUniformJumpsuitClown
+ backpack: ClothingBackpackClownFilled
+ shoes: ClothingShoesClown
+ mask: ClothingMaskClown
pocket1: BikeHorn
idcard: ClownPDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
index e621a685ff..8701597c8a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -13,10 +13,10 @@
- type: startingGear
id: JanitorGear
equipment:
- innerclothing: UniformJanitor
- backpack: BackpackClothingFilled
- shoes: ShoesGaloshes
- head: HatPurplesoft
+ innerclothing: ClothingUniformJumpsuitJanitor
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesGaloshes
+ head: ClothingHeadHatPurplesoft
idcard: JanitorPDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 0b6c3c83f7..4e0dd184d6 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -13,14 +13,14 @@
- type: startingGear
id: MimeGear
equipment:
- innerclothing: UniformMime
- backpack: BackpackClothing
- head: HatBeret
- belt: SuspendersClothing
- gloves: GlovesWhite
- shoes: ShoesMime
+ innerclothing: ClothingUniformJumpsuitMime
+ backpack: ClothingBackpackFilled
+ head: ClothingHeadHatBeret
+ belt: ClothingBeltSuspenders
+ gloves: ClothingHandsGlovesLatex
+ shoes: ClothingShoesColorWhite
pocket1: Pen
pocket2: Paper
- mask: MaskMime
+ mask: ClothingMaskMime
idcard: MimePDA
- ears: HeadsetService
+ ears: ClothingHeadsetService
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 0f0a09ccc1..849e517d00 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -11,6 +11,7 @@
# All of em.
# Could probably do with some kind of wildcard or whatever to automate this.
# HELL FUCKING YEAH WE COULD
+ # Guys please don't fight
- Captain
- HeadOfPersonnel
- Command
@@ -38,12 +39,12 @@
- type: startingGear
id: CaptainGear
equipment:
- innerclothing: UniformCaptain
- backpack: BackpackCaptainFilled
- shoes: ShoesBlack
- head: HatCaptain
- eyes: SunGlasses
- gloves: GlovesCaptain
- outerclothing: OuterclothingCaparmor
+ innerclothing: ClothingUniformJumpsuitCaptain
+ backpack: ClothingBackpackCaptainFilled
+ shoes: ClothingShoesColorBlack
+ head: ClothingHeadHatCaptain
+ eyes: ClothingEyesGlassesSunglasses
+ gloves: ClothingHandsGlovesCaptain
+ outerclothing: ClothingOuterHardsuitCap
idcard: CaptainPDA
- ears: HeadsetCommand
+ ears: ClothingHeadsetAltCommand
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 7887c7c6bc..716e0ded13 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -22,9 +22,9 @@
- type: startingGear
id: HoPGear
equipment:
- innerclothing: UniformHoP
- backpack: BackpackClothingFilled
- shoes: ShoesBrown
- head: HatHopcap
+ innerclothing: ClothingUniformJumpsuitHoP
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBrown
+ head: ClothingHeadHatHopcap
idcard: HoPPDA
- ears: HeadsetCommand
+ ears: ClothingHeadsetAltCommand
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index 7a9aed6f53..7ebf03b75b 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -18,10 +18,10 @@
- type: startingGear
id: ChiefEngineerGear
equipment:
- head: HatHardhatWhite
- innerclothing: UniformChiefEngineer
- backpack: BackpackEngineeringFilled
- shoes: ShoesBrown
+ head: ClothingHeadHatHardhatWhite
+ innerclothing: ClothingUniformJumpsuitChiefEngineer
+ backpack: ClothingBackpackEngineeringFilled
+ shoes: ClothingShoesColorBrown
idcard: CEPDA
- ears: HeadsetEngineering
+ ears: ClothingHeadsetEngineering
belt: ClothingBeltChiefEngineerFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index d0308d7962..0e3e49807c 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -15,10 +15,11 @@
- type: startingGear
id: StationEngineerGear
equipment:
- innerclothing: UniformEngineering
- backpack: BackpackEngineeringFilled
- shoes: ShoesWorkboots
- outerclothing: OuterclothingHazard
+ head: ClothingHeadHatHardhatYellow
+ innerclothing: ClothingUniformJumpsuitEngineering
+ backpack: ClothingBackpackEngineeringFilled
+ shoes: ClothingShoesBootsWork
+ outerclothing: ClothingOuterVestHazard
idcard: EngineerPDA
- belt: UtilityBeltClothingFilled
- ears: HeadsetEngineering
+ belt: ClothingBeltUtilityFilled
+ ears: ClothingHeadsetEngineering
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 24861e8d62..7eb6037b6c 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -19,10 +19,10 @@
- type: startingGear
id: CMOGear
equipment:
- innerclothing: UniformCMO
- backpack: BackpackMedicalFilled
- shoes: ShoesBrown
- outerclothing: OuterclothingLabcoatcmo
+ innerclothing: ClothingUniformJumpsuitCMO
+ backpack: ClothingBackpackMedicalFilled
+ shoes: ClothingShoesColorBrown
+ outerclothing: ClothingOuterCoatLabCmo
idcard: CMOPDA
- ears: HeadsetMedicalAlt
+ ears: ClothingHeadsetAltMedical
belt: ClothingBeltMedical
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index 4455b8b2a1..8e4e3b6080 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -14,10 +14,10 @@
- type: startingGear
id: DoctorGear
equipment:
- innerclothing: UniformMedicalDoctor
- backpack: BackpackMedicalFilled
- shoes: ShoesWhite
- outerclothing: OuterclothingLabcoatmedspecopen
+ innerclothing: ClothingUniformJumpsuitMedicalDoctor
+ backpack: ClothingBackpackMedicalFilled
+ shoes: ClothingShoesColorWhite
+ outerclothing: ClothingOuterCoatLab
idcard: MedicalPDA
- ears: HeadsetMedical
+ ears: ClothingHeadsetMedical
belt: ClothingBeltMedical
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 088bd17382..4e30a77141 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -17,10 +17,9 @@
- type: startingGear
id: ResearchDirectorGear
equipment:
- innerclothing: UniformResearchDirector
+ innerclothing: ClothingUniformJumpsuitResearchDirector
# Note to Swept add science backpacks
- backpack: BackpackClothingFilled
- shoes: ShoesBrown
- outerclothing: OuterclothingLabcoatopen
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorBrown
idcard: RnDPDA
- ears: HeadsetScience
+ ears: ClothingHeadsetScience
diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
index 3033d51c76..b9c711a25b 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -14,9 +14,9 @@
- type: startingGear
id: ScientistGear
equipment:
- innerclothing: UniformScientist
- backpack: BackpackClothingFilled
- shoes: ShoesWhite
- outerclothing: OuterclothingLabcoat
+ innerclothing: ClothingUniformJumpsuitScientist
+ backpack: ClothingBackpackFilled
+ shoes: ClothingShoesColorWhite
+ outerclothing: ClothingOuterCoatLab
idcard: SciencePDA
- ears: HeadsetScience
+ ears: ClothingHeadsetScience
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 57fe23f4b3..0e24f9ebdb 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -20,12 +20,12 @@
- type: startingGear
id: HoSGear
equipment:
- innerclothing: UniformHoS
- backpack: SecPackFilled
- shoes: ShoesJackboots
- outerclothing: OuterclothingHoSTrenchcoat
- eyes: SecGlasses
- head: HatBeretHoS
+ innerclothing: ClothingUniformJumpsuitHoS
+ backpack: ClothingBackpackSecurityFilled
+ shoes: ClothingShoesJackboots
+ outerclothing: ClothingOuterCoatHoSTrench
+ eyes: ClothingEyesGlassesSecurity
+ head: ClothingHeadHatBeretHoS
idcard: HoSPDA
- ears: HeadsetSecurityAlt
+ ears: ClothingHeadsetAltSecurity
belt: ClothingBeltSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index cd49ef39c9..3bd87c2371 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -15,11 +15,12 @@
- type: startingGear
id: SecurityOfficerGear
equipment:
- innerclothing: UniformSec
- backpack: SecPackFilled
- shoes: ShoesJackboots
- eyes: SecGlasses
- outerclothing: OuterclothingArmorVest
+ innerclothing: ClothingUniformJumpsuitSec
+ backpack: ClothingBackpackSecurityFilled
+ shoes: ClothingShoesBootsJack
+ eyes: ClothingEyesGlassesSecurity
+ head: ClothingHeadHelmetHelmetOld
+ outerclothing: ClothingOuterVestKevlar
idcard: SecurityPDA
- ears: HeadsetSecurity
+ ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 00b6db25c3..d659f558ea 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -16,11 +16,12 @@
- type: startingGear
id: WardenGear
equipment:
- innerclothing: UniformWarden
- backpack: SecPackFilled
- shoes: ShoesJackboots
- eyes: SecGlasses
- outerclothing: OuterclothingArmorVest
+ head: ClothingHeadHatWarden
+ innerclothing: ClothingUniformJumpsuitWarden
+ backpack: ClothingBackpackSecurityFilled
+ shoes: ClothingShoesBootsJack
+ eyes: ClothingEyesGlassesSecurity
+ outerclothing: ClothingOuterVestKevlar
idcard: WardenPDA
- ears: HeadsetSecurity
+ ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/botany.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/clown.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json
index 3fde6c9744..c3bb350c47 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json
@@ -1,93 +1,97 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "holding",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
},
- "states": [
- {
- "name": "holding-equipped-BACKPACK",
- "directions": 4,
- "delays": [
- [
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
- ],
- [
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
- ],
- [
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
- ],
- [
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
- ]
- ]
- },
- {
- "name": "holding-inhand-right",
- "directions": 4
- },
- {
- "name": "holding-broken",
- "directions": 1
- },
- {
- "name": "holding",
- "directions": 1,
- "delays": [[
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
- ]]
- },
- {
- "name": "holding-unlit",
- "directions": 1,
- "delays": [[
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
- ]]
- },
- {
- "name": "holding-broken-equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "holding-inhand-left",
- "directions": 4
- }
- ]
+ {
+ "name": "holding-equipped-BACKPACK",
+ "directions": 4,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "holding-unlit",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "holding-broken-equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "holding-broken",
+ "directions": 1
+ },
+ {
+ "name": "holding-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "holding-inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Duffels/clown.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Duffels/clown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Duffels/clown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Duffels/clown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Duffels/duffel.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Duffels/duffel_cap.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Duffels/duffel_clown.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Duffels/engineering.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Duffels/engineering.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Duffels/engineering.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_eng.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Duffels/engineering.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Duffels/engineering.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_med.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_sec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Duffels/duffel_syn.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Satchels/engineering.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Satchels/engineering.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Satchels/medical.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Satchels/medical.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json
index e84a910cb3..89236692cc 100644
--- a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json
@@ -1,27 +1,27 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Satchels/satchel_captain.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Satchels/satchel_chemistry.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Satchels/satchel_engineering.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Satchels/satchel_hydroponics.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Satchels/satchel_medical.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json
deleted file mode 100644
index e84a910cb3..0000000000
--- a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/meta.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1
- },
- {
- "name": "equipped-BACKPACK",
- "directions": 4
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Satchels/science.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_science.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Satchels/science.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/equipped-BACKPACK.png
rename to Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/icon.png
rename to Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Back/Satchels/satchel_security.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json
new file mode 100644
index 0000000000..89236692cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-BACKPACK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/meta.json b/Resources/Textures/Clothing/Belt/assault.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/assault.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/assault.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/bandolier.rsi/meta.json b/Resources/Textures/Clothing/Belt/bandolier.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/bandolier.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/bandolier.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json
index 5f411866b4..bf73608815 100644
--- a/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/belt_icon_overlay.rsi/meta.json
@@ -1,11 +1,11 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
"states": [
{
"name": "crowbar",
diff --git a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json
index a6ea5838f7..cdfd58956c 100644
--- a/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/belt_mob_overlay.rsi/meta.json
@@ -1,11 +1,11 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dc89ef0239830774bd3d9d7d6c8da2856da2b869",
"states": [
{
"name": "baton",
diff --git a/Resources/Textures/Clothing/Belt/ce.rsi/meta.json b/Resources/Textures/Clothing/Belt/ce.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/ce.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/ce.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/champion.rsi/meta.json b/Resources/Textures/Clothing/Belt/champion.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/champion.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/champion.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/holster.rsi/meta.json b/Resources/Textures/Clothing/Belt/holster.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/holster.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/holster.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/janitor.rsi/meta.json b/Resources/Textures/Clothing/Belt/janitor.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/janitor.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/janitor.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/medical.rsi/meta.json b/Resources/Textures/Clothing/Belt/medical.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/medical.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/militarywebbing.rsi/meta.json b/Resources/Textures/Clothing/Belt/militarywebbing.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/militarywebbing.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/militarywebbing.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/security.rsi/meta.json b/Resources/Textures/Clothing/Belt/security.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/security.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
index f2beb8d38f..fa6033a032 100644
--- a/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/sheath.rsi/meta.json
@@ -1,65 +1,65 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
{
- "name": "sheath-equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
+ "name": "sheath-equipped-BELT",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
]
- ]
},
{
- "name": "sheath-sabre-equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
+ "name": "sheath-sabre-equipped-BELT",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
]
- ]
},
{
- "name": "sheath-sabre",
- "directions": 1,
- "delays": [
- [
- 1
+ "name": "sheath-sabre",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
]
- ]
},
{
- "name": "sheath",
- "directions": 1,
- "delays": [
- [
- 1
+ "name": "sheath",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
]
- ]
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json b/Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json
index 6fd2d07a08..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json
@@ -1,74 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "directions": 4
},
{
"name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Belt/utility.rsi/meta.json b/Resources/Textures/Clothing/Belt/utility.rsi/meta.json
index d1facf554c..49dac66974 100644
--- a/Resources/Textures/Clothing/Belt/utility.rsi/meta.json
+++ b/Resources/Textures/Clothing/Belt/utility.rsi/meta.json
@@ -1,38 +1,27 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"states": [
{
- "name": "equipped-BELT",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
+ "name": "icon",
+ "directions": 1
},
{
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
+ "name": "equipped-BELT",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
}
]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/cypherkey.png
deleted file mode 100644
index 89d59318c5..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
index 466d4dc4b4..3ced4137a7 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
@@ -1,47 +1,19 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "equipped-EARS",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/cargo_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/cargo_cypherkey.png
deleted file mode 100644
index f08d625d21..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/cargo_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
index 9b1aa9ebc2..3ced4137a7 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
@@ -1,56 +1,19 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "equipped-EARS",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "cargo_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "qm_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/qm_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/qm_cypherkey.png
deleted file mode 100644
index bebcba755d..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/qm_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/cent_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/cent_cypherkey.png
deleted file mode 100644
index 63448b3cc0..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/cent_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
index 0cf51cc752..b5cb116fa1 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
@@ -1,38 +1,19 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "cent_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon_alt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "icon_alt",
+ "directions": 1
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/com_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/com_cypherkey.png
deleted file mode 100644
index c2201a0ac5..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/com_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/hop_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/hop_cypherkey.png
deleted file mode 100644
index cf75dbf63c..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/hop_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
index 9af41648fc..cf7927b708 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
@@ -1,65 +1,23 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "equipped-EARS",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "com_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon_alt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "hop_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "icon_alt",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/ce_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/ce_cypherkey.png
deleted file mode 100644
index f36e82b817..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/ce_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/eng_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/eng_cypherkey.png
deleted file mode 100644
index cf84b08e3f..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/eng_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
index ce6662ce27..3ced4137a7 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
@@ -1,56 +1,19 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "equipped-EARS",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "ce_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "eng_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/cmo_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/cmo_cypherkey.png
deleted file mode 100644
index 3f40eb2760..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/cmo_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/med_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/med_cypherkey.png
deleted file mode 100644
index 49952c906c..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/med_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
index 29e98e138f..cf7927b708 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
@@ -1,65 +1,23 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "equipped-EARS",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "cmo_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "med_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon_alt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "icon_alt",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/medsci_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/medsci_cypherkey.png
deleted file mode 100644
index 74e9ea4d7a..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/medsci_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
index 6a326bd301..8fd3c8e332 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
@@ -1,29 +1,15 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "medsci_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
index cef2c1df15..8fd3c8e332 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
@@ -1,29 +1,15 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "mine_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/mine_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/mine_cypherkey.png
deleted file mode 100644
index 479fb8f0aa..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/mine_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
index 0d5e02141d..8fd3c8e332 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
@@ -1,29 +1,15 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "rob_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/rob_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/rob_cypherkey.png
deleted file mode 100644
index 0cf9315d97..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/rob_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
index 703220a34e..8fd3c8e332 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
@@ -1,38 +1,15 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "rd_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "sci_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/rd_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/rd_cypherkey.png
deleted file mode 100644
index 1efdef309c..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/rd_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/sci_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/sci_cypherkey.png
deleted file mode 100644
index de7552924e..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/sci_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/hos_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/hos_cypherkey.png
deleted file mode 100644
index 007b9ef6d1..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/hos_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
index 91b59a17da..cf7927b708 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
@@ -1,65 +1,23 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "equipped-EARS",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "sec_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon_alt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "icon_alt",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/sec_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/sec_cypherkey.png
deleted file mode 100644
index fc37f8be5b..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/sec_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
index 68e0f1ccf5..8fd3c8e332 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
@@ -1,29 +1,15 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "srv_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/srv_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/srv_cypherkey.png
deleted file mode 100644
index 9b3bfb3999..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/srv_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/srvsec_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/srvsec_cypherkey.png
deleted file mode 100644
index 44efb3e19a..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/srvsec_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicemedical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicemedical.rsi/meta.json
deleted file mode 100644
index ddf4fb5bc1..0000000000
--- a/Resources/Textures/Clothing/Ears/Headsets/servicemedical.rsi/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "srvmed_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicemedical.rsi/srvmed_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/servicemedical.rsi/srvmed_cypherkey.png
deleted file mode 100644
index a500d3f076..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/servicemedical.rsi/srvmed_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
index 84c8977615..8fd3c8e332 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
@@ -1,29 +1,15 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "srvsec_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/srvsec_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/srvsec_cypherkey.png
deleted file mode 100644
index 44efb3e19a..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/srvsec_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
index a8c364b264..666069abd8 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
@@ -1,47 +1,19 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon_alt",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428/icons/obj/radio.dmi",
- "states": [
- {
- "name": "equipped-EARS",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "syn_cypherkey",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "icon_alt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
+ {
+ "name": "equipped-EARS",
+ "directions": 4
+ }
+ ]
}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/syn_cypherkey.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/syn_cypherkey.png
deleted file mode 100644
index 3c7b82497d..0000000000
Binary files a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/syn_cypherkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/equipped-EYES.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses.rsi/equipped-EYES.png
rename to Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/equipped-EYES.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/icon.png
new file mode 100644
index 0000000000..fc8ee4f544
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/meta.json
new file mode 100644
index 0000000000..7a84103841
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-equipped-EYES.png
new file mode 100644
index 0000000000..24185c63f9
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-inhand-left.png
new file mode 100644
index 0000000000..f7c8a4501b
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-inhand-right.png
new file mode 100644
index 0000000000..3afeccddd0
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/alt-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..9460d0d109
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-alt.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-alt.png
new file mode 100644
index 0000000000..3984ec1f70
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-alt.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-super.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-super.png
new file mode 100644
index 0000000000..9253927162
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-super.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon.png
new file mode 100644
index 0000000000..286c2aa3eb
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/inhand-left.png
new file mode 100644
index 0000000000..629819790f
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/inhand-right.png
new file mode 100644
index 0000000000..0d87530067
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json
new file mode 100644
index 0000000000..8f22126d1c
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-alt",
+ "directions": 1
+ },
+ {
+ "name": "icon-super",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "alt-equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "super-equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "alt-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "alt-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "super-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "super-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-equipped-EYES.png
new file mode 100644
index 0000000000..92d3276b36
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png
new file mode 100644
index 0000000000..3afeccddd0
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png
new file mode 100644
index 0000000000..f7c8a4501b
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..c4c838f513
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/icon.png
new file mode 100644
index 0000000000..8204d495ce
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-left.png
new file mode 100644
index 0000000000..36e283a292
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-right.png
new file mode 100644
index 0000000000..b02a6b8528
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/meson_scanners.rsi/equipped-EYES.png
rename to Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES.png
diff --git a/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meson.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meson.png
rename to Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-left.png
new file mode 100644
index 0000000000..ebd7858dab
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-right.png
new file mode 100644
index 0000000000..53535a1de7
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/equipped-EYES.png
rename to Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/icon.png
rename to Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..f72e29ec42
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses.rsi/icon.png
rename to Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..9bef0a8c05
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/icon.png
new file mode 100644
index 0000000000..3fbc30b7e9
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png
new file mode 100644
index 0000000000..bf67e35d40
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png
new file mode 100644
index 0000000000..4ede078291
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..65d1d2383e
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/icon.png
new file mode 100644
index 0000000000..a4fa06807c
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/inhand-left.png
new file mode 100644
index 0000000000..2f397fc065
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/inhand-right.png
new file mode 100644
index 0000000000..47c732cd53
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Hud/diag.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..63f6e1e018
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/icon.png
new file mode 100644
index 0000000000..efc87155fd
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/inhand-left.png
new file mode 100644
index 0000000000..fbadf2153a
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/inhand-right.png
new file mode 100644
index 0000000000..17b1f2f33c
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..cecd480c8c
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/icon.png
new file mode 100644
index 0000000000..124404b5ee
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/inhand-left.png
new file mode 100644
index 0000000000..d78e9891e0
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/inhand-right.png
new file mode 100644
index 0000000000..c04f2b1484
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json
new file mode 100644
index 0000000000..2a9fd063af
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..7534d4eb56
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/icon.png
new file mode 100644
index 0000000000..d20ba6a97a
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/meta.json
new file mode 100644
index 0000000000..7a84103841
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-EYES",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meta.json b/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meta.json
deleted file mode 100644
index 315034e91c..0000000000
--- a/Resources/Textures/Clothing/Glasses/meson_scanners.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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/Glasses/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/meta.json
deleted file mode 100644
index 713dbfe673..0000000000
--- a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/meta.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "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
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/meta.json b/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/meta.json
deleted file mode 100644
index 6ae92a7ddd..0000000000
--- a/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/meta.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
- "states": [
- {
- "name": "equipped-EYES",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Gloves/black.rsi/meta.json b/Resources/Textures/Clothing/Gloves/black.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/black.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/blue.rsi/meta.json b/Resources/Textures/Clothing/Gloves/blue.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/blue.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/boxing.rsi/meta.json b/Resources/Textures/Clothing/Gloves/boxing.rsi/meta.json
deleted file mode 100644
index 2d32e01e74..0000000000
--- a/Resources/Textures/Clothing/Gloves/boxing.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/boxingblue.rsi/meta.json b/Resources/Textures/Clothing/Gloves/boxingblue.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/boxingblue.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/boxinggreen.rsi/meta.json b/Resources/Textures/Clothing/Gloves/boxinggreen.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/boxinggreen.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/boxingyellow.rsi/meta.json b/Resources/Textures/Clothing/Gloves/boxingyellow.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/boxingyellow.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/brown.rsi/meta.json b/Resources/Textures/Clothing/Gloves/brown.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/brown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/captain.rsi/meta.json b/Resources/Textures/Clothing/Gloves/captain.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/captain.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/gray.rsi/meta.json b/Resources/Textures/Clothing/Gloves/gray.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/gray.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/green.rsi/meta.json b/Resources/Textures/Clothing/Gloves/green.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/green.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/ihscombat.rsi/meta.json b/Resources/Textures/Clothing/Gloves/ihscombat.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/ihscombat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/latex.rsi/meta.json b/Resources/Textures/Clothing/Gloves/latex.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/latex.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/leather.rsi/meta.json b/Resources/Textures/Clothing/Gloves/leather.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/leather.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/lightbrown.rsi/meta.json b/Resources/Textures/Clothing/Gloves/lightbrown.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/lightbrown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/orange.rsi/meta.json b/Resources/Textures/Clothing/Gloves/orange.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/orange.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/powerglove.rsi/meta.json b/Resources/Textures/Clothing/Gloves/powerglove.rsi/meta.json
deleted file mode 100644
index 2d32e01e74..0000000000
--- a/Resources/Textures/Clothing/Gloves/powerglove.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/powerglove_active.rsi/meta.json b/Resources/Textures/Clothing/Gloves/powerglove_active.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/powerglove_active.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/purple.rsi/meta.json b/Resources/Textures/Clothing/Gloves/purple.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/purple.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/red.rsi/meta.json b/Resources/Textures/Clothing/Gloves/red.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/red.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/robohands.rsi/meta.json b/Resources/Textures/Clothing/Gloves/robohands.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/robohands.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/s_ninja.rsi/meta.json b/Resources/Textures/Clothing/Gloves/s_ninja.rsi/meta.json
deleted file mode 100644
index 2d32e01e74..0000000000
--- a/Resources/Textures/Clothing/Gloves/s_ninja.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjak.rsi/meta.json b/Resources/Textures/Clothing/Gloves/s_ninjak.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/s_ninjak.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjan.rsi/meta.json b/Resources/Textures/Clothing/Gloves/s_ninjan.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/s_ninjan.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/meta.json b/Resources/Textures/Clothing/Gloves/white.rsi/meta.json
deleted file mode 100644
index 6d12c5653a..0000000000
--- a/Resources/Textures/Clothing/Gloves/white.rsi/meta.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi",
- "states": [
- {
- "name": "equipped-HAND",
- "directions": 4
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Gloves/yellow.rsi/meta.json b/Resources/Textures/Clothing/Gloves/yellow.rsi/meta.json
deleted file mode 100644
index 1b711f41bc..0000000000
--- a/Resources/Textures/Clothing/Gloves/yellow.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Gloves/black.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/black.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/black.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/black.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/black.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/black.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/blue.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/blue.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/blue.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/blue.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/blue.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/blue.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/brown.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/brown.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/brown.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/brown.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/brown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/brown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/gray.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/gray.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/gray.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/gray.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/gray.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/gray.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/gray.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/gray.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/green.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/green.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/green.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/green.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/green.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/green.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/lightbrown.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/lightbrown.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/lightbrown.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/lightbrown.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/lightbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/lightbrown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/lightbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/lightbrown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/orange.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/orange.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/orange.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/orange.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/orange.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/orange.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/purple.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/purple.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/purple.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/purple.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/purple.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/purple.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/purple.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/purple.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/red.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/red.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/red.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/red.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/red.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/red.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/white.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/white.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/white.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/white.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/yellow.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/yellow.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/yellow.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/yellow.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/yellow.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/yellow.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/boxingblue.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingblue.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/boxingblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingblue.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/boxingblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingblue.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/blue-inhand-right.png
diff --git a/Resources/Textures/Clothing/Gloves/boxing.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxing.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/boxinggreen.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxinggreen.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/boxinggreen.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxinggreen.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/boxinggreen.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxinggreen.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/green-inhand-right.png
diff --git a/Resources/Textures/Clothing/Gloves/boxingblue.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-blue.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingblue.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-blue.png
diff --git a/Resources/Textures/Clothing/Gloves/boxinggreen.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-green.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxinggreen.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-green.png
diff --git a/Resources/Textures/Clothing/Gloves/boxingyellow.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-yellow.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingyellow.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon-yellow.png
diff --git a/Resources/Textures/Clothing/Gloves/boxing.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxing.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/boxing.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxing.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/boxing.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxing.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/meta.json
new file mode 100644
index 0000000000..1c1f4260c3
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/meta.json
@@ -0,0 +1,75 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-blue",
+ "directions": 1
+ },
+ {
+ "name": "icon-green",
+ "directions": 1
+ },
+ {
+ "name": "icon-yellow",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "blue-equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "green-equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "yellow-equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "blue-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "blue-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "green-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "green-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "yellow-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "yellow-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/boxingyellow.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingyellow.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/boxingyellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingyellow.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/boxingyellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/boxingyellow.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/boxing.rsi/yellow-inhand-right.png
diff --git a/Resources/Textures/Clothing/Gloves/captain.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/captain.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/captain.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/captain.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/captain.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/captain.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/ihscombat.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/ihscombat.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/ihscombat.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/ihscombat.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/ihscombat.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/ihscombat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/ihscombat.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/ihscombat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/meta.json
new file mode 100644
index 0000000000..339c9f36a1
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/ihscombat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/55d823b97dda098a1b2ee9edfca7155c753e456e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/latex.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/latex.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/latex.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/latex.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/latex.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/latex.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/latex.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/latex.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/leather.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/leather.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/leather.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/leather.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/leather.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/leather.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/leather.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/leather.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/leather.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/leather.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/leather.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/leather.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/powerglove.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/powerglove_active.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove_active.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/icon-on.png
diff --git a/Resources/Textures/Clothing/Gloves/powerglove.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/powerglove.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/powerglove.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json
new file mode 100644
index 0000000000..8b037ebbd2
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/55d823b97dda098a1b2ee9edfca7155c753e456e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-on",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/powerglove_active.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove_active.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/powerglove_active.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove_active.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/powerglove_active.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/powerglove_active.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/powerglove.rsi/on-inhand-right.png
diff --git a/Resources/Textures/Clothing/Gloves/robohands.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/robohands.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/robohands.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/robohands.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/robohands.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/robohands.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/robohands.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/robohands.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json
new file mode 100644
index 0000000000..b9bb10dcb9
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/s_ninja.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninja.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjan.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjan.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjan.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjan.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjan.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjan.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/green-inhand-right.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjan.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon-green.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjan.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon-green.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjak.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon-red.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjak.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon-red.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninja.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninja.rsi/icon.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninja.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninja.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json
new file mode 100644
index 0000000000..b4acff37db
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-red",
+ "directions": 1
+ },
+ {
+ "name": "icon-green",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "red-equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "green-equipped-HAND",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "red-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "red-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "green-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "green-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjak.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjak.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjak.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjak.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-inhand-left.png
diff --git a/Resources/Textures/Clothing/Gloves/s_ninjak.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Gloves/s_ninjak.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/red-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/cat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/cat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/cat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cat.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/cat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/cat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/cat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/cat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/cat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/cat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/cat.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/cat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/cat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cat2.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/cat2.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat2.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/cat2.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cat2.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/cat2.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat2.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/cat2.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cat2.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/cat2.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat2.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/cat2.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cat2.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/cat2.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat2.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/cat2.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/cat2.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/cat2.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/cat2.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cat3.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/cat3.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat3.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/cat3.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cat3.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/cat3.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat3.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/cat3.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cat3.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/cat3.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat3.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/cat3.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cat3.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/cat3.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cat3.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/cat3.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/cat3.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/cat3.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/cat3.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/headslime.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/headslime.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/headslime.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/headslime.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/headslime.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/headslime.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/headslime.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/headslime.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/headslime.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/headslime.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/headslime.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/headslime.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/headslime.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/headslime.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/headslime.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/headslime.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/headslime.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/headslime.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/headslime.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/monkey.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/monkey.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/monkey.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/monkey.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/monkey.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/monkey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/monkey.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/monkey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/monkey.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/monkey.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/monkey.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/monkey.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/monkey.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/monkey.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/monkey.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/monkey.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/monkey.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/monkey.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/monkey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/mouse_brown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_brown.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/mouse_brown.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_brown.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/mouse_brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_brown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/mouse_brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_brown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/mouse_brown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/mouse_gray.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_gray.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/mouse_gray.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_gray.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/mouse_gray.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_gray.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/mouse_gray.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_gray.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/mouse_gray.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/mouse_white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_white.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/mouse_white.rsi/icon.png b/Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_white.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/mouse_white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_white.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/mouse_white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mouse_white.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/meta.json b/Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Animals/mouse_white.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..c9a347658c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/icon.png
new file mode 100644
index 0000000000..c9cdf17b79
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/icon_mask.png
new file mode 100644
index 0000000000..4509456c94
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/inhand-left.png
new file mode 100644
index 0000000000..5bce5a4bc2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/inhand-right.png
new file mode 100644
index 0000000000..735989ba20
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..4b9b0bef63
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..eef3efd0e8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/icon.png
new file mode 100644
index 0000000000..7a49d82916
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/icon_mask.png
new file mode 100644
index 0000000000..05481a95e8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/inhand-left.png
new file mode 100644
index 0000000000..a5129b7005
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/inhand-right.png
new file mode 100644
index 0000000000..d3a760491b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..fa88a07ae0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..985d68a48d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/icon.png
new file mode 100644
index 0000000000..8f3b6d6480
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/icon_mask.png
new file mode 100644
index 0000000000..5235c1a374
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/inhand-left.png
new file mode 100644
index 0000000000..2748b69d36
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/inhand-right.png
new file mode 100644
index 0000000000..f97199f72d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..317f08cb61
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..b696287197
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/icon.png
new file mode 100644
index 0000000000..1ddfb06fdf
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/icon_mask.png
new file mode 100644
index 0000000000..93f4ab88a0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/inhand-left.png
new file mode 100644
index 0000000000..d176a2ec0f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/inhand-right.png
new file mode 100644
index 0000000000..1ec22cef25
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..67702d2b78
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..0031dd7f2b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/icon.png
new file mode 100644
index 0000000000..5b22dd64f0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/icon_mask.png
new file mode 100644
index 0000000000..d549f9053f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/inhand-left.png
new file mode 100644
index 0000000000..5b21da3654
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/inhand-right.png
new file mode 100644
index 0000000000..6676e5de09
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..bcaf5d0dcb
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..49767b22d3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/icon.png
new file mode 100644
index 0000000000..b457c08c0e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/icon_mask.png
new file mode 100644
index 0000000000..de620d0f51
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/inhand-left.png
new file mode 100644
index 0000000000..38ccf3b60e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/inhand-right.png
new file mode 100644
index 0000000000..f96fafdde0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..e0c5c73b06
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..95cd09ebcd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon.png
new file mode 100644
index 0000000000..fae8dd3647
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon_mask.png
new file mode 100644
index 0000000000..c8e5917c27
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-left.png
new file mode 100644
index 0000000000..2b2dedec43
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-right.png
new file mode 100644
index 0000000000..bc344c512b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..d7df1b210a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..c9a347658c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/icon.png
new file mode 100644
index 0000000000..33727dae4d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/icon_mask.png
new file mode 100644
index 0000000000..88b8e0bb5e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/icon_mask.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/inhand-left.png
new file mode 100644
index 0000000000..a5bb49869c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/inhand-right.png
new file mode 100644
index 0000000000..aa2c788bfe
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/mask-equipped-HELMET.png
new file mode 100644
index 0000000000..8500b2925f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/mask-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/meta.json
new file mode 100644
index 0000000000..c9b83c852b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon_mask",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "mask-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_blue.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
new file mode 100644
index 0000000000..3a850ef0d8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json
new file mode 100644
index 0000000000..ce1c5b7db5
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "light-icon",
+ "directions": 1
+ },
+ {
+ "name": "off-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_blue.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_blue.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_blue.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..445521b606
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..42d3d419f5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_orange.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
new file mode 100644
index 0000000000..3a850ef0d8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json
new file mode 100644
index 0000000000..ce1c5b7db5
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "light-icon",
+ "directions": 1
+ },
+ {
+ "name": "off-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_orange.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_orange.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_orange.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..4ba1cf4cf2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..decf2c9141
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_red.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
new file mode 100644
index 0000000000..3a850ef0d8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json
new file mode 100644
index 0000000000..ce1c5b7db5
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "light-icon",
+ "directions": 1
+ },
+ {
+ "name": "off-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_red.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_red.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_red.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_red.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..3fdba97d51
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..8c21e80749
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_white.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
new file mode 100644
index 0000000000..3a850ef0d8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json
new file mode 100644
index 0000000000..ce1c5b7db5
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "light-icon",
+ "directions": 1
+ },
+ {
+ "name": "off-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_white.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_white.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_white.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_white.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..2b88d428ae
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..17f4d27bb1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_yellow.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
new file mode 100644
index 0000000000..3a850ef0d8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json
new file mode 100644
index 0000000000..ce1c5b7db5
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "light-icon",
+ "directions": 1
+ },
+ {
+ "name": "off-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "off-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_yellow.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_yellow.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_yellow.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..823ef43e0b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..77db56b89d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..f0a064cde4
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..97d20b7d3e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png
new file mode 100644
index 0000000000..bed72ecb13
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png
new file mode 100644
index 0000000000..e390363d61
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png
new file mode 100644
index 0000000000..7b91c45b69
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png
new file mode 100644
index 0000000000..d26398b840
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
new file mode 100644
index 0000000000..366c8b9bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/capspace.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/capspace.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/capspace.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/capspace.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/capspace.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/capspace.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/deathsquad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/deathsquad.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/deathsquad.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/deathsquad.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/deathsquad.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..f394a8ea4c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..6baf685a66
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png
new file mode 100644
index 0000000000..be2593406a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png
new file mode 100644
index 0000000000..85281322f0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-white.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-white.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
new file mode 100644
index 0000000000..366c8b9bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..896f1fe375
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png
new file mode 100644
index 0000000000..d8e40277cc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png
new file mode 100644
index 0000000000..45763e5696
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
new file mode 100644
index 0000000000..366c8b9bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/icon-on.png
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/meta.json
new file mode 100644
index 0000000000..136bb3f4b3
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ihsvoid.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-on",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..08151e7df5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..7f0e3c5e43
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon-flash.png
new file mode 100644
index 0000000000..e351248c53
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon.png
new file mode 100644
index 0000000000..f5423da5d7
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-left.png
new file mode 100644
index 0000000000..5c14b8e762
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-right.png
new file mode 100644
index 0000000000..d7ffaacbbb
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
new file mode 100644
index 0000000000..366c8b9bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/only put helmets that belong to hardsuits in here -swept b/Resources/Textures/Clothing/Head/Hardsuits/only put helmets that belong to hardsuits in here -swept
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..f6e0018723
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..44ead9d1ae
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
new file mode 100644
index 0000000000..31e787f822
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
new file mode 100644
index 0000000000..a134c90cca
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
new file mode 100644
index 0000000000..665e2ac94e
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..370d0a28cf
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..2e5db5827b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png
new file mode 100644
index 0000000000..551d52bf04
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png
new file mode 100644
index 0000000000..68733a17ff
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-left.png
new file mode 100644
index 0000000000..99e2923581
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-right.png
new file mode 100644
index 0000000000..16be438488
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
new file mode 100644
index 0000000000..366c8b9bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..3f16f842ce
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..f7ec9d2fad
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png
new file mode 100644
index 0000000000..5d5b1e76d1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png
new file mode 100644
index 0000000000..5c5b4b53d6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-left.png
new file mode 100644
index 0000000000..8b4ba7b8d9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-right.png
new file mode 100644
index 0000000000..44e2e8e0f3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
new file mode 100644
index 0000000000..366c8b9bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..4abb1d3c74
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..bb9318f95f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png
new file mode 100644
index 0000000000..01aa88c9cc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png
new file mode 100644
index 0000000000..b1d12d771b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
new file mode 100644
index 0000000000..665e2ac94e
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
new file mode 100644
index 0000000000..abce656390
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "combat-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/flash-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/flash-equipped-HELMET.png
new file mode 100644
index 0000000000..d0f4804b65
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/flash-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon-flash.png
new file mode 100644
index 0000000000..1484052faf
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-left.png
new file mode 100644
index 0000000000..6cda60d68b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-right.png
new file mode 100644
index 0000000000..1a23feecdb
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
new file mode 100644
index 0000000000..366c8b9bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-flash",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flash-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/beaver_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beaver_hat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/beaver_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beaver_hat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/beaver_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beaver_hat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/beaver_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beaver_hat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beaver_hat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/beret.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/beret.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/beret.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/beret.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/beret_engineering.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret_engineering.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/beret_engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret_engineering.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/beret_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret_engineering.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/beret_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret_engineering.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/beret_hos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret_hos.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/beret_hos.rsi/beret_hos.png b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/beret_hos.rsi/beret_hos.png
rename to Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json
new file mode 100644
index 0000000000..8c5451aa66
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..01598aeeb4
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/icon.png
new file mode 100644
index 0000000000..3058abcf6e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json
new file mode 100644
index 0000000000..8c5451aa66
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bowler_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bowler_hat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bowler_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bowler_hat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bowler_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bowler_hat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bowler_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bowler_hat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/brownfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/brownfedora.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/brownfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/brownfedora.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/brownfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/brownfedora.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/brownfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/brownfedora.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/captain.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/captain.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/captain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/captain.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/captain.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/captain.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cardborg_h.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cardborg_h.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cardborg_h.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cardborg_h.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cardborg_h.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cardborg_h.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cardborg_h.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cardborg_h.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/centcom.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/centcom.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/centcom.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/centcom.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/centcom.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/centcom.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/centcom.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/centcom.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/centcom.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/centcom.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/chefhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chefhat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/chefhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chefhat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/chefhat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/chefhat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chefhat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/chefhat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/chefhat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chefhat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/chefhat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/fez.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/fez.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fez.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/fez.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/fez.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/fez.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fez.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/fez.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/fez.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/fez.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fez.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/fez.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/fez.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/fez.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fez.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/fez.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/fez.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/fez.rsi/meta.json
new file mode 100644
index 0000000000..c5d232e46b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/fez.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/greyfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greyfedora.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/greyfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greyfedora.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/greyfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greyfedora.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/greyfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greyfedora.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hopcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hopcap.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hopcap.rsi/hopcap.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/hopcap.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hopcap.rsi/hopcap.png
rename to Resources/Textures/Clothing/Head/Hats/hopcap.rsi/hopcap.png
diff --git a/Resources/Textures/Clothing/Head/hopcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hopcap.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/hopcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hopcap.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hopcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hopcap.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hoshat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hoshat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hoshat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/hoshat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hoshat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hoshat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hoshat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
new file mode 100644
index 0000000000..c5d232e46b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/paper.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/paper.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paper.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/paper.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/paper.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/paper.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paper.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/paper.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/paper.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/paper.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paper.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/paper.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/paper.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/paper.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paper.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/paper.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/paper.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/paper.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/paper.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/pirate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pirate.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/pirate.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/pirate.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pirate.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/pirate.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/pirate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pirate.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/pirate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pirate.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/plaguedoctor.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/plaguedoctor.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/plaguedoctor.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/plaguedoctor.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/plaguedoctor.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/plaguedoctor.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/plaguedoctor.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/plaguedoctor.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/plaguedoctor.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/redwizard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redwizard.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/redwizard.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redwizard.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/redwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/redwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/santahat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/santahat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/santahat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/santahat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/santahat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/santahat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/santahat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/santahat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/sombrero.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/sombrero.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/sombrero.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/sombrero.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/sombrero.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/sombrero.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/sombrero.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/sombrero.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/sombrero.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/sombrero.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/sombrero.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/sombrero.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/sombrero.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/sombrero.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/sombrero.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/sombrero.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/sombrero.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/sombrero.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/sombrero.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/surgcap_blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_blue.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_blue.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_blue.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_blue.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/surgcap_green.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_green.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_green.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_green.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_green.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_green.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_green.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_green.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/surgcap_purple.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_purple.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_purple.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_purple.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_purple.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_purple.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/surgcap_purple.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/surgcap_purple.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/tophat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/tophat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/tophat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/tophat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/tophat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/tophat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/tophat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/tophat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/tophat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/tophat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/tophat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..3abb582499
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png
new file mode 100644
index 0000000000..bc82fd5f9f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png
new file mode 100644
index 0000000000..615a41f491
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json
new file mode 100644
index 0000000000..4ce08759e2
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-up",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "up-equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png
new file mode 100644
index 0000000000..534f366077
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/violetwizard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/violetwizard.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/violetwizard.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/violetwizard.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/violetwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/violetwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/violetwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/violetwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..10dab5101f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png
new file mode 100644
index 0000000000..617f6b4579
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
new file mode 100644
index 0000000000..8c5451aa66
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/witch.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witch.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/witch.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/witch.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witch.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/witch.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/witch.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witch.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/witch.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witch.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/witch.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/witch.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/witch.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/witchhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witchhat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/witchhat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/witchhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witchhat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/witchhat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/witchhat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witchhat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/witchhat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/witchhat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/witchhat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/witchhat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/wizard-fake.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizard-fake.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/wizard-fake.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizard-fake.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/wizard-fake.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizard-fake.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/wizard-fake.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizard-fake.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/wizardhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/wizardhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/wizardhat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/wizardhat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/xmashat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xmashat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/xmashat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xmashat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/xmashat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xmashat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/xmashat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xmashat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/xmascrown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bombsuitsec.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bombsuitsec.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bombsuitsec.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bombsuitsec.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bombsuitsec.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bombsuitsec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bombsuitsec.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bombsuitsec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/meta.json
new file mode 100644
index 0000000000..c5d232e46b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cosmonaut.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cosmonaut.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cosmonaut.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cosmonaut.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cosmonaut.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cosmonaut.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cosmonaut.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cosmonaut.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/meta.json
new file mode 100644
index 0000000000..c5d232e46b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/cosmonaut.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cult_helmet.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/cult.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cult_helmet.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/cult.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cult_helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/cult.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cult_helmet.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/cult.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cult_helmet.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/cult.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cult_helmet.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/cult.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cult_helmet.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/cult.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cult_helmet.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/cult.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/cult.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/cult.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/cult.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/void.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/void.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/void.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/void.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/void.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/void.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/void.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/void.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/on-icon.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
new file mode 100644
index 0000000000..db3d1d0cfe
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-on",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/on-inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/light_riot.rsi/on-inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/scaf.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/scaf.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/scaf.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/scaf.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/scaf.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/scaf.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/scaf.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/scaf.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/scaf.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
new file mode 100644
index 0000000000..c5d232e46b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/scaf.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/helmet.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/helmet.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/helmet.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/helmet.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/helmet.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/helmet.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/helmet.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
new file mode 100644
index 0000000000..c5d232e46b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..4fd9f44ff2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/icon.png
new file mode 100644
index 0000000000..325084b69f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/helmetold.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/helmetold.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/helmetold.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/helmetold.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/light-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/light-equipped-HELMET.png
new file mode 100644
index 0000000000..e1ed2d59ae
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/light-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/lighton-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/lighton-equipped-HELMET.png
new file mode 100644
index 0000000000..634828f1b3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/lighton-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/meta.json
new file mode 100644
index 0000000000..7a2c9310f4
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "light-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "lighton-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/s-ninja.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/s-ninja.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png
new file mode 100644
index 0000000000..b814dfe5a5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/s-ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/s-ninja.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/s-ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/s-ninja.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/headlight-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/headlight-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/headlight-inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/headlight-inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/headlight-inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/headlight-inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
new file mode 100644
index 0000000000..1fc5650c89
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
new file mode 100644
index 0000000000..bae64850e3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
new file mode 100644
index 0000000000..54a62c6dc7
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "visorlit",
+ "directions": 1
+ },
+ {
+ "name": "headlight",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "visorlit-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "headlight-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "visorlit-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "visorlit-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "headlight-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "headlight-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/visorlit-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/visorlit-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/visorlit-inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/visorlit-inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/visorlit-inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/syndicate.rsi/visorlit-inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
new file mode 100644
index 0000000000..074f597847
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..0f9309a59f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png
new file mode 100644
index 0000000000..60753f558b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json
new file mode 100644
index 0000000000..8c5451aa66
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/thunderdome.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/thunderdome.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/thunderdome.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/thunderdome.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/thunderdome.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/thunderdome.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/thunderdome.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/thunderdome.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/thunderdome.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/wizardhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhelm.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/wizardhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhelm.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/wizardhelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhelm.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/wizardhelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/wizardhelm.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bio.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bio.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bio.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bio.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bio_cmo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_cmo.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bio_cmo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_cmo.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bio_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_cmo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bio_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_cmo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bio_general.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_general.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bio_general.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_general.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bio_general.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_general.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bio_general.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_general.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bio_janitor.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_janitor.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bio_janitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_janitor.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bio_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_janitor.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bio_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_janitor.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bio_scientist.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_scientist.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bio_scientist.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_scientist.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bio_scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_scientist.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bio_scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_scientist.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bio_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_security.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bio_security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_security.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bio_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_security.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bio_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_security.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bio_virology.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_virology.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bio_virology.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_virology.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bio_virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_virology.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bio_virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bio_virology.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/chaplain_hood.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chaplain_hood.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/chaplain_hood.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chaplain_hood.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/chaplain_hood.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chaplain_hood.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/chaplain_hood.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chaplain_hood.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/culthood.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/cult.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/culthood.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/cult.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/culthood.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/cult.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/culthood.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/cult.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/culthood.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/cult.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/culthood.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/cult.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/culthood.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/cult.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/culthood.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/cult.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/cult.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/cult.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/cult.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/nun_hood.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/nun_hood.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hoods/nun.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/nun_hood.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/nun_hood.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hoods/nun.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/nun_hood.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/nun_hood.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hoods/nun.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/nun_hood.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/nun_hood.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hoods/nun.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hoods/nun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..8287d47952
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png
new file mode 100644
index 0000000000..9eaf4e5708
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
new file mode 100644
index 0000000000..bafbdefc41
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bearpelt.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bearpelt.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bearpelt.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bearpelt.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bearpelt.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bearpelt.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bearpelt.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bearpelt.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/bearpelt.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bunny.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bunny.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/bunny.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bunny.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bunny.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/bunny.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bunny.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bunny.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/bunny.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bunny.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bunny.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/bunny.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/on-icon.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/icon-on.png
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/cake.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/cake.rsi/meta.json
new file mode 100644
index 0000000000..c2986361fe
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/cake.rsi/meta.json
@@ -0,0 +1,65 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-on",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/on-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/on-inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/on-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Misc/cake.rsi/on-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cake.rsi/on-inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/cake.rsi/on-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/chickenhead.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chickenhead.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/chickenhead.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chickenhead.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/chickenhead.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chickenhead.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/chickenhead.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/chickenhead.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/chickenhead.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/hairflower.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hairflower.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/hairflower.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hairflower.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/hairflower.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hairflower.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/hairflower.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/hairflower.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/on-icon.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon-on.png
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
new file mode 100644
index 0000000000..2299bc22a1
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-on",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/on-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/on-inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pumpkin.rsi/on-inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/on-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/pwig.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pwig.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/pwig.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/pwig.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pwig.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/pwig.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/pwig.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/pwig.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pwig.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/pwig.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/pwig.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/pwig.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/pwig.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/pwig.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/pwig.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/pwig.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/pwig.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/richard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/richard.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/richard.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/richard.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/richard.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/richard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/richard.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/richard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/richard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/richard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/richard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/richard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/richard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/richard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/richard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/richard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/richard.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/richard.rsi/meta.json
new file mode 100644
index 0000000000..c5d232e46b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/richard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/skubhead.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/skubhead.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/skubhead.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/skubhead.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/skubhead.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/skubhead.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json
new file mode 100644
index 0000000000..8c0eb52e01
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/skubhead.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/xenom.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenom.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/xenom.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/xenom.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenom.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/xenom.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/xenom.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenom.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/xenom.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenom.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/xenom.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/xenom.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/xenom.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/xenos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenos.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Misc/xenos.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/xenos.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenos.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Misc/xenos.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/xenos.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenos.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/xenos.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/xenos.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Misc/xenos.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Misc/xenos.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Misc/xenos.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bluesoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bluesoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bluesoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bluesoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cargosoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cargosoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cargosoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cargosoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/corpsoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/corpsoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/corpsoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/corpsoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/greensoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/greensoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/greensoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/greensoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/greensoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/greensoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/greensoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/greensoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greensoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/greysoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/greysoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/greysoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/greysoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/greysoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/greysoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/greysoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/greysoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/greysoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/mimesoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/mimesoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/mimesoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/mimesoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/orangesoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/orangesoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/orangesoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/orangesoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/purplesoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/purplesoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/purplesoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/purplesoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/redsoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/redsoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/redsoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/redsoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/redsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/redsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/redsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/redsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/redsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/secsoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/secsoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/secsoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/secsoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/secsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/secsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/secsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/secsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/secsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/yellowsoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/yellowsoft.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/yellowsoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/yellowsoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
new file mode 100644
index 0000000000..adaa2fb070
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/icon-up.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/icon-up.png
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json
new file mode 100644
index 0000000000..5f11a5c573
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-up",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "up-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/up-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/icon-up.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/icon-up.png
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json
new file mode 100644
index 0000000000..5f11a5c573
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-up",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "up-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/up-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/paintedwelding.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedwelding.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/paintedweldingup.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/icon-up.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedweldingup.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/icon-up.png
diff --git a/Resources/Textures/Clothing/Head/paintedwelding.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedwelding.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/paintedwelding.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedwelding.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/paintedwelding.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedwelding.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json
new file mode 100644
index 0000000000..5f11a5c573
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-up",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "up-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/paintedweldingup.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedweldingup.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/paintedweldingup.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedweldingup.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/paintedweldingup.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/paintedweldingup.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/up-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/welding.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/welding.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/weldingup.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/icon-up.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/weldingup.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/icon-up.png
diff --git a/Resources/Textures/Clothing/Head/welding.rsi/icon.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/welding.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/welding.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/welding.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/welding.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/welding.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json
new file mode 100644
index 0000000000..5f11a5c573
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-up",
+ "directions": 1
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "up-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "up-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Head/weldingup.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/weldingup.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/weldingup.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/weldingup.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/up-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/weldingup.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/weldingup.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Welding/welding.rsi/up-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/atmos_helm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/atmos_helm.rsi/equipped-HELMET.png
deleted file mode 100644
index d187641446..0000000000
Binary files a/Resources/Textures/Clothing/Head/atmos_helm.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/atmos_helm.rsi/icon.png b/Resources/Textures/Clothing/Head/atmos_helm.rsi/icon.png
deleted file mode 100644
index 7a3268a06e..0000000000
Binary files a/Resources/Textures/Clothing/Head/atmos_helm.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/atmos_helm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/atmos_helm.rsi/inhand-left.png
deleted file mode 100644
index a5e3abbea9..0000000000
Binary files a/Resources/Textures/Clothing/Head/atmos_helm.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/atmos_helm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/atmos_helm.rsi/inhand-right.png
deleted file mode 100644
index f4da21cc02..0000000000
Binary files a/Resources/Textures/Clothing/Head/atmos_helm.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/atmos_helm.rsi/meta.json b/Resources/Textures/Clothing/Head/atmos_helm.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/atmos_helm.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandana.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandana.rsi/equipped-HELMET.png
deleted file mode 100644
index 23f02fa6a5..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandana.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandana.rsi/icon.png b/Resources/Textures/Clothing/Head/bandana.rsi/icon.png
deleted file mode 100644
index 51e8ef411b..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandana.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandana.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandana.rsi/inhand-left.png
deleted file mode 100644
index 72a543d001..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandana.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandana.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandana.rsi/inhand-right.png
deleted file mode 100644
index ffd676b84b..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandana.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandana.rsi/meta.json b/Resources/Textures/Clothing/Head/bandana.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandana.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandblack.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandblack.rsi/equipped-HELMET.png
deleted file mode 100644
index a03ebf6fa1..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblack.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblack.rsi/icon.png b/Resources/Textures/Clothing/Head/bandblack.rsi/icon.png
deleted file mode 100644
index b3720e0f27..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblack.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandblack.rsi/inhand-left.png
deleted file mode 100644
index 7cdfcdc3a3..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblack.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandblack.rsi/inhand-right.png
deleted file mode 100644
index 6dcbba323e..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblack.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblack.rsi/meta.json b/Resources/Textures/Clothing/Head/bandblack.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandblack.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandblue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandblue.rsi/equipped-HELMET.png
deleted file mode 100644
index 215f2f1fef..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblue.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblue.rsi/icon.png b/Resources/Textures/Clothing/Head/bandblue.rsi/icon.png
deleted file mode 100644
index 93eeefaa5b..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblue.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandblue.rsi/inhand-left.png
deleted file mode 100644
index 0ed003e4c2..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblue.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandblue.rsi/inhand-right.png
deleted file mode 100644
index 7dc8bcf85d..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandblue.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandblue.rsi/meta.json b/Resources/Textures/Clothing/Head/bandblue.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandblue.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandbotany.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandbotany.rsi/equipped-HELMET.png
deleted file mode 100644
index 3f30587e3a..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandbotany.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandbotany.rsi/icon.png b/Resources/Textures/Clothing/Head/bandbotany.rsi/icon.png
deleted file mode 100644
index 21d372a135..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandbotany.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandbotany.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandbotany.rsi/inhand-left.png
deleted file mode 100644
index deae09bca4..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandbotany.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandbotany.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandbotany.rsi/inhand-right.png
deleted file mode 100644
index 0052f4bc0c..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandbotany.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandbotany.rsi/meta.json b/Resources/Textures/Clothing/Head/bandbotany.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandbotany.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandcamo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandcamo.rsi/equipped-HELMET.png
deleted file mode 100644
index 59f07d9567..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandcamo.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandcamo.rsi/icon.png b/Resources/Textures/Clothing/Head/bandcamo.rsi/icon.png
deleted file mode 100644
index cae470905a..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandcamo.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandcamo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandcamo.rsi/inhand-left.png
deleted file mode 100644
index 31e0bf338a..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandcamo.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandcamo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandcamo.rsi/inhand-right.png
deleted file mode 100644
index 758ad32c00..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandcamo.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandcamo.rsi/meta.json b/Resources/Textures/Clothing/Head/bandcamo.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandcamo.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandgold.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandgold.rsi/equipped-HELMET.png
deleted file mode 100644
index 086508cc8f..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgold.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgold.rsi/icon.png b/Resources/Textures/Clothing/Head/bandgold.rsi/icon.png
deleted file mode 100644
index d48f802dbc..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgold.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgold.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandgold.rsi/inhand-left.png
deleted file mode 100644
index ae59fd6b64..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgold.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgold.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandgold.rsi/inhand-right.png
deleted file mode 100644
index 58804e518c..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgold.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgold.rsi/meta.json b/Resources/Textures/Clothing/Head/bandgold.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandgold.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandgreen.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandgreen.rsi/equipped-HELMET.png
deleted file mode 100644
index a1e1e7d3b5..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgreen.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgreen.rsi/icon.png b/Resources/Textures/Clothing/Head/bandgreen.rsi/icon.png
deleted file mode 100644
index d4209d2d59..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgreen.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgreen.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandgreen.rsi/inhand-left.png
deleted file mode 100644
index e8cd0c644e..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgreen.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgreen.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandgreen.rsi/inhand-right.png
deleted file mode 100644
index e356138b5b..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandgreen.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandgreen.rsi/meta.json b/Resources/Textures/Clothing/Head/bandgreen.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandgreen.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandorange.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandorange.rsi/equipped-HELMET.png
deleted file mode 100644
index 8c73afb209..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandorange.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandorange.rsi/icon.png b/Resources/Textures/Clothing/Head/bandorange.rsi/icon.png
deleted file mode 100644
index 0dd99e0be7..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandorange.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandorange.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandorange.rsi/inhand-left.png
deleted file mode 100644
index 4f9de1eaa7..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandorange.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandorange.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandorange.rsi/inhand-right.png
deleted file mode 100644
index a2ba80c7c8..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandorange.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandorange.rsi/meta.json b/Resources/Textures/Clothing/Head/bandorange.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandorange.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandpurple.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandpurple.rsi/equipped-HELMET.png
deleted file mode 100644
index 93ff702e3b..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandpurple.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandpurple.rsi/icon.png b/Resources/Textures/Clothing/Head/bandpurple.rsi/icon.png
deleted file mode 100644
index d076a07bb6..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandpurple.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandpurple.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandpurple.rsi/inhand-left.png
deleted file mode 100644
index 0b118a386e..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandpurple.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandpurple.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandpurple.rsi/inhand-right.png
deleted file mode 100644
index 22313c0ba0..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandpurple.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandpurple.rsi/meta.json b/Resources/Textures/Clothing/Head/bandpurple.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandpurple.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandred.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandred.rsi/equipped-HELMET.png
deleted file mode 100644
index 8c73afb209..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandred.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandred.rsi/icon.png b/Resources/Textures/Clothing/Head/bandred.rsi/icon.png
deleted file mode 100644
index 0dd99e0be7..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandred.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandred.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandred.rsi/inhand-left.png
deleted file mode 100644
index 4f9de1eaa7..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandred.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandred.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandred.rsi/inhand-right.png
deleted file mode 100644
index a2ba80c7c8..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandred.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandred.rsi/meta.json b/Resources/Textures/Clothing/Head/bandred.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandred.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bandskull.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bandskull.rsi/equipped-HELMET.png
deleted file mode 100644
index a03ebf6fa1..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandskull.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandskull.rsi/icon.png b/Resources/Textures/Clothing/Head/bandskull.rsi/icon.png
deleted file mode 100644
index b3720e0f27..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandskull.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandskull.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bandskull.rsi/inhand-left.png
deleted file mode 100644
index 7cdfcdc3a3..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandskull.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandskull.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bandskull.rsi/inhand-right.png
deleted file mode 100644
index 6dcbba323e..0000000000
Binary files a/Resources/Textures/Clothing/Head/bandskull.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bandskull.rsi/meta.json b/Resources/Textures/Clothing/Head/bandskull.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bandskull.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bearpelt.rsi/meta.json b/Resources/Textures/Clothing/Head/bearpelt.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bearpelt.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/beaver_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/beaver_hat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/beaver_hat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/beret.rsi/meta.json b/Resources/Textures/Clothing/Head/beret.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/beret.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/beret_engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/beret_engineering.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/beret_engineering.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/beret_hos.rsi/meta.json b/Resources/Textures/Clothing/Head/beret_hos.rsi/meta.json
deleted file mode 100644
index 236bb9f17a..0000000000
--- a/Resources/Textures/Clothing/Head/beret_hos.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "beret_hos", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-HELMET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/beret_warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/beret_warden.rsi/equipped-HELMET.png
deleted file mode 100644
index 0eef17fc80..0000000000
Binary files a/Resources/Textures/Clothing/Head/beret_warden.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/beret_warden.rsi/icon.png b/Resources/Textures/Clothing/Head/beret_warden.rsi/icon.png
deleted file mode 100644
index 19bcd646dc..0000000000
Binary files a/Resources/Textures/Clothing/Head/beret_warden.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/beret_warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/beret_warden.rsi/inhand-left.png
deleted file mode 100644
index b1e332e7a8..0000000000
Binary files a/Resources/Textures/Clothing/Head/beret_warden.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/beret_warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/beret_warden.rsi/inhand-right.png
deleted file mode 100644
index 3b8cc036ac..0000000000
Binary files a/Resources/Textures/Clothing/Head/beret_warden.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/beret_warden.rsi/meta.json b/Resources/Textures/Clothing/Head/beret_warden.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/beret_warden.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bio.rsi/meta.json b/Resources/Textures/Clothing/Head/bio.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bio.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bio_cmo.rsi/meta.json b/Resources/Textures/Clothing/Head/bio_cmo.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bio_cmo.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bio_general.rsi/meta.json b/Resources/Textures/Clothing/Head/bio_general.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bio_general.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bio_janitor.rsi/meta.json b/Resources/Textures/Clothing/Head/bio_janitor.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bio_janitor.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bio_scientist.rsi/meta.json b/Resources/Textures/Clothing/Head/bio_scientist.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bio_scientist.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bio_security.rsi/meta.json b/Resources/Textures/Clothing/Head/bio_security.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bio_security.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bio_virology.rsi/meta.json b/Resources/Textures/Clothing/Head/bio_virology.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bio_virology.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/meta.json b/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/meta.json b/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/blue_flame_welding_mask_1up.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bluesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/bluesoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bluesoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bluesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/boater_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/boater_hat.rsi/equipped-HELMET.png
deleted file mode 100644
index ff8b1dc286..0000000000
Binary files a/Resources/Textures/Clothing/Head/boater_hat.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/boater_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/boater_hat.rsi/icon.png
deleted file mode 100644
index f511b2dea8..0000000000
Binary files a/Resources/Textures/Clothing/Head/boater_hat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/boater_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/boater_hat.rsi/inhand-left.png
deleted file mode 100644
index d92a21116e..0000000000
Binary files a/Resources/Textures/Clothing/Head/boater_hat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/boater_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/boater_hat.rsi/inhand-right.png
deleted file mode 100644
index ab7b473265..0000000000
Binary files a/Resources/Textures/Clothing/Head/boater_hat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/boater_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/boater_hat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/boater_hat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bombsuit.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bombsuit.rsi/equipped-HELMET.png
deleted file mode 100644
index 3278a9b155..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit.rsi/icon.png b/Resources/Textures/Clothing/Head/bombsuit.rsi/icon.png
deleted file mode 100644
index 6119571c18..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bombsuit.rsi/inhand-left.png
deleted file mode 100644
index b567f757a3..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bombsuit.rsi/inhand-right.png
deleted file mode 100644
index b88309827b..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/bombsuit.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bombsuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bombsuit_white.rsi/equipped-HELMET.png
deleted file mode 100644
index e36eb0ba7b..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/icon.png b/Resources/Textures/Clothing/Head/bombsuit_white.rsi/icon.png
deleted file mode 100644
index 207431f4d4..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bombsuit_white.rsi/inhand-left.png
deleted file mode 100644
index b91a83095f..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bombsuit_white.rsi/inhand-right.png
deleted file mode 100644
index 18c7197001..0000000000
Binary files a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/meta.json b/Resources/Textures/Clothing/Head/bombsuit_white.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bombsuit_white.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bombsuitsec.rsi/meta.json b/Resources/Textures/Clothing/Head/bombsuitsec.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bombsuitsec.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bowler.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/bowler.rsi/equipped-HELMET.png
deleted file mode 100644
index 8f63e49b8a..0000000000
Binary files a/Resources/Textures/Clothing/Head/bowler.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bowler.rsi/icon.png b/Resources/Textures/Clothing/Head/bowler.rsi/icon.png
deleted file mode 100644
index eb98be3129..0000000000
Binary files a/Resources/Textures/Clothing/Head/bowler.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bowler.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/bowler.rsi/inhand-left.png
deleted file mode 100644
index a69cffce50..0000000000
Binary files a/Resources/Textures/Clothing/Head/bowler.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bowler.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/bowler.rsi/inhand-right.png
deleted file mode 100644
index a4135b9777..0000000000
Binary files a/Resources/Textures/Clothing/Head/bowler.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/bowler.rsi/meta.json b/Resources/Textures/Clothing/Head/bowler.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bowler.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bowler_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/bowler_hat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bowler_hat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/brownfedora.rsi/meta.json
deleted file mode 100644
index a548d09dec..0000000000
--- a/Resources/Textures/Clothing/Head/brownfedora.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/bunny.rsi/meta.json b/Resources/Textures/Clothing/Head/bunny.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/bunny.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cake.rsi/meta.json b/Resources/Textures/Clothing/Head/cake.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/cake.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/capcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/capcap.rsi/equipped-HELMET.png
deleted file mode 100644
index f74dc28972..0000000000
Binary files a/Resources/Textures/Clothing/Head/capcap.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/capcap.rsi/icon.png b/Resources/Textures/Clothing/Head/capcap.rsi/icon.png
deleted file mode 100644
index 1308eab1cd..0000000000
Binary files a/Resources/Textures/Clothing/Head/capcap.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/capcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/capcap.rsi/inhand-left.png
deleted file mode 100644
index 0162e3cff9..0000000000
Binary files a/Resources/Textures/Clothing/Head/capcap.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/capcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/capcap.rsi/inhand-right.png
deleted file mode 100644
index 39e2d12cfe..0000000000
Binary files a/Resources/Textures/Clothing/Head/capcap.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/capcap.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/capcap.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/capspace.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/capspace.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/captain.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/captain.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cardborg_h.rsi/meta.json b/Resources/Textures/Clothing/Head/cardborg_h.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cardborg_h.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cargosoft.rsi/meta.json b/Resources/Textures/Clothing/Head/cargosoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cargosoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cargosoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cat.rsi/meta.json b/Resources/Textures/Clothing/Head/cat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cat2.rsi/meta.json b/Resources/Textures/Clothing/Head/cat2.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cat2.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cat3.rsi/meta.json b/Resources/Textures/Clothing/Head/cat3.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cat3.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/centcom.rsi/meta.json b/Resources/Textures/Clothing/Head/centcom.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/centcom.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/chaplain_hood.rsi/meta.json b/Resources/Textures/Clothing/Head/chaplain_hood.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/chaplain_hood.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/chefhat.rsi/meta.json b/Resources/Textures/Clothing/Head/chefhat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/chefhat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/chickenhead.rsi/meta.json b/Resources/Textures/Clothing/Head/chickenhead.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/chickenhead.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/corpsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/corpsoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/corpsoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/corpsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cosmonaut.rsi/meta.json b/Resources/Textures/Clothing/Head/cosmonaut.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cosmonaut.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cowboy.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/cowboy.rsi/equipped-HELMET.png
deleted file mode 100644
index 7f8fa160c6..0000000000
Binary files a/Resources/Textures/Clothing/Head/cowboy.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/cowboy.rsi/icon.png b/Resources/Textures/Clothing/Head/cowboy.rsi/icon.png
deleted file mode 100644
index 2ebb12eb7a..0000000000
Binary files a/Resources/Textures/Clothing/Head/cowboy.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/cowboy.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/cowboy.rsi/inhand-left.png
deleted file mode 100644
index 1d4fed51bf..0000000000
Binary files a/Resources/Textures/Clothing/Head/cowboy.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/cowboy.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/cowboy.rsi/inhand-right.png
deleted file mode 100644
index 64f5a6f9c5..0000000000
Binary files a/Resources/Textures/Clothing/Head/cowboy.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/cowboy.rsi/meta.json b/Resources/Textures/Clothing/Head/cowboy.rsi/meta.json
deleted file mode 100644
index 38c964b02d..0000000000
--- a/Resources/Textures/Clothing/Head/cowboy.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/cult_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/cult_helmet.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/cult_helmet.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/culthood.rsi/meta.json b/Resources/Textures/Clothing/Head/culthood.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/culthood.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/deathsquad.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/deathsquad.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/fez.rsi/meta.json b/Resources/Textures/Clothing/Head/fez.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/fez.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/meta.json b/Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/fire_welding_mask_1.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/meta.json b/Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/fire_welding_mask_1up.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/gladiator.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/gladiator.rsi/equipped-HELMET.png
deleted file mode 100644
index 9925028042..0000000000
Binary files a/Resources/Textures/Clothing/Head/gladiator.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/gladiator.rsi/icon.png b/Resources/Textures/Clothing/Head/gladiator.rsi/icon.png
deleted file mode 100644
index 689bff0e0c..0000000000
Binary files a/Resources/Textures/Clothing/Head/gladiator.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/gladiator.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/gladiator.rsi/inhand-left.png
deleted file mode 100644
index b761372903..0000000000
Binary files a/Resources/Textures/Clothing/Head/gladiator.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/gladiator.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/gladiator.rsi/inhand-right.png
deleted file mode 100644
index 099795117c..0000000000
Binary files a/Resources/Textures/Clothing/Head/gladiator.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/gladiator.rsi/meta.json b/Resources/Textures/Clothing/Head/gladiator.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/gladiator.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/greenbandana.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/greenbandana.rsi/equipped-HELMET.png
deleted file mode 100644
index 3f30587e3a..0000000000
Binary files a/Resources/Textures/Clothing/Head/greenbandana.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/greenbandana.rsi/icon.png b/Resources/Textures/Clothing/Head/greenbandana.rsi/icon.png
deleted file mode 100644
index 5689587417..0000000000
Binary files a/Resources/Textures/Clothing/Head/greenbandana.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/greenbandana.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/greenbandana.rsi/inhand-left.png
deleted file mode 100644
index deae09bca4..0000000000
Binary files a/Resources/Textures/Clothing/Head/greenbandana.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/greenbandana.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/greenbandana.rsi/inhand-right.png
deleted file mode 100644
index 0052f4bc0c..0000000000
Binary files a/Resources/Textures/Clothing/Head/greenbandana.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/greenbandana.rsi/meta.json b/Resources/Textures/Clothing/Head/greenbandana.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/greenbandana.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/greensoft.rsi/meta.json b/Resources/Textures/Clothing/Head/greensoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/greensoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/greensoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/greensoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/greensoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/greyfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/greyfedora.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/greyfedora.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/greysoft.rsi/meta.json b/Resources/Textures/Clothing/Head/greysoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/greysoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/greysoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/greysoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/greysoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hairflower.rsi/meta.json b/Resources/Textures/Clothing/Head/hairflower.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hairflower.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/meta.json b/Resources/Textures/Clothing/Head/hardhat_blue.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-icon.png b/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-icon.png
deleted file mode 100644
index 3833f5be96..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-inhand-left.png
deleted file mode 100644
index e9bdb52b15..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-inhand-right.png
deleted file mode 100644
index dbba1db1ad..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_blue.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/meta.json b/Resources/Textures/Clothing/Head/hardhat_orange.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-icon.png b/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-icon.png
deleted file mode 100644
index 001a1f5d3b..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-inhand-left.png
deleted file mode 100644
index 42647c87af..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-inhand-right.png
deleted file mode 100644
index dfec425178..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_orange.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/meta.json b/Resources/Textures/Clothing/Head/hardhat_red.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/hardhat_red.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-icon.png b/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-icon.png
deleted file mode 100644
index 8640074077..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-inhand-left.png
deleted file mode 100644
index d8a465ba1f..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-inhand-right.png
deleted file mode 100644
index abb0ee0352..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_red.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/meta.json b/Resources/Textures/Clothing/Head/hardhat_white.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/hardhat_white.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-icon.png b/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-icon.png
deleted file mode 100644
index f1c549fdb9..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-inhand-left.png
deleted file mode 100644
index 8d06c56c1f..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-inhand-right.png
deleted file mode 100644
index 186f070303..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_white.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/meta.json b/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-icon.png b/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-icon.png
deleted file mode 100644
index dad960c290..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-inhand-left.png
deleted file mode 100644
index d065fc1995..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-inhand-right.png
deleted file mode 100644
index 553cb45028..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardhat_yellow.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/equipped-HELMET.png
deleted file mode 100644
index d187641446..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/icon.png
deleted file mode 100644
index 92cdc50389..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/inhand-left.png
deleted file mode 100644
index b85486a52c..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/inhand-right.png
deleted file mode 100644
index 379b2aaefd..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-atmos.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/icon.png
deleted file mode 100644
index 98c991eb2d..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-engineering.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/equipped-HELMET.png
deleted file mode 100644
index 15ea08bad6..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/icon.png
deleted file mode 100644
index 2a1190a2e0..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/inhand-left.png
deleted file mode 100644
index fd5f45dcbb..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/inhand-right.png
deleted file mode 100644
index 7879ed15e9..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-hazardhardsuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/equipped-HELMET.png
deleted file mode 100644
index 250192f72b..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/icon.png
deleted file mode 100644
index 01cfdb3fd9..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/inhand-left.png
deleted file mode 100644
index c57df8eaf6..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/inhand-right.png
deleted file mode 100644
index 18951eedae..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-medical.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/equipped-HELMET.png
deleted file mode 100644
index 7395c409ea..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/icon.png
deleted file mode 100644
index 0283ac0392..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/inhand-left.png
deleted file mode 100644
index 153da15573..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/inhand-right.png
deleted file mode 100644
index 7c7bfe9f5f..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-mining.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit-old.rsi/equipped-HELMET.png
deleted file mode 100644
index 311a36f8a7..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-old.rsi/icon.png
deleted file mode 100644
index 249d4a5db5..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-old.rsi/inhand-left.png
deleted file mode 100644
index 393596406b..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-old.rsi/inhand-right.png
deleted file mode 100644
index f1b990c981..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-old.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-old.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/equipped-HELMET.png
deleted file mode 100644
index 5b11a41d9f..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/icon.png
deleted file mode 100644
index 826f60c786..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/inhand-left.png
deleted file mode 100644
index f0010909af..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/inhand-right.png
deleted file mode 100644
index 7aa33f810f..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-sectg.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-inhand-left.png
deleted file mode 100644
index e778150ecd..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-inhand-right.png
deleted file mode 100644
index 001c64a46c..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/combat-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/meta.json
deleted file mode 100644
index 93dbf44785..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-syndie.rsi/meta.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi",
- "states": [
- {
- "name": "equipped-HELMET",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "combat-equipped-HELMET",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "combat-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "combat-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit-white.rsi/equipped-HELMET.png
deleted file mode 100644
index 801af9970b..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit-white.rsi/icon.png
deleted file mode 100644
index 2d91962103..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-white.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-white.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/inhand-left.png
deleted file mode 100644
index 4b49c75f71..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/inhand-right.png
deleted file mode 100644
index 84b43caff7..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/meta.json
deleted file mode 100644
index 45825e1833..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit-wiz.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/master/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/equipped-HELMET.png
deleted file mode 100644
index d187641446..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/icon.png
deleted file mode 100644
index 92cdc50389..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/inhand-left.png
deleted file mode 100644
index a5e3abbea9..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/inhand-right.png
deleted file mode 100644
index f4da21cc02..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-atmos.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/equipped-HELMET.png
deleted file mode 100644
index c10e42cf14..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/icon.png
deleted file mode 100644
index 98c991eb2d..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/inhand-left.png
deleted file mode 100644
index d3c367dd2e..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/inhand-right.png
deleted file mode 100644
index 8a9c0947b0..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-engineering.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/equipped-HELMET.png
deleted file mode 100644
index 15ea08bad6..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/icon.png
deleted file mode 100644
index 2a1190a2e0..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/inhand-left.png
deleted file mode 100644
index 124639428f..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/inhand-right.png
deleted file mode 100644
index 10f69f8f5e..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-hazardhardsuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/equipped-HELMET.png
deleted file mode 100644
index 250192f72b..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/icon.png
deleted file mode 100644
index 01cfdb3fd9..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/inhand-left.png
deleted file mode 100644
index 9d98bbaf1c..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/inhand-right.png
deleted file mode 100644
index bd9adbaff1..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-medical.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/equipped-HELMET.png
deleted file mode 100644
index 7395c409ea..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/icon.png
deleted file mode 100644
index 0283ac0392..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/inhand-left.png
deleted file mode 100644
index cc4a5c6129..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/inhand-right.png
deleted file mode 100644
index ab35af4c15..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-mining.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/equipped-HELMET.png
deleted file mode 100644
index 5b11a41d9f..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/icon.png
deleted file mode 100644
index 826f60c786..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/inhand-left.png
deleted file mode 100644
index 2713413e9e..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/inhand-right.png
deleted file mode 100644
index 5678b95714..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-sectg.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/equipped-HELMET.png
deleted file mode 100644
index 2f587c5797..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/icon.png
deleted file mode 100644
index 6a4a0e32a4..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/inhand-left.png
deleted file mode 100644
index e778150ecd..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/inhand-right.png
deleted file mode 100644
index 001c64a46c..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/meta.json
deleted file mode 100644
index a548d09dec..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-syndie.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/equipped-HELMET.png
deleted file mode 100644
index 801af9970b..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/icon.png
deleted file mode 100644
index 2d91962103..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/inhand-left.png
deleted file mode 100644
index 8a7713ef46..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/inhand-right.png
deleted file mode 100644
index 56388c5bdb..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-white.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/equipped-HELMET.png
deleted file mode 100644
index 90346571ac..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/icon.png b/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/icon.png
deleted file mode 100644
index 762300d0dd..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/inhand-left.png
deleted file mode 100644
index d66163f98e..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/inhand-right.png
deleted file mode 100644
index 977d72cd78..0000000000
Binary files a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/meta.json b/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hardsuit0-wiz.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/headslime.rsi/meta.json b/Resources/Textures/Clothing/Head/headslime.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/headslime.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/helmet.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/helmet.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/helmetold.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/helmetold.rsi/equipped-HELMET.png
deleted file mode 100644
index f05663ad0d..0000000000
Binary files a/Resources/Textures/Clothing/Head/helmetold.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/helmetold.rsi/icon.png b/Resources/Textures/Clothing/Head/helmetold.rsi/icon.png
deleted file mode 100644
index 31c3ac7385..0000000000
Binary files a/Resources/Textures/Clothing/Head/helmetold.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/helmetold.rsi/meta.json b/Resources/Textures/Clothing/Head/helmetold.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/helmetold.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hopcap.rsi/meta.json b/Resources/Textures/Clothing/Head/hopcap.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hopcap.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/hoshat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/hoshat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/ihsvoidhelm.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/equipped-HELMET.png
deleted file mode 100644
index 58eeb778a3..0000000000
Binary files a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/inhand-left.png
deleted file mode 100644
index 000b7e08c4..0000000000
Binary files a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/inhand-right.png
deleted file mode 100644
index 3e5b59964b..0000000000
Binary files a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/meta.json b/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/ihsvoidhelm_on.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/light_riot.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/light_riot.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/medical_helm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/medical_helm.rsi/equipped-HELMET.png
deleted file mode 100644
index 250192f72b..0000000000
Binary files a/Resources/Textures/Clothing/Head/medical_helm.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/medical_helm.rsi/icon.png b/Resources/Textures/Clothing/Head/medical_helm.rsi/icon.png
deleted file mode 100644
index 79c6d01b30..0000000000
Binary files a/Resources/Textures/Clothing/Head/medical_helm.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/medical_helm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/medical_helm.rsi/inhand-left.png
deleted file mode 100644
index 9d98bbaf1c..0000000000
Binary files a/Resources/Textures/Clothing/Head/medical_helm.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/medical_helm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/medical_helm.rsi/inhand-right.png
deleted file mode 100644
index bd9adbaff1..0000000000
Binary files a/Resources/Textures/Clothing/Head/medical_helm.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/medical_helm.rsi/meta.json b/Resources/Textures/Clothing/Head/medical_helm.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/medical_helm.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/mimesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/mimesoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/mimesoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/mimesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/monkey.rsi/meta.json b/Resources/Textures/Clothing/Head/monkey.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/monkey.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/mouse_brown.rsi/meta.json b/Resources/Textures/Clothing/Head/mouse_brown.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/mouse_brown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/mouse_gray.rsi/meta.json b/Resources/Textures/Clothing/Head/mouse_gray.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/mouse_gray.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/mouse_white.rsi/meta.json b/Resources/Textures/Clothing/Head/mouse_white.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/mouse_white.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/nightvis.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/nightvis.rsi/equipped-HELMET.png
deleted file mode 100644
index ac4a04a027..0000000000
Binary files a/Resources/Textures/Clothing/Head/nightvis.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nightvis.rsi/icon.png b/Resources/Textures/Clothing/Head/nightvis.rsi/icon.png
deleted file mode 100644
index ac4a04a027..0000000000
Binary files a/Resources/Textures/Clothing/Head/nightvis.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nightvis.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/nightvis.rsi/inhand-left.png
deleted file mode 100644
index 851e835729..0000000000
Binary files a/Resources/Textures/Clothing/Head/nightvis.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nightvis.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/nightvis.rsi/inhand-right.png
deleted file mode 100644
index cd9dad8f08..0000000000
Binary files a/Resources/Textures/Clothing/Head/nightvis.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nightvis.rsi/meta.json b/Resources/Textures/Clothing/Head/nightvis.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/nightvis.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/nun_hood.rsi/meta.json b/Resources/Textures/Clothing/Head/nun_hood.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/nun_hood.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/nursehat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/nursehat.rsi/equipped-HELMET.png
deleted file mode 100644
index bad2323b02..0000000000
Binary files a/Resources/Textures/Clothing/Head/nursehat.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nursehat.rsi/icon.png b/Resources/Textures/Clothing/Head/nursehat.rsi/icon.png
deleted file mode 100644
index 273a983b56..0000000000
Binary files a/Resources/Textures/Clothing/Head/nursehat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nursehat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/nursehat.rsi/inhand-left.png
deleted file mode 100644
index 0aa01243b5..0000000000
Binary files a/Resources/Textures/Clothing/Head/nursehat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nursehat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/nursehat.rsi/inhand-right.png
deleted file mode 100644
index c567cff7dc..0000000000
Binary files a/Resources/Textures/Clothing/Head/nursehat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nursehat.rsi/meta.json b/Resources/Textures/Clothing/Head/nursehat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/nursehat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/nymph.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/nymph.rsi/equipped-HELMET.png
deleted file mode 100644
index 02c3a28c32..0000000000
Binary files a/Resources/Textures/Clothing/Head/nymph.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nymph.rsi/icon.png b/Resources/Textures/Clothing/Head/nymph.rsi/icon.png
deleted file mode 100644
index d9a23a2aa1..0000000000
Binary files a/Resources/Textures/Clothing/Head/nymph.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nymph.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/nymph.rsi/inhand-left.png
deleted file mode 100644
index 92e1121409..0000000000
Binary files a/Resources/Textures/Clothing/Head/nymph.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nymph.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/nymph.rsi/inhand-right.png
deleted file mode 100644
index 88a2363a8b..0000000000
Binary files a/Resources/Textures/Clothing/Head/nymph.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/nymph.rsi/meta.json b/Resources/Textures/Clothing/Head/nymph.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/nymph.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/orange_bandana.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/orange_bandana.rsi/equipped-HELMET.png
deleted file mode 100644
index 217c434bc8..0000000000
Binary files a/Resources/Textures/Clothing/Head/orange_bandana.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/orange_bandana.rsi/icon.png b/Resources/Textures/Clothing/Head/orange_bandana.rsi/icon.png
deleted file mode 100644
index e162d68560..0000000000
Binary files a/Resources/Textures/Clothing/Head/orange_bandana.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/orange_bandana.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/orange_bandana.rsi/inhand-left.png
deleted file mode 100644
index dac2f40e28..0000000000
Binary files a/Resources/Textures/Clothing/Head/orange_bandana.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/orange_bandana.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/orange_bandana.rsi/inhand-right.png
deleted file mode 100644
index f2b2faa699..0000000000
Binary files a/Resources/Textures/Clothing/Head/orange_bandana.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/orange_bandana.rsi/meta.json b/Resources/Textures/Clothing/Head/orange_bandana.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/orange_bandana.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/orangesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/orangesoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/orangesoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/orangesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/pai-cat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/pai-cat.rsi/equipped-HELMET.png
deleted file mode 100644
index 854da3d816..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-cat.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-cat.rsi/icon.png b/Resources/Textures/Clothing/Head/pai-cat.rsi/icon.png
deleted file mode 100644
index b7fbd7fbce..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-cat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-cat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/pai-cat.rsi/inhand-left.png
deleted file mode 100644
index 40dee9c1e0..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-cat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-cat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/pai-cat.rsi/inhand-right.png
deleted file mode 100644
index 839001dac5..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-cat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-cat.rsi/meta.json b/Resources/Textures/Clothing/Head/pai-cat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/pai-cat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/pai-monkey.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/pai-monkey.rsi/equipped-HELMET.png
deleted file mode 100644
index 3c3be1e49a..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-monkey.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-monkey.rsi/icon.png b/Resources/Textures/Clothing/Head/pai-monkey.rsi/icon.png
deleted file mode 100644
index 1cadd964a5..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-monkey.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-monkey.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/pai-monkey.rsi/inhand-left.png
deleted file mode 100644
index 76034daf67..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-monkey.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-monkey.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/pai-monkey.rsi/inhand-right.png
deleted file mode 100644
index c61c61f6b6..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-monkey.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-monkey.rsi/meta.json b/Resources/Textures/Clothing/Head/pai-monkey.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/pai-monkey.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/pai-mouse.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/pai-mouse.rsi/equipped-HELMET.png
deleted file mode 100644
index 92af8ff4a0..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-mouse.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-mouse.rsi/icon.png b/Resources/Textures/Clothing/Head/pai-mouse.rsi/icon.png
deleted file mode 100644
index a42abb747f..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-mouse.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-mouse.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/pai-mouse.rsi/inhand-left.png
deleted file mode 100644
index 2a1b2bcc02..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-mouse.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-mouse.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/pai-mouse.rsi/inhand-right.png
deleted file mode 100644
index de18ce1f7f..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-mouse.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-mouse.rsi/meta.json b/Resources/Textures/Clothing/Head/pai-mouse.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/pai-mouse.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/pai-repairbot.rsi/equipped-HELMET.png
deleted file mode 100644
index 5bce990cd3..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/icon.png b/Resources/Textures/Clothing/Head/pai-repairbot.rsi/icon.png
deleted file mode 100644
index 5fb40d8cdf..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/pai-repairbot.rsi/inhand-left.png
deleted file mode 100644
index 6c929c7703..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/pai-repairbot.rsi/inhand-right.png
deleted file mode 100644
index c7430fcb81..0000000000
Binary files a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/meta.json b/Resources/Textures/Clothing/Head/pai-repairbot.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/pai-repairbot.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/paintedwelding.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/paintedwelding.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/paintedweldingup.rsi/meta.json b/Resources/Textures/Clothing/Head/paintedweldingup.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/paintedweldingup.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/paper.rsi/meta.json b/Resources/Textures/Clothing/Head/paper.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/paper.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/philosopher_wig.rsi/equipped-HELMET.png
deleted file mode 100644
index c54f616dfe..0000000000
Binary files a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/icon.png b/Resources/Textures/Clothing/Head/philosopher_wig.rsi/icon.png
deleted file mode 100644
index 1ee6980ffd..0000000000
Binary files a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/philosopher_wig.rsi/inhand-left.png
deleted file mode 100644
index d7486a131e..0000000000
Binary files a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/philosopher_wig.rsi/inhand-right.png
deleted file mode 100644
index 2c48c51c00..0000000000
Binary files a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/meta.json b/Resources/Textures/Clothing/Head/philosopher_wig.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/philosopher_wig.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/pirate.rsi/meta.json b/Resources/Textures/Clothing/Head/pirate.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/pirate.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/plaguedoctor.rsi/meta.json b/Resources/Textures/Clothing/Head/plaguedoctor.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/plaguedoctor.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/pumpkin.rsi/meta.json b/Resources/Textures/Clothing/Head/pumpkin.rsi/meta.json
deleted file mode 100644
index 9a60601fd5..0000000000
--- a/Resources/Textures/Clothing/Head/pumpkin.rsi/meta.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "version":1,
- "size":{
- "x":32,
- "y":32
- },
- "license":"CC-BY-SA-3.0",
- "copyright":"https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states":[
- {
- "name":"equipped-HELMET",
- "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":"icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-equipped-HELMET",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-left",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-inhand-right",
- "directions":4,
- "delays":[
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name":"on-icon",
- "directions":1,
- "delays":[
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/purplesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/purplesoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/purplesoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/purplesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/pwig.rsi/meta.json b/Resources/Textures/Clothing/Head/pwig.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/pwig.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/rad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/rad.rsi/equipped-HELMET.png
deleted file mode 100644
index 9c95d740a5..0000000000
Binary files a/Resources/Textures/Clothing/Head/rad.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/rad.rsi/icon.png b/Resources/Textures/Clothing/Head/rad.rsi/icon.png
deleted file mode 100644
index a76a31aa92..0000000000
Binary files a/Resources/Textures/Clothing/Head/rad.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/rad.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/rad.rsi/inhand-left.png
deleted file mode 100644
index 60a48e55cd..0000000000
Binary files a/Resources/Textures/Clothing/Head/rad.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/rad.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/rad.rsi/inhand-right.png
deleted file mode 100644
index e35f96874d..0000000000
Binary files a/Resources/Textures/Clothing/Head/rad.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/rad.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/rad.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/redsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/redsoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/redsoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/redsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/redsoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/redsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/redwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/redwizard.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/redwizard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/richard.rsi/meta.json b/Resources/Textures/Clothing/Head/richard.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/richard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/s-ninja.rsi/icon.png b/Resources/Textures/Clothing/Head/s-ninja.rsi/icon.png
deleted file mode 100644
index 63c9eab42d..0000000000
Binary files a/Resources/Textures/Clothing/Head/s-ninja.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/s-ninja.rsi/meta.json b/Resources/Textures/Clothing/Head/s-ninja.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/s-ninja.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/santahat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/santahat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/scaf.rsi/meta.json b/Resources/Textures/Clothing/Head/scaf.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/scaf.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/secsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/secsoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/secsoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/secsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/secsoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/secsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/security.rsi/equipped-HELMET.png
deleted file mode 100644
index 08a4f08600..0000000000
Binary files a/Resources/Textures/Clothing/Head/security.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/security.rsi/icon.png b/Resources/Textures/Clothing/Head/security.rsi/icon.png
deleted file mode 100644
index 8ecf4d504d..0000000000
Binary files a/Resources/Textures/Clothing/Head/security.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/security.rsi/inhand-left.png
deleted file mode 100644
index 2f0932a7a1..0000000000
Binary files a/Resources/Textures/Clothing/Head/security.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/security.rsi/inhand-right.png
deleted file mode 100644
index 9e8e6cf849..0000000000
Binary files a/Resources/Textures/Clothing/Head/security.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/security.rsi/meta.json b/Resources/Textures/Clothing/Head/security.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/security.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/skubhead.rsi/meta.json b/Resources/Textures/Clothing/Head/skubhead.rsi/meta.json
deleted file mode 100644
index a56cb9d4bb..0000000000
--- a/Resources/Textures/Clothing/Head/skubhead.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "",
- "copyright": "EOBGames/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "equipped-HELMET",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/sombrero.rsi/meta.json b/Resources/Textures/Clothing/Head/sombrero.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/sombrero.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/surgcap_blue.rsi/meta.json b/Resources/Textures/Clothing/Head/surgcap_blue.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/surgcap_blue.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/surgcap_green.rsi/meta.json b/Resources/Textures/Clothing/Head/surgcap_green.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/surgcap_green.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/surgcap_purple.rsi/meta.json b/Resources/Textures/Clothing/Head/surgcap_purple.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/surgcap_purple.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/headlight.png b/Resources/Textures/Clothing/Head/syndicate.rsi/headlight.png
deleted file mode 100644
index 190ce31875..0000000000
Binary files a/Resources/Textures/Clothing/Head/syndicate.rsi/headlight.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/syndicate.rsi/icon.png
deleted file mode 100644
index 30f6d2cc8b..0000000000
Binary files a/Resources/Textures/Clothing/Head/syndicate.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/syndicate.rsi/meta.json
deleted file mode 100644
index 2c642dac49..0000000000
--- a/Resources/Textures/Clothing/Head/syndicate.rsi/meta.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi",
- "states": [
- {
- "name": "equipped-HELMET",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "visorlit-equipped-HELMET",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "headlight-equipped-HELMET",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "visorlit-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "visorlit-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "headlight-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "headlight-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "visorlit",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "headlight",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Head/syndicate.rsi/visorlit.png b/Resources/Textures/Clothing/Head/syndicate.rsi/visorlit.png
deleted file mode 100644
index 93e919e6f2..0000000000
Binary files a/Resources/Textures/Clothing/Head/syndicate.rsi/visorlit.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/thunderdome.rsi/meta.json b/Resources/Textures/Clothing/Head/thunderdome.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/thunderdome.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/tophat.rsi/meta.json b/Resources/Textures/Clothing/Head/tophat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/tophat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/ushankadown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/ushankadown.rsi/equipped-HELMET.png
deleted file mode 100644
index 3fa5acc541..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankadown.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankadown.rsi/icon.png b/Resources/Textures/Clothing/Head/ushankadown.rsi/icon.png
deleted file mode 100644
index af9c3e7cfc..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankadown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankadown.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/ushankadown.rsi/inhand-left.png
deleted file mode 100644
index 435878c0d3..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankadown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankadown.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/ushankadown.rsi/inhand-right.png
deleted file mode 100644
index 3f6ec4ebad..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankadown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankadown.rsi/meta.json b/Resources/Textures/Clothing/Head/ushankadown.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/ushankadown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/ushankaup.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/ushankaup.rsi/equipped-HELMET.png
deleted file mode 100644
index 04bb9e2936..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankaup.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankaup.rsi/icon.png b/Resources/Textures/Clothing/Head/ushankaup.rsi/icon.png
deleted file mode 100644
index e89f3a67cb..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankaup.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankaup.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/ushankaup.rsi/inhand-left.png
deleted file mode 100644
index ff1ef50f1f..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankaup.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankaup.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/ushankaup.rsi/inhand-right.png
deleted file mode 100644
index 62da932c3a..0000000000
Binary files a/Resources/Textures/Clothing/Head/ushankaup.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/ushankaup.rsi/meta.json b/Resources/Textures/Clothing/Head/ushankaup.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/ushankaup.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/violetwizard.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/violetwizard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/void.rsi/meta.json b/Resources/Textures/Clothing/Head/void.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/void.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/welding.rsi/meta.json b/Resources/Textures/Clothing/Head/welding.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/welding.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/weldingup.rsi/meta.json b/Resources/Textures/Clothing/Head/weldingup.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/weldingup.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/witch.rsi/meta.json b/Resources/Textures/Clothing/Head/witch.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/witch.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/witchhat.rsi/meta.json b/Resources/Textures/Clothing/Head/witchhat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/witchhat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/wizard-fake.rsi/meta.json b/Resources/Textures/Clothing/Head/wizard-fake.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/wizard-fake.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/wizardhat.rsi/meta.json b/Resources/Textures/Clothing/Head/wizardhat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/wizardhat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/wizardhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/wizardhelm.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/wizardhelm.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/xenom.rsi/meta.json b/Resources/Textures/Clothing/Head/xenom.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/xenom.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/xenos.rsi/meta.json b/Resources/Textures/Clothing/Head/xenos.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/xenos.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/xmashat.rsi/meta.json b/Resources/Textures/Clothing/Head/xmashat.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/xmashat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/yellowsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/yellowsoft.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/yellowsoft.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/meta.json
deleted file mode 100644
index f590b6ee18..0000000000
--- a/Resources/Textures/Clothing/Head/yellowsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/40b254106b46981b8ad95ccd5589deb8fa56e765/icons/inventory/head/mob.dmi", "states": [{"name": "equipped-HELMET", "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": "icon", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Masks/mask_breath.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_breath.rsi/equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK.png
diff --git a/Resources/Textures/Clothing/Masks/mask_breath.rsi/icon.png b/Resources/Textures/Clothing/Mask/breath.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_breath.rsi/icon.png
rename to Resources/Textures/Clothing/Mask/breath.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/breath.rsi/inhand-left.png
new file mode 100644
index 0000000000..33b171c87a
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/breath.rsi/inhand-right.png
new file mode 100644
index 0000000000..7f71ac4831
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/inhand-right.png differ
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..3d9f681c4b
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-MASK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Masks/mask_clown.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_clown.rsi/equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK.png
diff --git a/Resources/Textures/Clothing/Masks/mask_clown.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_clown.rsi/icon.png
rename to Resources/Textures/Clothing/Mask/clown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Mask/clown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_clown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Mask/clown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json
new file mode 100644
index 0000000000..3d9f681c4b
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-MASK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_gasalt.rsi/equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK.png
diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/icon.png b/Resources/Textures/Clothing/Mask/gas.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_gasalt.rsi/icon.png
rename to Resources/Textures/Clothing/Mask/gas.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gas.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Mask/gas.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gas.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_gasalt.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Mask/gas.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json
new file mode 100644
index 0000000000..3d9f681c4b
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-MASK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Masks/mask_joy.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_joy.rsi/equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK.png
diff --git a/Resources/Textures/Clothing/Masks/mask_joy.rsi/icon.png b/Resources/Textures/Clothing/Mask/joy.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_joy.rsi/icon.png
rename to Resources/Textures/Clothing/Mask/joy.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json
new file mode 100644
index 0000000000..87ca8625bc
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-MASK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Masks/mask_mime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_mime.rsi/equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK.png
diff --git a/Resources/Textures/Clothing/Masks/mask_mime.rsi/icon.png b/Resources/Textures/Clothing/Mask/mime.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_mime.rsi/icon.png
rename to Resources/Textures/Clothing/Mask/mime.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json
new file mode 100644
index 0000000000..87ca8625bc
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-MASK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Masks/mask_sterile.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_sterile.rsi/equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK.png
diff --git a/Resources/Textures/Clothing/Masks/mask_sterile.rsi/icon.png b/Resources/Textures/Clothing/Mask/sterile.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_sterile.rsi/icon.png
rename to Resources/Textures/Clothing/Mask/sterile.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/sterile.rsi/inhand-left.png
new file mode 100644
index 0000000000..b52401db9a
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/sterile.rsi/inhand-right.png
new file mode 100644
index 0000000000..25254aa71f
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
new file mode 100644
index 0000000000..48c2d3d38e
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-MASK",
+ "directions": 4
+ },
+ {
+ "name": "up-equipped-MASK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Masks/mask_sterile.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK.png
similarity index 100%
rename from Resources/Textures/Clothing/Masks/mask_sterile.rsi/up-equipped-MASK.png
rename to Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK.png
diff --git a/Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json
deleted file mode 100644
index 06a2e40339..0000000000
--- a/Resources/Textures/Clothing/Masks/mask_breath.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "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": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "equipped-MASK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Masks/mask_clown.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_clown.rsi/meta.json
deleted file mode 100644
index 0fadeb20fc..0000000000
--- a/Resources/Textures/Clothing/Masks/mask_clown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-MASK", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Masks/mask_gas.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/equipped-MASK.png
deleted file mode 100644
index 39c36ed017..0000000000
Binary files a/Resources/Textures/Clothing/Masks/mask_gas.rsi/equipped-MASK.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Masks/mask_gas.rsi/icon.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/icon.png
deleted file mode 100644
index e4cd1bfcee..0000000000
Binary files a/Resources/Textures/Clothing/Masks/mask_gas.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-left.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-left.png
deleted file mode 100644
index eabd5912d3..0000000000
Binary files a/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-right.png b/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-right.png
deleted file mode 100644
index 2423203a78..0000000000
Binary files a/Resources/Textures/Clothing/Masks/mask_gas.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Masks/mask_gas.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_gas.rsi/meta.json
deleted file mode 100644
index a30198f505..0000000000
--- a/Resources/Textures/Clothing/Masks/mask_gas.rsi/meta.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "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 9f4bd6e0d5e457b6a36f3c505a8194116a666d6f",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [ [ 1.0 ] ]
- },
- {
- "name": "equipped-MASK",
- "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/Masks/mask_gasalt.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/meta.json
deleted file mode 100644
index f8f285dfa4..0000000000
--- a/Resources/Textures/Clothing/Masks/mask_gasalt.rsi/meta.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [ [ 1.0 ] ]
- },
- {
- "name": "equipped-MASK",
- "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/Masks/mask_joy.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_joy.rsi/meta.json
deleted file mode 100644
index f9b8c223d5..0000000000
--- a/Resources/Textures/Clothing/Masks/mask_joy.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- },
- {
- "name": "equipped-MASK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Masks/mask_mime.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_mime.rsi/meta.json
deleted file mode 100644
index f9b8c223d5..0000000000
--- a/Resources/Textures/Clothing/Masks/mask_mime.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- },
- {
- "name": "equipped-MASK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Masks/mask_sterile.rsi/meta.json b/Resources/Textures/Clothing/Masks/mask_sterile.rsi/meta.json
deleted file mode 100644
index 7ec693eda3..0000000000
--- a/Resources/Textures/Clothing/Masks/mask_sterile.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- },
- {
- "name": "equipped-MASK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "up-equipped-MASK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json
index 157fe60c95..e19b37f8de 100644
--- a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json
@@ -1 +1,173 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", "states": [{"name": "armor", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "cardborg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "deathsquad", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "fire_extinguisher0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "fire_extinguisher1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "ian", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "oxygen", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "petcollar", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "walkietalkie", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "armor",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "cardborg",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "deathsquad",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "fire_extinguisher0",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "fire_extinguisher1",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "ian",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "oxygen",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "petcollar",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "walkietalkie",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json
index cffa96ab1f..9de87b0e34 100644
--- a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json
@@ -1 +1,737 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", "states": [{"name": "beret", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "blackscarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "bunny", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "captain", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "cardborg_h", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "cargosoft", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "chef", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "christmasscarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "clown", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "detective", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "festive", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_cakehat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_reindeer", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_yellow", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat1_cakehat", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "hardhat1_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat1_yellow", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "helmet", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hopcap", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "kitty", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "nursehat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "paper", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "paper_words", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pirate", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "policehelm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "redwizard", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "santahat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "scarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sheet", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sheriff", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sombrero", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sun", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "tophat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "ushankadown", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "ushankaup", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wizard", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wizard-fake", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "zebrascarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "beret",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "blackscarf",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bunny",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "captain",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "cardborg_h",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "cargosoft",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "chef",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "christmasscarf",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "clown",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "detective",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "festive",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "hardhat0_cakehat",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "hardhat0_reindeer",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "hardhat0_white",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "hardhat0_yellow",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "hardhat1_cakehat",
+ "directions": 4,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "hardhat1_white",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "hardhat1_yellow",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "helmet",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "hopcap",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "kitty",
+ "directions": 4,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "nursehat",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "paper",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "paper_words",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pirate",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "policehelm",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "redwizard",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "santahat",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "scarf",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "sheet",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "sheriff",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "sombrero",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "sun",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tophat",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "ushankadown",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "ushankaup",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "wizard",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "wizard-fake",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "zebrascarf",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/sheetNT-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/NT.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/sheetUSA-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/USA.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/sheetblack-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/black.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/sheetblue-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/blue.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/sheetbrown-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/brown.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/sheetcaptain-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/sheetce-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/ce.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/sheetcentcom-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/centcom.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/sheetclown-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/clown.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/sheetclown-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/clown.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/clown.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/clown.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/clown.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/sheetcmo-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/cmo.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/sheetcosmos-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/meta.json
similarity index 84%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/meta.json
rename to Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/meta.json
index 4085e1b752..23ab5fd0ba 100644
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cosmos.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/cosmos.rsi/meta.json
@@ -1,14 +1,14 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"size": {
"x": 32,
"y": 32
},
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
"states": [
{
- "name": "sheetcosmos-equipped-NECK",
+ "name": "equipped-NECK",
"directions": 4,
"delays": [
[
@@ -46,7 +46,7 @@
]
},
{
- "name": "sheetcosmos-inhand-left",
+ "name": "inhand-left",
"directions": 4,
"delays": [
[
@@ -76,7 +76,7 @@
]
},
{
- "name": "sheetcosmos-inhand-right",
+ "name": "inhand-right",
"directions": 4,
"delays": [
[
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/sheetcult-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/meta.json
similarity index 50%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/meta.json
rename to Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/meta.json
index c6f3cf5818..a3a72c25ff 100644
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/cult.rsi/meta.json
@@ -1,14 +1,14 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"size": {
"x": 32,
"y": 32
},
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
"states": [
{
- "name": "sheetwiz-equipped-NECK",
+ "name": "equipped-NECK",
"directions": 4,
"delays": [
[
@@ -38,40 +38,12 @@
]
},
{
- "name": "sheetwiz-inhand-left",
+ "name": "inhand-left",
"directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
},
{
- "name": "sheetwiz-inhand-right",
+ "name": "inhand-right",
"directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
}
]
}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/sheetgreen-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/green.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/sheetgrey-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/grey.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/sheethop-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/hop.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/sheethos-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/hos.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/sheetian-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/ian.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/sheetmedical-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/medical.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/sheetmime-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/mime.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/sheetorange-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/orange.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/sheetpurple-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/purple.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/sheetqm-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/qm.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/sheetrainbow-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/rainbow.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/sheetrd-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/rd.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/sheetred-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/red.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/meta.json
deleted file mode 100644
index 19ca43cbbb..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_NT.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetNT-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetNT-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetNT-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/meta.json
deleted file mode 100644
index d8b9f8e973..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_USA.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetUSA-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetUSA-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetUSA-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/meta.json
deleted file mode 100644
index 082703043b..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_black.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetblack-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetblack-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetblack-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/meta.json
deleted file mode 100644
index f41c32d33a..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_blue.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetblue-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetblue-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetblue-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/meta.json
deleted file mode 100644
index b0399b3c5d..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_brown.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetbrown-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetbrown-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetbrown-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/meta.json
deleted file mode 100644
index c134ea482b..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_captain.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetcaptain-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetcaptain-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetcaptain-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/meta.json
deleted file mode 100644
index 90e4c72b3c..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ce.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetce-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetce-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetce-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/meta.json
deleted file mode 100644
index dfeb2b5417..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_centcom.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetcentcom-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetcentcom-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetcentcom-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/meta.json
deleted file mode 100644
index b85d02319d..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_clown.rsi/meta.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetclown-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/meta.json
deleted file mode 100644
index da738189dc..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cmo.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetcmo-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetcmo-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetcmo-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/meta.json
deleted file mode 100644
index 1f927071f8..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_cult.rsi/meta.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetcult-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 0.3,
- 0.2,
- 0.3,
- 0.2
- ],
- [
- 0.3,
- 0.2,
- 0.3,
- 0.2
- ],
- [
- 0.3,
- 0.2,
- 0.3,
- 0.2
- ],
- [
- 0.3,
- 0.2,
- 0.3,
- 0.2
- ]
- ]
- },
- {
- "name": "sheetcult-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetcult-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/meta.json
deleted file mode 100644
index fadb56b0b2..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_green.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetgreen-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetgreen-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetgreen-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/meta.json
deleted file mode 100644
index aec4baf13f..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_grey.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetgrey-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetgrey-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetgrey-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/meta.json
deleted file mode 100644
index cc1bc3fb16..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hop.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheethop-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheethop-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheethop-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/meta.json
deleted file mode 100644
index 8cf217b195..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_hos.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheethos-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheethos-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheethos-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/meta.json
deleted file mode 100644
index 5825584df9..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_ian.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetian-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetian-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetian-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/meta.json
deleted file mode 100644
index f44a801c0f..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_medical.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetmedical-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetmedical-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetmedical-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/meta.json
deleted file mode 100644
index 885b1ca01e..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_mime.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetmime-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetmime-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetmime-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/meta.json
deleted file mode 100644
index 7058cbdb04..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_orange.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetorange-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetorange-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetorange-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/meta.json
deleted file mode 100644
index 0b3477c875..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_purple.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetpurple-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetpurple-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetpurple-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/meta.json
deleted file mode 100644
index bd25887f5b..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_qm.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetqm-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetqm-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetqm-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/meta.json
deleted file mode 100644
index c1c91fa82a..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rainbow.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetrainbow-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetrainbow-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetrainbow-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/meta.json
deleted file mode 100644
index f0cd42d9bd..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_rd.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetrd-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetrd-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetrd-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/meta.json
deleted file mode 100644
index 3f5703ef18..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_red.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetred-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetred-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetred-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/meta.json
deleted file mode 100644
index a9baee05cf..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetsyndie-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetsyndie-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetsyndie-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/meta.json
deleted file mode 100644
index ad073f3c38..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetwhite-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetwhite-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetwhite-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/meta.json
deleted file mode 100644
index 4d2597c8a7..0000000000
--- a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "sheetyellow-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetyellow-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sheetyellow-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_syndie.rsi/sheetsyndie-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/syndie.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_white.rsi/sheetwhite-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/white.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_wiz.rsi/sheetwiz-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/wiz.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Bedsheets/sheet_yellow.rsi/sheetyellow-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/meta.json
new file mode 100644
index 0000000000..f21b1b6061
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Bedsheets/yellow.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/capcloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/meta.json
deleted file mode 100644
index 5d9600b00c..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/cap_cloak.rsi/meta.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "capcloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "capcloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak.png b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/cecloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/meta.json
deleted file mode 100644
index 8357eba499..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/ce_cloak.rsi/meta.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "cecloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "cecloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
-
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/cmocloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/meta.json
deleted file mode 100644
index 3ade071e01..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/cmo_cloak.rsi/meta.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "cmocloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "cmocloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/herald.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/herald.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/herald.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/heraldcloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/herald.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/herald.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/herald.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/herald.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/meta.json
deleted file mode 100644
index 6666fef9f8..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/herald_cloak.rsi/meta.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "heraldcloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "heraldcloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/hopcloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/meta.json
deleted file mode 100644
index e1419bef8c..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/hop_cloak.rsi/meta.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "hopcloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hopcloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
-
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/hoscloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/meta.json
deleted file mode 100644
index c130b066cf..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/hos_cloak.rsi/meta.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "hoscloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hoscloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/qmcloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/meta.json
deleted file mode 100644
index 057ccf70e8..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/qm_cloak.rsi/meta.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "qmcloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "qmcloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak.png b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/rdcloak.png
rename to Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
new file mode 100644
index 0000000000..7920dfbd39
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/meta.json
deleted file mode 100644
index fcc4c9f9d8..0000000000
--- a/Resources/Textures/Clothing/Neck/Cloaks/rd_cloak.rsi/meta.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "rdcloak-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "rdcloak",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/bling.rsi/bling-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/bling.rsi/bling-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Misc/bling.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/bling.rsi/bling.png b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/bling.rsi/bling.png
rename to Resources/Textures/Clothing/Neck/Misc/bling.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/bling.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/meta.json
new file mode 100644
index 0000000000..cc8b8f54f0
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/bling.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Misc/headphones.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/headphones.rsi/headphones_off.png
rename to Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon-on.png
diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on.png
rename to Resources/Textures/Clothing/Neck/Misc/headphones.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-left.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-left.png
rename to Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-right.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-inhand-right.png
rename to Resources/Textures/Clothing/Neck/Misc/headphones.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json
new file mode 100644
index 0000000000..efdcf97059
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/meta.json
@@ -0,0 +1,73 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "on-equipped-NECK",
+ "directions": 4,
+ "delays": [
+ [
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
+ ],
+ [
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
+ ],
+ [
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
+ ],
+ [
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
+ ]
+ ]
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-on",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/headphones.rsi/on-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/headphones.rsi/headphones_on-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Misc/headphones.rsi/on-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/stethoscope.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Misc/stethoscope.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope.png b/Resources/Textures/Clothing/Neck/Misc/stethoscope.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/stethoscope.rsi/stethoscope.png
rename to Resources/Textures/Clothing/Neck/Misc/stethoscope.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/stethoscope.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/stethoscope.rsi/meta.json
new file mode 100644
index 0000000000..bc5ec2dee3
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/stethoscope.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/blue.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Scarfs/blue.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf.png b/Resources/Textures/Clothing/Neck/Scarfs/blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/stripedbluescarf.png
rename to Resources/Textures/Clothing/Neck/Scarfs/blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/blue.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/blue.rsi/meta.json
new file mode 100644
index 0000000000..bc5ec2dee3
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/blue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/meta.json
deleted file mode 100644
index cf0bb40cae..0000000000
--- a/Resources/Textures/Clothing/Neck/Scarfs/blue_scarf.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "stripedbluescarf-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "stripedbluescarf",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/green.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Scarfs/green.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf.png b/Resources/Textures/Clothing/Neck/Scarfs/green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/stripedgreenscarf.png
rename to Resources/Textures/Clothing/Neck/Scarfs/green.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/green.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/green.rsi/meta.json
new file mode 100644
index 0000000000..bc5ec2dee3
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/green.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/meta.json
deleted file mode 100644
index f7268a2ee9..0000000000
--- a/Resources/Textures/Clothing/Neck/Scarfs/green_scarf.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "stripedgreenscarf-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "stripedgreenscarf",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/red.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Scarfs/red.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf.png b/Resources/Textures/Clothing/Neck/Scarfs/red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/stripedredscarf.png
rename to Resources/Textures/Clothing/Neck/Scarfs/red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/red.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/red.rsi/meta.json
new file mode 100644
index 0000000000..bc5ec2dee3
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/red.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/meta.json
deleted file mode 100644
index 5130125131..0000000000
--- a/Resources/Textures/Clothing/Neck/Scarfs/red_scarf.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "stripedredscarf-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "stripedredscarf",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/zebra.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Scarfs/zebra.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf.png b/Resources/Textures/Clothing/Neck/Scarfs/zebra.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/zebrascarf.png
rename to Resources/Textures/Clothing/Neck/Scarfs/zebra.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/zebra.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/zebra.rsi/meta.json
new file mode 100644
index 0000000000..bc5ec2dee3
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/zebra.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/meta.json
deleted file mode 100644
index ce2264b686..0000000000
--- a/Resources/Textures/Clothing/Neck/Scarfs/zebra_scarf.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "zebrascarf-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "zebrascarf",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/dettie.rsi/dettie-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/dettie.rsi/dettie-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Ties/dettie.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/dettie.rsi/dettie.png b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/dettie.rsi/dettie.png
rename to Resources/Textures/Clothing/Neck/Ties/dettie.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
new file mode 100644
index 0000000000..bc5ec2dee3
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Ties/dettie.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/redtie.rsi/redtie-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/redtie.rsi/redtie-equipped-NECK.png
rename to Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/redtie.rsi/redtie.png b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/redtie.rsi/redtie.png
rename to Resources/Textures/Clothing/Neck/Ties/redtie.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
new file mode 100644
index 0000000000..bc5ec2dee3
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Neck/bling.rsi/meta.json b/Resources/Textures/Clothing/Neck/bling.rsi/meta.json
deleted file mode 100644
index 076ab3df21..0000000000
--- a/Resources/Textures/Clothing/Neck/bling.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "bling-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "bling",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/dettie.rsi/meta.json b/Resources/Textures/Clothing/Neck/dettie.rsi/meta.json
deleted file mode 100644
index b64be4b119..0000000000
--- a/Resources/Textures/Clothing/Neck/dettie.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "dettie-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "dettie",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/headphones.rsi/meta.json b/Resources/Textures/Clothing/Neck/headphones.rsi/meta.json
deleted file mode 100644
index b3ab764332..0000000000
--- a/Resources/Textures/Clothing/Neck/headphones.rsi/meta.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "headphones_on-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ]
- ]
- },
- {
- "name": "headphones_off-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "headphones_on-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "headphones_on-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "headphones_off",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "headphones_on",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/redtie.rsi/meta.json b/Resources/Textures/Clothing/Neck/redtie.rsi/meta.json
deleted file mode 100644
index a105dba279..0000000000
--- a/Resources/Textures/Clothing/Neck/redtie.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "redtie-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "redtie",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Neck/stethoscope.rsi/meta.json b/Resources/Textures/Clothing/Neck/stethoscope.rsi/meta.json
deleted file mode 100644
index 201efa4641..0000000000
--- a/Resources/Textures/Clothing/Neck/stethoscope.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CCBYNA3",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "stethoscope-equipped-NECK",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "stethoscope",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
new file mode 100644
index 0000000000..940cc63fd5
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
new file mode 100644
index 0000000000..940cc63fd5
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/heavy.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/heavy.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/heavy.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/heavy.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/heavy.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/heavy.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/heavy.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/heavy.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/tdred.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdred.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/tdred.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdred.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/tdred.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdred.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/tdred.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/tdred.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/magusblue.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusblue.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/magusblue.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusblue.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/magusblue.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusblue.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/magusblue.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusblue.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/magusred.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusred.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/magusred.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusred.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/magusred.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusred.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/magusred.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/magusred.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/riot.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/riot.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/riot.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/riot.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/riot.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/riot.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/riot.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
new file mode 100644
index 0000000000..940cc63fd5
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/scaf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/scaf.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/scaf.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/scaf.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/scaf.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/scaf.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/scaf.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/scaf.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
new file mode 100644
index 0000000000..940cc63fd5
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/scaf.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_general.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_general.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_general.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_general.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_general.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_general.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_general.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_general.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_security.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_security.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_security.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_security.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon-open.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon-open.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json
new file mode 100644
index 0000000000..70d61b867c
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-open",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "open-equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/open-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/open-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/open-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/open-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/open-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi/open-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/detective.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detective.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/detective.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detective.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detective.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detective.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/hos_trenchcoat.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/hos_trenchcoat.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
new file mode 100644
index 0000000000..0a4b307734
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
new file mode 100644
index 0000000000..9ed938b270
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..60a4025dbb
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
new file mode 100644
index 0000000000..a83d9ec342
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
new file mode 100644
index 0000000000..f01e260697
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
new file mode 100644
index 0000000000..70d61b867c
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-open",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "open-equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..23c551dada
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..4633674328
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
new file mode 100644
index 0000000000..70d976c241
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
new file mode 100644
index 0000000000..79b19b5605
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
new file mode 100644
index 0000000000..70d61b867c
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-open",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "open-equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..a85efe1b30
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..81541cd422
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
new file mode 100644
index 0000000000..ecb6a5153f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
new file mode 100644
index 0000000000..98171bbf59
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
new file mode 100644
index 0000000000..12c0d9c5e3
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-open",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "open-equipped-OUTERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..44310161e6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/pirate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/pirate.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/pirate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/pirate.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/pirate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/pirate.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/pirate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/pirate.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..b62a0318da
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
new file mode 100644
index 0000000000..b226550a5d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left hand.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left hand.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right hand.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right hand.png
rename to Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..a6f1904a2c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png
new file mode 100644
index 0000000000..87c3f8595a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..02154c65cd
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png
new file mode 100644
index 0000000000..1bcc6adef9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png
new file mode 100644
index 0000000000..1c5a054bba
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png
new file mode 100644
index 0000000000..60c4c9631e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png
new file mode 100644
index 0000000000..9312de4a0c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png
new file mode 100644
index 0000000000..f014aca7cb
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/meta.json
new file mode 100644
index 0000000000..940cc63fd5
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..486b50e13c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/icon.png
new file mode 100644
index 0000000000..70a0257915
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
new file mode 100644
index 0000000000..e457d87938
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
new file mode 100644
index 0000000000..2ff04b1e7e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..3465700d9b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
new file mode 100644
index 0000000000..8081c5962d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png
new file mode 100644
index 0000000000..d81d730fb4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..a1ecf105b2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png
new file mode 100644
index 0000000000..4f04fd6bf4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-left.png
new file mode 100644
index 0000000000..f808f0c975
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-right.png
new file mode 100644
index 0000000000..1fb781159d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/desktop.ini b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/desktop.ini
new file mode 100644
index 0000000000..50f5dd9bc9
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/desktop.ini
@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+hardsuit-sec.png=@hardsuit-sec.png,0
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..3615778dcd
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png
new file mode 100644
index 0000000000..61183533d4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-left.png
new file mode 100644
index 0000000000..f808f0c975
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-right.png
new file mode 100644
index 0000000000..1fb781159d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png
new file mode 100644
index 0000000000..d8ace82fae
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/icon.png
new file mode 100644
index 0000000000..4d552add4c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/apron.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apron.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apron.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apron.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apron.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apron.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apron.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apron.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/apronchef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apronchef.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apronchef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apronchef.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apronchef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apronchef.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apronchef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apronchef.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/icon-open.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/icon-open.png
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json
new file mode 100644
index 0000000000..70d61b867c
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-open",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "open-equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi/open-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cardborg.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cardborg.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cardborg.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cardborg.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cardborg.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cardborg.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cardborg.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cardborg.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/chef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chef.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chef.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chef.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chef.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/icon-open.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/icon-open.png
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json
new file mode 100644
index 0000000000..70d61b867c
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-open",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "open-equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "open-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/open-inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/judge.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/judge.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/judge.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/judge.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/judge.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/judge.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/judge.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/judge.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/poncho.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/poncho.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/poncho.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/poncho.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/poncho.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/poncho.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/poncho.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/poncho.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/redwizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/redwizard.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/redwizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/redwizard.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/redwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/redwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/redwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/redwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/santa.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/santa.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/santa.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/santa.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/santa.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/santa.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/santa.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/santa.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/skubbody.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/skubbody.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/skubbody.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/skubbody.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json
new file mode 100644
index 0000000000..f071bbafba
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "EOBGames from tgstation",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/wizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/wizard.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/wizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/wizard.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/wizard.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/wizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/wizard.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/wizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/xenos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/xenos.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/xenos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/xenos.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/xenos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/xenos.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/xenos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/xenos.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/xenos.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
new file mode 100644
index 0000000000..940cc63fd5
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/emergency.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..5b26aeee30
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png
new file mode 100644
index 0000000000..17f29de4c9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/firesuit.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/firesuit.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..50872d177e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png
new file mode 100644
index 0000000000..c125b0affd
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-left.png
new file mode 100644
index 0000000000..81c7dcb99f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-right.png
new file mode 100644
index 0000000000..76dc0b2e75
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..0a73d16321
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png
new file mode 100644
index 0000000000..8c3605f8b5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..de1bf277e4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
new file mode 100644
index 0000000000..1ee3f2e6e3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/syndicate.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/syndicate.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json
new file mode 100644
index 0000000000..8f2d1b6bdc
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/detvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detvest.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/detvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detvest.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/detvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detvest.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/detvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/detvest.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/acolyte.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hazard.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hazard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hazard.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hazard.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hazard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/hazard.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/hazard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/kvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/kvest.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/kvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/kvest.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/kvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/kvest.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/kvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/kvest.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apron.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apron.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/apronchef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/apronchef.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/mercwebvest.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor-equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor.rsi/armor-equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor-equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png b/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor.rsi/armor.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/armor.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/vest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/vest.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/vest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/vest.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/vest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/vest.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/vest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/vest.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/armor_reflec.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/webvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/webvest.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/webvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/webvest.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/webvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/webvest.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/webvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/webvest.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 92a1f7c968..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/icon.png
deleted file mode 100644
index a3baa9270f..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/inhand-left.png
deleted file mode 100644
index c67abc75df..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/inhand-right.png
deleted file mode 100644
index 93d0ede188..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/acolyte.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 5709eeab45..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/icon.png
deleted file mode 100644
index 101c98d69c..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/inhand-left.png
deleted file mode 100644
index 09b5f629aa..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/inhand-right.png
deleted file mode 100644
index 6248c2645e..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/anomaly_suit.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 2cb2129ba7..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/icon.png
deleted file mode 100644
index 34dc11840c..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/inhand-left.png
deleted file mode 100644
index f9155120b4..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/inhand-right.png
deleted file mode 100644
index 4cc36eb1d5..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/ass_jacket.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 996b51b9ae..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/icon.png
deleted file mode 100644
index c19f9ee4f1..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/inhand-left.png
deleted file mode 100644
index efd146b02c..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/inhand-right.png
deleted file mode 100644
index 5627783100..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bio.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/bio.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 2fb1d40af5..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bio.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bio.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/bio.rsi/icon.png
deleted file mode 100644
index 346c2b266c..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bio.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bio.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/bio.rsi/inhand-left.png
deleted file mode 100644
index 8057082111..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bio.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bio.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/bio.rsi/inhand-right.png
deleted file mode 100644
index 9b6ae79e49..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bio.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio.rsi/meta.json
deleted file mode 100644
index d69588617f..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bio.rsi/meta.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi",
- "states": [
- {
- "name": "equipped-OUTERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bio_general.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio_general.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bio_general.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bio_janitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bio_janitor.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bio_scientist.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bio_scientist.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bio_security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio_security.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bio_security.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bio_virology.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bio_virology.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/black_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/black_hoodie.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/black_hoodie_open.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/black_hoodie_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bomber.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bomber.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bomber.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bomber_open.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bomber_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bombsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 8253e7dfd4..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/icon.png
deleted file mode 100644
index cce6fbc9dc..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/inhand-left.png
deleted file mode 100644
index ec93f2d6c8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/inhand-right.png
deleted file mode 100644
index 8fcac00cd1..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bombsuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bombsuit_white.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index c3123e42d7..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/icon.png
deleted file mode 100644
index d4dbe270ac..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/inhand-left.png
deleted file mode 100644
index 8466711f04..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/inhand-right.png
deleted file mode 100644
index 4e4d762b98..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bombsuit_white.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bombsuitsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bombsuitsec.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/bulletproof.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/caparmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 11fd643d42..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/icon.png
deleted file mode 100644
index 90c25ee64f..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/inhand-left.png
deleted file mode 100644
index 16894d1c8a..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/inhand-right.png
deleted file mode 100644
index 5b14e368ed..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/caparmor.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/cardborg.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/cardborg.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/cardborg.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/cargo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 58cff08e86..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/icon.png
deleted file mode 100644
index 1916256374..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/inhand-left.png
deleted file mode 100644
index 080a5397bb..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/inhand-right.png
deleted file mode 100644
index 87be8f2113..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/cargo_jacket.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/chaplain_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/chaplain_hoodie.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/chef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/chef.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/chef.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/chickensuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/chickensuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/church_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 184b82d158..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/icon.png
deleted file mode 100644
index b6e54ed619..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/inhand-left.png
deleted file mode 100644
index bf3ff041ed..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/inhand-right.png
deleted file mode 100644
index 9e6ce000d3..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/church_coat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/classicponcho.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/classicponcho.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/cult_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/cult_armour.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/cultrobes.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/cultrobes.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/custodian.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/custodian.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 2cb7e362c4..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/custodian.rsi/icon.png
deleted file mode 100644
index 641d65a510..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/custodian.rsi/inhand-left.png
deleted file mode 100644
index 16f1e2802a..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/custodian.rsi/inhand-right.png
deleted file mode 100644
index 73ce669455..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/custodian.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/custodian.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/deathsquad.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/detective.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/detective.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/detective.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/detvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/detvest.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/detvest.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/emergency_suit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/emergency_suit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/firesuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 241913b977..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/icon.png
deleted file mode 100644
index d2a0302bf2..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/firesuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/gentlecoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/gentlecoat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/grey_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/grey_hoodie.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/grey_hoodie_open.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/grey_hoodie_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_atmos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 4d00fe30ea..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/icon.png
deleted file mode 100644
index ac0bc5fc73..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_atmos.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_ce.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/icon.png
deleted file mode 100644
index 0774210bb0..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_ce.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_engineering.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/icon.png
deleted file mode 100644
index a360186912..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_engineering.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_hazardhardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 90f121de08..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/icon.png
deleted file mode 100644
index c5d3b91eb8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/inhand-left.png
deleted file mode 100644
index 2d4a0381b2..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/inhand-right.png
deleted file mode 100644
index 1be3b5ca6e..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_medical.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 8f220979ce..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/icon.png
deleted file mode 100644
index 2b6e16710d..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/inhand-left.png
deleted file mode 100644
index 5a8c2487a8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/inhand-right.png
deleted file mode 100644
index 08960347e4..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_medical.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_mining.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/icon.png
deleted file mode 100644
index e927924fa8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_mining.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_sectg.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 6cff7b8284..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/icon.png
deleted file mode 100644
index bfd6c5243b..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/inhand-left.png
deleted file mode 100644
index d93179d886..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/inhand-right.png
deleted file mode 100644
index 4d5061af1d..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_sectg.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hardsuit_syndie.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/icon.png
deleted file mode 100644
index 289348b63b..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/meta.json
deleted file mode 100644
index 6e92b69051..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_syndie.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "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/OuterClothing/hardsuit_wiz.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/icon.png
deleted file mode 100644
index b48a8a9ac9..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hardsuit_wiz.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hazard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hazard.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hazard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/heavy.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/heavy.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/heavy.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hm_armorvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 440138e591..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/icon.png
deleted file mode 100644
index 2591ea6aa7..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/inhand-left.png
deleted file mode 100644
index 36dc0dd965..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/inhand-right.png
deleted file mode 100644
index fe20900e20..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hm_armorvest.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/hos.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 68bc7bfff8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hos.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/hos.rsi/icon.png
deleted file mode 100644
index 0aaed2d801..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hos.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/hos.rsi/inhand-left.png
deleted file mode 100644
index c3591b9b9e..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hos.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/hos.rsi/inhand-right.png
deleted file mode 100644
index 3c87f36260..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/hos.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hos.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hos.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/meta.json
deleted file mode 100644
index 54edcce48a..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hos_trenchcoat", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/ihvoidsuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/insp_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/insp_coat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/jensencoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/jensencoat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/judge.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/judge.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/judge.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/kvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/kvest.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/kvest.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 6999277fc5..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/icon.png
deleted file mode 100644
index 792f614e69..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat_chem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 7072d257dc..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/icon.png
deleted file mode 100644
index bc63e64b5f..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat_chem.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat_chem_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index ea146b71ab..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/icon.png
deleted file mode 100644
index 9a2524fb16..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat_chem_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 1f0f12d989..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/icon.png
deleted file mode 100644
index 21c235b3c2..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/inhand-left.png
deleted file mode 100644
index c6c7ded502..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/inhand-right.png
deleted file mode 100644
index b0752e2df8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat_cmo_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 3601b885d7..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/icon.png
deleted file mode 100644
index 7e32ec83fc..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/inhand-left.png
deleted file mode 100644
index 62749998d5..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/inhand-right.png
deleted file mode 100644
index fde2183dc8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat_cmo_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat_medspec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index dbdba0e60d..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/icon.png
deleted file mode 100644
index 0dc8e79a2b..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/inhand-left.png
deleted file mode 100644
index 47011c72e6..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/inhand-right.png
deleted file mode 100644
index d61d187733..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat_medspec_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index d3a49ceb58..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/icon.png
deleted file mode 100644
index b21fb4cc4b..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/inhand-left.png
deleted file mode 100644
index e50a28685d..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/inhand-right.png
deleted file mode 100644
index 6823de193f..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat_medspec_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/labcoat_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index e87ad5f98a..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/icon.png
deleted file mode 100644
index df3e924e06..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/labcoat_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/leather_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 382a7ff43f..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/icon.png
deleted file mode 100644
index 3df7c0f637..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/inhand-left.png
deleted file mode 100644
index e2c328dc2d..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/inhand-right.png
deleted file mode 100644
index e3e5da17ea..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/leather_jacket.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/magusblue.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/magusblue.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/magusblue.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/magusred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/magusred.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/magusred.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/mercwebvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/mercwebvest.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/monkeysuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/monkeysuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/pirate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/pirate.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/pirate.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/poncho.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/poncho.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/poncho.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/qm_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index eb4033ec71..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/icon.png
deleted file mode 100644
index 0506c0c2f4..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/inhand-left.png
deleted file mode 100644
index 210e98661b..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/inhand-right.png
deleted file mode 100644
index 099fd3fe4a..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/qm_coat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/radsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 80a431a3ec..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/icon.png
deleted file mode 100644
index 7237b9943c..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/inhand-left.png
deleted file mode 100644
index b0119e3192..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/inhand-right.png
deleted file mode 100644
index 102a230032..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/radsuit.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/reactive.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/reactive.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 2491e558eb..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/reactive.rsi/icon.png
deleted file mode 100644
index 411c7ef0f3..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/reactive.rsi/inhand-left.png
deleted file mode 100644
index 3a500fdc17..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/reactive.rsi/inhand-right.png
deleted file mode 100644
index 50c528071b..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/reactive.rsi/meta.json
deleted file mode 100644
index a8db45e9bc..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/reactive.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 0a74642dcb..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/icon.png
deleted file mode 100644
index fb61343032..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/inhand-left.png
deleted file mode 100644
index aff48f67b3..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/inhand-right.png
deleted file mode 100644
index 291262c855..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/reactiveoff.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/redwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/redwizard.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/redwizard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/riot.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/riot.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/s_ninja.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 85e87efe1f..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/icon.png
deleted file mode 100644
index 911e6455cc..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/s_ninja.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/santa.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/santa.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/santa.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/scaf.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/scaf.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/scaf.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/skubbody.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/skubbody.rsi/meta.json
deleted file mode 100644
index 3027b821b5..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/skubbody.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "",
- "copyright": "EOBGames/tgstation",
- "states": [
- {
- "name": "equipped-OUTERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/straight_jacket.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/surgeon.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index d160d52db9..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/icon.png
deleted file mode 100644
index 8c21f1f8c0..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/inhand-left.png
deleted file mode 100644
index 75c64f9a13..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/inhand-right.png
deleted file mode 100644
index 009e1d9f13..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/surgeon.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/swat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/swat.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index ab89e62adf..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/swat.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/swat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/swat.rsi/icon.png
deleted file mode 100644
index cef327a17e..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/swat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/swat.rsi/inhand-left.png
deleted file mode 100644
index 9245c98c86..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/swat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/swat.rsi/inhand-right.png
deleted file mode 100644
index d26134d2bc..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/swat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/swat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/swat.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/swat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 8c1772ddf3..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/icon.png
deleted file mode 100644
index 3beca6c6ae..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/syndicate.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/tdgreen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/tdgreen.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/tdred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/tdred.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/tdred.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/vest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/vest.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/vest.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/violetwizard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/void.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/void.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 315284155c..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/void.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/void.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/void.rsi/icon.png
deleted file mode 100644
index 1e0c65ccf0..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/void.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/void.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/void.rsi/inhand-left.png
deleted file mode 100644
index 5506570ff8..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/void.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/void.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/void.rsi/inhand-right.png
deleted file mode 100644
index b6b7b13d07..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/void.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/void.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/void.rsi/meta.json
deleted file mode 100644
index 6a3980367b..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/void.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[2.0, 2.0, 2.0, 2.0], [2.0, 2.0, 2.0, 2.0], [2.0, 2.0, 2.0, 2.0], [2.0, 2.0, 2.0, 2.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/webvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/webvest.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/webvest.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/wizard.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/wizard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/OuterClothing/xenos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/xenos.rsi/meta.json
deleted file mode 100644
index 117a2241ce..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/xenos.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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/Shoes/jackboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/jackboots.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/jackboots.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/icon-on.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json
new file mode 100644
index 0000000000..bc7d1e0a9b
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "icon-on",
+ "directions": 1
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/on-equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/workboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/workboots.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/workboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/workboots.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/workboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/workboots.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/workboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/workboots.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/black.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/black.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/black.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/black.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/black.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/black.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/black.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/black.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/black.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/blue.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/blue.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/blue.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/blue.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/blue.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/blue.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/blue.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/brown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/brown.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/brown.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/brown.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/brown.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/brown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/brown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/brown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/brown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/green.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/green.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/green.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/green.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/green.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/green.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/green.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/green.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/green.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/orange.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/orange.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/orange.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/orange.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/orange.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/orange.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/orange.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/orange.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/orange.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/purple.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/purple.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/purple.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/purple.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/purple.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/purple.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/purple.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/purple.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/purple.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/purple.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/purple.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/red.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/red.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/red.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/red.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/red.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/red.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/red.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/red.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/mime.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/mime.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/white.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/mime.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/mime.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/white.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/mime.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/mime.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/white.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/yellow.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/yellow.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Color/yellow.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/yellow.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/yellow.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Color/yellow.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/yellow.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/yellow.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Color/yellow.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/flippers.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/flippers.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/flippers.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/flippers.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/flippers.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/flippers.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/flippers.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/flippers.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/leather.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/leather.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/leather.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/leather.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Misc/leather.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/leather.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/leather.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Misc/leather.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/leather.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/leather.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Misc/leather.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/slippers.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/slippers.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/slippers.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/slippers.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/slippers.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/slippers.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/slippers.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/slippers.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/tourist.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/tourist.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/tourist.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/tourist.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/tourist.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/tourist.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/tourist.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/tourist.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/chef.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/chef.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/chef.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/chef.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Specific/chef.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/chef.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Specific/chef.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/chef.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Specific/chef.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/clown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/clown.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/clown.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/clown.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Specific/clown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/clown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/clown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Specific/clown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/cult.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/cult.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/cult.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/cult.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Specific/cult.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/cult.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/cult.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Specific/cult.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/cult.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/cult.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Specific/cult.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/galoshes.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/galoshes.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/galoshes.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/galoshes.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/galoshes.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/galoshes.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/galoshes.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/galoshes.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/s_ninja.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/s_ninja.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/s_ninja.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/s_ninja.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/s_ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/s_ninja.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/s_ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/s_ninja.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/swat.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/swat.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/swat.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/swat.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/swat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Specific/swat.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/swat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Specific/swat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/wizard.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/wizard.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/wizard.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/wizard.rsi/icon.png
rename to Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/wizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/wizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/wizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/wizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json
new file mode 100644
index 0000000000..8fa0b839b0
--- /dev/null
+++ b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/black.rsi/meta.json b/Resources/Textures/Clothing/Shoes/black.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/black.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/blue.rsi/meta.json b/Resources/Textures/Clothing/Shoes/blue.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/blue.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/boots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/boots.rsi/equipped-FEET.png
deleted file mode 100644
index 6f42b0b8d0..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/boots.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/boots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/boots.rsi/icon.png
deleted file mode 100644
index 53b9182bb0..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/boots.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/boots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/boots.rsi/inhand-left.png
deleted file mode 100644
index ecdc54919a..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/boots.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/boots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/boots.rsi/inhand-right.png
deleted file mode 100644
index 5c5ffa5a81..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/boots.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/boots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/boots.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/boots.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/brown.rsi/meta.json b/Resources/Textures/Clothing/Shoes/brown.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/brown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/chef.rsi/meta.json b/Resources/Textures/Clothing/Shoes/chef.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/chef.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/clown.rsi/meta.json b/Resources/Textures/Clothing/Shoes/clown.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/clown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/cowboy.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/cowboy.rsi/equipped-FEET.png
deleted file mode 100644
index 2f88ef103b..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/cowboy.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/cowboy.rsi/icon.png b/Resources/Textures/Clothing/Shoes/cowboy.rsi/icon.png
deleted file mode 100644
index 3ab1219aaa..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/cowboy.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/cowboy.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/cowboy.rsi/inhand-left.png
deleted file mode 100644
index a7ddb38a75..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/cowboy.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/cowboy.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/cowboy.rsi/inhand-right.png
deleted file mode 100644
index 1b8460287e..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/cowboy.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/cowboy.rsi/meta.json b/Resources/Textures/Clothing/Shoes/cowboy.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/cowboy.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/cult.rsi/meta.json b/Resources/Textures/Clothing/Shoes/cult.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/cult.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/detective.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/detective.rsi/equipped-FEET.png
deleted file mode 100644
index 4260934903..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/detective.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/detective.rsi/icon.png b/Resources/Textures/Clothing/Shoes/detective.rsi/icon.png
deleted file mode 100644
index 94fbbb74d2..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/detective.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/detective.rsi/inhand-left.png
deleted file mode 100644
index ae8a658b5c..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/detective.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/detective.rsi/inhand-right.png
deleted file mode 100644
index bb1dcd25ed..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/detective.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/detective.rsi/meta.json b/Resources/Textures/Clothing/Shoes/detective.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/detective.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/flippers.rsi/meta.json b/Resources/Textures/Clothing/Shoes/flippers.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/flippers.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/galoshes.rsi/meta.json b/Resources/Textures/Clothing/Shoes/galoshes.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/galoshes.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/green.rsi/meta.json b/Resources/Textures/Clothing/Shoes/green.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/green.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/jackboots.rsi/meta.json
deleted file mode 100644
index 1d8cc6b131..0000000000
--- a/Resources/Textures/Clothing/Shoes/jackboots.rsi/meta.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
- "states": [
- {
- "name": "equipped-FEET",
- "directions": 4
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/leather.rsi/meta.json b/Resources/Textures/Clothing/Shoes/leather.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/leather.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/magboots.rsi/meta.json
deleted file mode 100644
index 93c522d46d..0000000000
--- a/Resources/Textures/Clothing/Shoes/magboots.rsi/meta.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi",
- "states": [
- {
- "name": "equipped-FEET",
- "directions": 4
- },
- {
- "name": "on-equipped-FEET",
- "directions": 4
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "icon-on",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "on-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "on-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Shoes/mime.rsi/meta.json b/Resources/Textures/Clothing/Shoes/mime.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/mime.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/orange.rsi/meta.json b/Resources/Textures/Clothing/Shoes/orange.rsi/meta.json
deleted file mode 100644
index 09294c69f3..0000000000
--- a/Resources/Textures/Clothing/Shoes/orange.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/purple.rsi/meta.json b/Resources/Textures/Clothing/Shoes/purple.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/purple.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/red.rsi/meta.json b/Resources/Textures/Clothing/Shoes/red.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/red.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/s_ninja.rsi/meta.json b/Resources/Textures/Clothing/Shoes/s_ninja.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/s_ninja.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/slippers.rsi/meta.json b/Resources/Textures/Clothing/Shoes/slippers.rsi/meta.json
deleted file mode 100644
index 09294c69f3..0000000000
--- a/Resources/Textures/Clothing/Shoes/slippers.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/springjacks.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/springjacks.rsi/equipped-FEET.png
deleted file mode 100644
index 50f409be5d..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/springjacks.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/springjacks.rsi/icon.png b/Resources/Textures/Clothing/Shoes/springjacks.rsi/icon.png
deleted file mode 100644
index 8d164cc1fc..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/springjacks.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/springjacks.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/springjacks.rsi/inhand-left.png
deleted file mode 100644
index 710fa81c5d..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/springjacks.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/springjacks.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/springjacks.rsi/inhand-right.png
deleted file mode 100644
index 65137aa8e6..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/springjacks.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/springjacks.rsi/meta.json b/Resources/Textures/Clothing/Shoes/springjacks.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/springjacks.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/swat.rsi/meta.json b/Resources/Textures/Clothing/Shoes/swat.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/swat.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/tourist.rsi/meta.json b/Resources/Textures/Clothing/Shoes/tourist.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/tourist.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/white.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/white.rsi/equipped-FEET.png
deleted file mode 100644
index db8ec2d0bb..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/white.rsi/equipped-FEET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/white.rsi/icon.png b/Resources/Textures/Clothing/Shoes/white.rsi/icon.png
deleted file mode 100644
index ac14852457..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/white.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/white.rsi/inhand-left.png
deleted file mode 100644
index 96d495a7de..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/white.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/white.rsi/inhand-right.png
deleted file mode 100644
index ac47f894bb..0000000000
Binary files a/Resources/Textures/Clothing/Shoes/white.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Shoes/white.rsi/meta.json b/Resources/Textures/Clothing/Shoes/white.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/white.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/wizard.rsi/meta.json b/Resources/Textures/Clothing/Shoes/wizard.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/wizard.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/workboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/workboots.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/workboots.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/yellow.rsi/meta.json b/Resources/Textures/Clothing/Shoes/yellow.rsi/meta.json
deleted file mode 100644
index 21a93ec435..0000000000
--- a/Resources/Textures/Clothing/Shoes/yellow.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Shoes/beesocks.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Under/Socks/bee.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/beesocks.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Under/Socks/bee.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/beesocks.rsi/icon.png b/Resources/Textures/Clothing/Under/Socks/bee.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/beesocks.rsi/icon.png
rename to Resources/Textures/Clothing/Under/Socks/bee.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/beesocks.rsi/meta.json b/Resources/Textures/Clothing/Under/Socks/bee.rsi/meta.json
similarity index 56%
rename from Resources/Textures/Clothing/Shoes/beesocks.rsi/meta.json
rename to Resources/Textures/Clothing/Under/Socks/bee.rsi/meta.json
index 9135c12b9b..37b5dad294 100644
--- a/Resources/Textures/Clothing/Shoes/beesocks.rsi/meta.json
+++ b/Resources/Textures/Clothing/Under/Socks/bee.rsi/meta.json
@@ -1,24 +1,19 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-FEET",
"directions": 4
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
}
]
}
diff --git a/Resources/Textures/Clothing/Shoes/codersocks.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Under/Socks/coder.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/codersocks.rsi/equipped-FEET.png
rename to Resources/Textures/Clothing/Under/Socks/coder.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/codersocks.rsi/icon.png b/Resources/Textures/Clothing/Under/Socks/coder.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/codersocks.rsi/icon.png
rename to Resources/Textures/Clothing/Under/Socks/coder.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/codersocks.rsi/meta.json b/Resources/Textures/Clothing/Under/Socks/coder.rsi/meta.json
similarity index 56%
rename from Resources/Textures/Clothing/Shoes/codersocks.rsi/meta.json
rename to Resources/Textures/Clothing/Under/Socks/coder.rsi/meta.json
index 9135c12b9b..37b5dad294 100644
--- a/Resources/Textures/Clothing/Shoes/codersocks.rsi/meta.json
+++ b/Resources/Textures/Clothing/Under/Socks/coder.rsi/meta.json
@@ -1,24 +1,19 @@
{
"version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
"states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
{
"name": "equipped-FEET",
"directions": 4
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
}
]
}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/black_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/black_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/black_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/black_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/black-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/black-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/black-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/black-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/black.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/blue_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/blue_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/blue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/brown_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/brown_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/brown_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/brown_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/brown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkblue_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkblue_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/green-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/green-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/green-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/green-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/green_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/green_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/green_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/green_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-left.png
new file mode 100644
index 0000000000..5456486c25
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-right.png
new file mode 100644
index 0000000000..23855a8759
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/green.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/grey_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/grey_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/grey_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/grey_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/grey-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/grey-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/grey-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/grey-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-left.png
new file mode 100644
index 0000000000..d316b0400e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-right.png
new file mode 100644
index 0000000000..6523d6ef6d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/maroon_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/maroon_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/maroon.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/orange_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/orange_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/orange.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/pink_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/pink_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/pink.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/red_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/red_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/red_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/red_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/red-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/red-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/red-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/red-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/red.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/teal_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/teal_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/teal.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/white_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/white_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/white_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/white_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/white-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/white-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/white-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/white-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/white.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/yellow_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/yellow_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/yellow.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/bartender.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/chaplain_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective-inhand-left hand.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective-inhand-left hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective-inhand-right hand.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective-inhand-right hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png
new file mode 100644
index 0000000000..aed8b4f025
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png
new file mode 100644
index 0000000000..fd6f60eabb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left hand.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right hand.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_fem-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_fem-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_fem.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_fem.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ddf7ba69f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/inhand-right.png
new file mode 100644
index 0000000000..63de853068
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janitor.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/prisoner.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png
new file mode 100644
index 0000000000..21b03dcf0e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png
new file mode 100644
index 0000000000..dd794e37b0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ddf7ba69f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
new file mode 100644
index 0000000000..63de853068
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden_skirt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden_skirt.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden_skirt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ddf7ba69f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
new file mode 100644
index 0000000000..63de853068
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/black-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/black-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/black.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/black.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-left.png
new file mode 100644
index 0000000000..8ca0193cb1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-right.png
new file mode 100644
index 0000000000..f2a18bc4eb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/blue-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/blue.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-left.png
new file mode 100644
index 0000000000..6aad457526
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-right.png
new file mode 100644
index 0000000000..b185b62396
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/brown-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/brown-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/brown.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/brown.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-left.png
new file mode 100644
index 0000000000..d316b0400e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-right.png
new file mode 100644
index 0000000000..6523d6ef6d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkblue.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-left.png
new file mode 100644
index 0000000000..ea01f616e4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-right.png
new file mode 100644
index 0000000000..2ef7181ab0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-left.png
new file mode 100644
index 0000000000..5456486c25
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-right.png
new file mode 100644
index 0000000000..23855a8759
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/green-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/green-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/green.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/green.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-left.png
new file mode 100644
index 0000000000..5456486c25
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-right.png
new file mode 100644
index 0000000000..23855a8759
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/grey-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/grey-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/grey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/grey.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-left.png
new file mode 100644
index 0000000000..ae15d262d7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-right.png
new file mode 100644
index 0000000000..60bea1b51a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/grey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-left.png
new file mode 100644
index 0000000000..d316b0400e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-right.png
new file mode 100644
index 0000000000..6523d6ef6d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-left.png
new file mode 100644
index 0000000000..46be5288e6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-right.png
new file mode 100644
index 0000000000..f1911c7ec0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/maroon-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/maroon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-left.png
new file mode 100644
index 0000000000..a703128c96
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-right.png
new file mode 100644
index 0000000000..8c73e1c7ce
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/orange-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/orange.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-left.png
new file mode 100644
index 0000000000..5e5c42697c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-right.png
new file mode 100644
index 0000000000..fee1dd85cd
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/pink-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/pink.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-left.png
new file mode 100644
index 0000000000..9112f9b980
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-right.png
new file mode 100644
index 0000000000..d3df7bcb6b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/red-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/red-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/red.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/red.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-left.png
new file mode 100644
index 0000000000..4cd9c955ae
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-right.png
new file mode 100644
index 0000000000..ae5a124c66
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/teal-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/teal.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-left.png
new file mode 100644
index 0000000000..748bfb2e97
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-right.png
new file mode 100644
index 0000000000..4944e6fc0b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/white-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/white-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/white.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/white.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-left.png
new file mode 100644
index 0000000000..592cd94079
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-right.png
new file mode 100644
index 0000000000..3d3dd56f27
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/yellow-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/yellow.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-left.png
new file mode 100644
index 0000000000..6959537bce
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-right.png
new file mode 100644
index 0000000000..148b981232
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-left.png
new file mode 100644
index 0000000000..f367313cf9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-right.png
new file mode 100644
index 0000000000..33aac693c4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/purple-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/purple-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/purple.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/purple.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json
new file mode 100644
index 0000000000..6a86edc4ec
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/captain.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/captain.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png
new file mode 100644
index 0000000000..72b63752d1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png
new file mode 100644
index 0000000000..0cc45fa47a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/gy_suit-inhand-left hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/gy_suit-inhand-left hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/gy_suit-inhand-right hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/gy_suit-inhand-right hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
new file mode 100644
index 0000000000..ade35e41ad
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "s",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "s-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/s-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/s-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/s.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/color.rsi/s.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png
new file mode 100644
index 0000000000..3520c2732a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png
new file mode 100644
index 0000000000..2c8df85d4d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-left.png
new file mode 100644
index 0000000000..84e5e83e3f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-right.png
new file mode 100644
index 0000000000..69ad696a10
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png
new file mode 100644
index 0000000000..aed8b4f025
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png
new file mode 100644
index 0000000000..fd6f60eabb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png
new file mode 100644
index 0000000000..aed8b4f025
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png
new file mode 100644
index 0000000000..fd6f60eabb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/inhand-left.png
new file mode 100644
index 0000000000..cf69e2e3cb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/inhand-right.png
new file mode 100644
index 0000000000..2ff1950af2
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/inhand-left.png
new file mode 100644
index 0000000000..30d9857df4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/inhand-right.png
new file mode 100644
index 0000000000..3e674560d9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ddf7ba69f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
new file mode 100644
index 0000000000..63de853068
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png
new file mode 100644
index 0000000000..2e4a7103ae
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png
new file mode 100644
index 0000000000..8d34f3244e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosblueclothes-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosblueclothes-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosblueclothes.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosblueclothes.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/gy_suit-inhand-left hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/gy_suit-inhand-left hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/gy_suit-inhand-right hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/gy_suit-inhand-right hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_grey-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_grey-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_grey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_grey.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/gy_suit-inhand-left hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/gy_suit-inhand-left hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/gy_suit-inhand-right hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/gy_suit-inhand-right hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_male-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_male-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_male.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_parade_male.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ddf7ba69f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/inhand-right.png
new file mode 100644
index 0000000000..63de853068
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png
new file mode 100644
index 0000000000..dccc69e247
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png
new file mode 100644
index 0000000000..7b999ae252
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/inhand-left.png
new file mode 100644
index 0000000000..333d7bae8d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/inhand-right.png
new file mode 100644
index 0000000000..5db9b849d4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_md.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png
new file mode 100644
index 0000000000..59518c35c3
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png
new file mode 100644
index 0000000000..fa96803d56
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png
new file mode 100644
index 0000000000..0e02959652
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png
new file mode 100644
index 0000000000..cfbe848c3b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-left.png
new file mode 100644
index 0000000000..72b63752d1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-right.png
new file mode 100644
index 0000000000..0cc45fa47a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/rainbow.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/rainbow.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/rainbow.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
new file mode 100644
index 0000000000..18ff64cc68
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC BY-NC-SA 3.0",
+ "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png
new file mode 100644
index 0000000000..21b03dcf0e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png
new file mode 100644
index 0000000000..dd794e37b0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png
new file mode 100644
index 0000000000..4ddf7ba69f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
new file mode 100644
index 0000000000..63de853068
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/blueshift-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/blueshift-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/blueshift.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/blueshift.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png
new file mode 100644
index 0000000000..6fa516dbc5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png
new file mode 100644
index 0000000000..f985a97ca6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/security_grey-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/security_grey-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/security_grey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/security_grey.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png
new file mode 100644
index 0000000000..6fa516dbc5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png
new file mode 100644
index 0000000000..f985a97ca6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden-inhand-left hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden-inhand-left hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden-inhand-right hand.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden-inhand-right hand.png
rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
new file mode 100644
index 0000000000..d01e147030
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue.png b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue.png
rename to Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json
new file mode 100644
index 0000000000..6a86edc4ec
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen.png b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen.png
rename to Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json
new file mode 100644
index 0000000000..6a86edc4ec
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple-equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple.png b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple.png
rename to Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json
new file mode 100644
index 0000000000..6a86edc4ec
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/barman_d.png b/Resources/Textures/Clothing/Uniforms/bartender.rsi/barman_d.png
deleted file mode 100644
index e212d1d187..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/bartender.rsi/barman_d.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json
deleted file mode 100644
index 678d053575..0000000000
--- a/Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "barman_d",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "purple-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "purple",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/black_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/black_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index cc8f74522b..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/black_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/blue_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index bf42949bc4..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/blue_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/brown_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/brown_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 1f9d3647e2..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/brown_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 6ee335b4a2..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 77714d7b10..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/darkgreen_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/green_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/green_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 7c62e77f04..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/green_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/grey_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/grey_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 4b7e132a22..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/grey_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index ea9836b2d1..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/lightbrown_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 50d834c760..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/maroon_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index f7b3cb586f..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json
deleted file mode 100644
index b8827ee3b1..0000000000
--- a/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json
+++ /dev/null
@@ -1,1721 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32,
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d836946e8e85910eaa4d132f70e21bdb9888c171",
- "states": [
- {
- "name": "black-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "black_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "black_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "blue-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "blue_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "blue_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "brown-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "brown_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "brown_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkblue-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkblue_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkblue_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkgreen-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkgreen_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkgreen_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "green-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "green_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "green_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "grey-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "grey_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "grey_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightbrown-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightbrown_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightbrown_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightpurple-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightpurple_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightpurple_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "maroon-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "maroon_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "maroon_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "orange-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "orange_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "orange_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "pink-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "pink_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "pink_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "red-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "red-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "s-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "red_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "red_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "teal-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "teal_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "teal_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "white-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "white_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "white_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "yellow-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "yellow_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "yellow_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "black",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "black-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "black-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "black_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "blue",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "blue-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "blue-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "blue_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "brown",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "brown_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "darkblue",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "darkblue_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "darkgreen",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "darkgreen_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "green",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "green-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "green-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "green_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "grey",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "grey-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "grey-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "grey_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "s",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "lightbrown",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "lightbrown-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightbrown-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightbrown_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "lightpurple",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "lightpurple_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "maroon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "maroon_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "orange",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "orange-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "orange-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkblue-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "darkblue-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightpurple-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "lightpurple-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "maroon-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "maroon-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "teal-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "teal-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "pink-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "pink-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "orange_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "pink",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "pink_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "random_jumpsuit",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "red",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "red-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "red-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "red_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "teal",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "teal_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "white",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "white-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "white-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "white_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "yellow",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "yellow-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "yellow-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "yellow_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/orange_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 9254c1e490..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/orange_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/pink_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 47e2231212..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/pink_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/random_jumpsuit.png b/Resources/Textures/Clothing/Uniforms/color.rsi/random_jumpsuit.png
deleted file mode 100644
index c53149ebff..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/random_jumpsuit.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/red_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/red_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 1ed574b6b0..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/red_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/teal_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 6bf43e9b43..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/teal_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/white_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/white_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index a22386258a..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/white_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/yellow_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 123625421b..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json
deleted file mode 100644
index 082376bd38..0000000000
--- a/Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32,
- },
- "license": "CC BY-NC-SA 3.0",
- "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/assistant.png b/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/assistant.png
deleted file mode 100644
index 862996b369..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/assistant.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 7d3972342b..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/meta.json
deleted file mode 100644
index 3407454e75..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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/Uniforms/uniform_captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/meta.json
deleted file mode 100644
index dd23dd26be..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/meta.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "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": "captain",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargotech.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargotech.png
deleted file mode 100644
index d4e48f65e4..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargotech.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json
deleted file mode 100644
index 9b69da180b..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "cargo_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "qm",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "qm_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "cargo_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "qm-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "qm_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/ce.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/ce.png
deleted file mode 100644
index e2c37a0c2c..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/ce.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json
deleted file mode 100644
index e2362cc36b..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "chief_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "chief_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/meta.json
deleted file mode 100644
index b303e0d2b2..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation/commit/f2a314f575fd3ed9c6abf3b2cada6ebf5a8c1a4b",
- "states": [
- {
- "name": "chaplain_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 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
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "chaplain_skirt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef.png
deleted file mode 100644
index cb5599f81c..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json
deleted file mode 100644
index fb7b2822a0..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "chef_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "chef_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/meta.json
deleted file mode 100644
index 16408ad188..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "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]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo.png
deleted file mode 100644
index 5b695db74e..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json
deleted file mode 100644
index 8008dfed9e..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "cmo_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "cmo_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 9113e935ef..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/detective_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 20f55b5fd4..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/greydetective_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/meta.json
deleted file mode 100644
index 3217cabb9e..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_detective.rsi/meta.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit c323b1ed63e7a9c33f48abcdf24f11e30e136aa0",
- "states": [
- {
- "name": "detective",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "detective-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "detective-inhand-left hand",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "detective-inhand-right hand",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "detective_skirt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "greydetective",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "greydetective_skirt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "detective_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "detective_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "greydetective-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "greydetective_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "greydetective_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine.png
deleted file mode 100644
index 0d76f810b5..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json
deleted file mode 100644
index aaba98511e..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "engine_skirt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "engine_skirt-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/Uniforms/uniform_hop.rsi/hop.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop.png
deleted file mode 100644
index f65a93f00d..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json
deleted file mode 100644
index be5ce7a876..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "hop_skirt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "hop_skirt-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/Uniforms/uniform_hos.rsi/hos.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos.png
deleted file mode 100644
index 7678371aa9..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_grey_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_grey_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 1e92088d4e..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_grey_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosblueclothes_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosblueclothes_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index b69f5c343a..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosblueclothes_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hostanclothes-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hostanclothes-equipped-INNERCLOTHING.png
deleted file mode 100644
index e4ed047364..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hostanclothes-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hostanclothes.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hostanclothes.png
deleted file mode 100644
index 0f2fc79504..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hostanclothes.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json
deleted file mode 100644
index 00c21521b3..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json
+++ /dev/null
@@ -1,398 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet and https://github.com/tgstation/tgstation/ at commit c323b1ed63e7a9c33f48abcdf24f11e30e136aa0",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "gy_suit-inhand-left hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "gy_suit-inhand-right hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_grey-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_parade_fem-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_parade_fem",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_parade_male-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_parade_male",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_grey",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_grey_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hosalt_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hosalt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hosalt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hosalt_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hos_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hosblueclothes-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hosblueclothes",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hosblueclothes_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hostanclothes-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hostanclothes",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hosalt-inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hosalt-inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/meta.json
deleted file mode 100644
index 555ae48c20..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "hydro_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "hydro_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/janitor.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/janitor.png
deleted file mode 100644
index 1a0adb6f1a..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/janitor.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json
deleted file mode 100644
index 6bd9062f51..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "jan_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "jan_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/md.png b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/md.png
deleted file mode 100644
index c36a4c0f4c..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/md.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/meta.json
deleted file mode 100644
index 0d5dff48cc..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "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": "md", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 2fa90b99bb..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/meta.json
deleted file mode 100644
index a62ae14bbf..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/meta.json
+++ /dev/null
@@ -1,290 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "chemistry-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "chemistry_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "medical_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "paramedic-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "paramedic_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "scrubsblue-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "scrubspurple-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "scrubsgreen-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "medical_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "paramedic",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "paramedic_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "scrubsblue",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "scrubsgreen",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "scrubspurple",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "chemistry",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "chemistry_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json
deleted file mode 100644
index 6894f1aacb..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/tgstation/",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "mime_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "mime_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/meta.json
deleted file mode 100644
index bca2534a2b..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "prisoner_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "prisoner_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index f79a26ee35..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/meta.json
deleted file mode 100644
index 8b00954d33..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "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": "rd", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/rd.png b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/rd.png
deleted file mode 100644
index f9e01cbda0..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/rd.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/meta.json
deleted file mode 100644
index 34220d134e..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "rnd_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "rnd_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json
deleted file mode 100644
index a76ba8c5e5..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation",
- "states": [
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sci_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "sci_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/scientist.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/scientist.png
deleted file mode 100644
index 56b47c78d7..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/scientist.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/constable-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/constable-equipped-INNERCLOTHING.png
deleted file mode 100644
index 5488bd9393..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/constable-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/constable.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/constable.png
deleted file mode 100644
index d7fe7e2092..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/constable.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json
deleted file mode 100644
index 8407f7c36c..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json
+++ /dev/null
@@ -1,344 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation at commit c323b1ed63e7a9c33f48abcdf24f11e30e136aa0",
- "states": [
- {
- "name": "blueshift",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "blueshift-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "constable",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "constable-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "sec_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "gy_suit-inhand-left hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "gy_suit-inhand-right hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "icon",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "sec_skirt",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-left hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "inhand-right hand",
- "directions": 4,
- "delays": [
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ],
- [
- 1
- ]
- ]
- },
- {
- "name": "officerblueclothes-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "officerblueclothes",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "officerblueclothes_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "officertanclothes-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "officertanclothes",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "security_grey-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "security_grey",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "spacepol-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "spacepol",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- },
- {
- "name": "spacepolice_families-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "spacepolice_families",
- "directions": 1,
- "delays": [
- [
- 1
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes-equipped-INNERCLOTHING.png
deleted file mode 100644
index 61ad400a90..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes.png
deleted file mode 100644
index 8c04be8e0d..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 3d273e2eb5..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officerblueclothes_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officertanclothes-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officertanclothes-equipped-INNERCLOTHING.png
deleted file mode 100644
index 39b30e9200..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officertanclothes-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officertanclothes.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officertanclothes.png
deleted file mode 100644
index c6affba968..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/officertanclothes.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepol-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepol-equipped-INNERCLOTHING.png
deleted file mode 100644
index af60ebe9a2..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepol-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepol.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepol.png
deleted file mode 100644
index 0ff4286557..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepol.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepolice_families-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepolice_families-equipped-INNERCLOTHING.png
deleted file mode 100644
index 9315110ef4..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepolice_families-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepolice_families.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepolice_families.png
deleted file mode 100644
index 3634611975..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/spacepolice_families.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/meta.json
deleted file mode 100644
index e2477ddfb9..0000000000
--- a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/meta.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit c323b1ed63e7a9c33f48abcdf24f11e30e136aa0",
- "states": [
- {
- "name": "gy_suit-inhand-left hand",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "gy_suit-inhand-right hand",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "rwarden-inhand-left hand",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "rwarden-inhand-right hand",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "rwarden",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "rwarden-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "rwarden_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "rwarden_skirt",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "rwarden_skirt-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "warden",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "warden-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "warden_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "wardenblueclothes",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "wardenblueclothes-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "wardenblueclothes_d-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- },
- {
- "name": "wardentanclothes",
- "directions": 1,
- "delays": [
- [
- 1.0
- ]
- ]
- },
- {
- "name": "wardentanclothes-equipped-INNERCLOTHING",
- "directions": 4,
- "delays": [
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ],
- [
- 1.0
- ]
- ]
- }
- ]
-}
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 9c5741990b..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/rwarden_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden-equipped-INNERCLOTHING.png
deleted file mode 100644
index f8b486bf99..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden.png
deleted file mode 100644
index 2fdfd6caf9..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index 4e04315ad6..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/warden_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes-equipped-INNERCLOTHING.png
deleted file mode 100644
index 045e72f309..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes.png
deleted file mode 100644
index 5d53f930da..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes_d-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes_d-equipped-INNERCLOTHING.png
deleted file mode 100644
index fb93ba7dfb..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardenblueclothes_d-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardentanclothes-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardentanclothes-equipped-INNERCLOTHING.png
deleted file mode 100644
index 8fcfa9c8db..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardentanclothes-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardentanclothes.png b/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardentanclothes.png
deleted file mode 100644
index e54b5f4eae..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/uniform_warden.rsi/wardentanclothes.png and /dev/null differ
diff --git a/RobustToolbox b/RobustToolbox
index add186ea8b..2944154bab 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit add186ea8b79c753c8c09dca2fd7d1f2a68be657
+Subproject commit 2944154babe40cfd3a7a3fa6e25401a2e1024f8f