From: themias <89101928+themias@users.noreply.github.com>
Date: Sat, 10 Feb 2024 08:44:19 +0000 (-0500)
Subject: Flipped caps real (#24961)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f7a3ea6dcfb0f43b136cef74ea7115bec63cbfd3;p=space-station-14.git

Flipped caps real (#24961)

* Flipped caps real

* oops

* whoops

* flip not fold

* fix formatting

* cargosoft formatting
---

diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 61237b2283..1a40d1dca1 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -17,4 +17,17 @@ public sealed partial class FoldableClothingComponent : Component
     /// </summary>
     [DataField]
     public SlotFlags? UnfoldedSlots;
+
+
+    /// <summary>
+    /// What equipped prefix does this have while in folded form?
+    /// </summary>
+    [DataField]
+    public string? FoldedEquippedPrefix;
+
+    /// <summary>
+    /// What held prefix does this have while in folded form?
+    /// </summary>
+    [DataField]
+    public string? FoldedHeldPrefix;
 }
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index d0611c5851..27ea168018 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Foldable;
 using Content.Shared.Inventory;
+using Content.Shared.Item;
 
 namespace Content.Shared.Clothing.EntitySystems;
 
@@ -8,6 +9,7 @@ public sealed class FoldableClothingSystem : EntitySystem
 {
     [Dependency] private readonly ClothingSystem _clothingSystem = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
 
     public override void Initialize()
     {
@@ -31,12 +33,32 @@ public sealed class FoldableClothingSystem : EntitySystem
 
     private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent args)
     {
-        if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp))
+        if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp) &&
+            TryComp<ItemComponent>(ent.Owner, out var itemComp))
         {
-            if (args.IsFolded && ent.Comp.FoldedSlots.HasValue)
-                _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
-            else if (!args.IsFolded && ent.Comp.UnfoldedSlots.HasValue)
-                _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
+            if (args.IsFolded)
+            {
+                if (ent.Comp.FoldedSlots.HasValue)
+                    _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
+
+                if (ent.Comp.FoldedEquippedPrefix != null)
+                    _clothingSystem.SetEquippedPrefix(ent.Owner, ent.Comp.FoldedEquippedPrefix, clothingComp);
+
+                if (ent.Comp.FoldedHeldPrefix != null)
+                    _itemSystem.SetHeldPrefix(ent.Owner, ent.Comp.FoldedHeldPrefix, false, itemComp);
+            }
+            else
+            {
+                if (ent.Comp.UnfoldedSlots.HasValue)
+                    _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
+
+                if (ent.Comp.FoldedEquippedPrefix != null)
+                    _clothingSystem.SetEquippedPrefix(ent.Owner, null, clothingComp);
+
+                if (ent.Comp.FoldedHeldPrefix != null)
+                    _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
+
+            }
         }
     }
 }
diff --git a/Content.Shared/Foldable/FoldableComponent.cs b/Content.Shared/Foldable/FoldableComponent.cs
index c22095f3f2..74f6a20913 100644
--- a/Content.Shared/Foldable/FoldableComponent.cs
+++ b/Content.Shared/Foldable/FoldableComponent.cs
@@ -17,4 +17,10 @@ public sealed partial class FoldableComponent : Component
 
     [DataField]
     public bool CanFoldInsideContainer = false;
+
+    [DataField]
+    public LocId UnfoldVerbText = "unfold-verb";
+
+    [DataField]
+    public LocId FoldVerbText = "fold-verb";
 }
diff --git a/Content.Shared/Foldable/FoldableSystem.cs b/Content.Shared/Foldable/FoldableSystem.cs
index 374aba44c5..10baf8165b 100644
--- a/Content.Shared/Foldable/FoldableSystem.cs
+++ b/Content.Shared/Foldable/FoldableSystem.cs
@@ -134,7 +134,7 @@ public sealed class FoldableSystem : EntitySystem
         AlternativeVerb verb = new()
         {
             Act = () => TryToggleFold(uid, component),
-            Text = component.IsFolded ? Loc.GetString("unfold-verb") : Loc.GetString("fold-verb"),
+            Text = component.IsFolded ? Loc.GetString(component.UnfoldVerbText) : Loc.GetString(component.FoldVerbText),
             Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/fold.svg.192dpi.png")),
 
             // If the object is unfolded and they click it, they want to fold it, if it's folded, they want to pick it up
diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
index d3e4ecefb5..539b4fd9e7 100644
--- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl
+++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -3,3 +3,5 @@
 foldable-deploy-fail = You can't deploy the {$object} here.
 fold-verb = Fold
 unfold-verb = Unfold
+
+fold-flip-verb = Flip
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index 50be724c41..d063b8e853 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -1,5 +1,47 @@
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadBaseButcherable, BaseFoldable]
+  id: ClothingHeadHeadHatBaseFlippable
+  abstract: true
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-flip-verb
+    foldVerbText: fold-flip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: false
+      
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
+  id: ClothingHeadHeadHatBaseFlipped
+  suffix: flipped
+  abstract: true
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: flipped
+  - type: Item
+    heldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: true
+
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBluesoft
   name: blue cap
   description: "It's a baseball hat in a tasteless blue colour."
@@ -10,18 +52,12 @@
     sprite: Clothing/Head/Soft/bluesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBluesoft]
   id: ClothingHeadHatBluesoftFlipped
-  name: blue cap 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
+  name: blue cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCargosoft
   name: cargo cap
   description: "It's a baseball hat painted in Cargo colours."
@@ -37,18 +73,18 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft]
   id: ClothingHeadHatCargosoftFlipped
-  name: cargo cap flipped
-  description: "It's a baseball hat painted in Cargo colours. Flipped."
+  name: cargo cap
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatQMsoft
   name: quartermaster's cap
   description: "It's a baseball hat painted in the Quartermaster's colors."
@@ -59,18 +95,12 @@
     sprite: Clothing/Head/Soft/qmsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft]
   id: ClothingHeadHatQMsoftFlipped
-  name: quartermaster's cap flipped
-  description: "It's a baseball hat painted in the Quartermaster's colors. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
+  name: quartermaster's cap
     
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCorpsoft
   name: corporate cap
   description: A baseball bat in corporation colors.
@@ -81,18 +111,12 @@
     sprite: Clothing/Head/Soft/corpsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCorpsoft]
   id: ClothingHeadHatCorpsoftFlipped
-  name: corporate cap 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
+  name: corporate cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreensoft
   name: green cap
   description: "It's a baseball hat in a tasteless green colour."
@@ -103,18 +127,12 @@
     sprite: Clothing/Head/Soft/greensoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreensoft]
   id: ClothingHeadHatGreensoftFlipped
-  name: green cap 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
+  name: green cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBlacksoft
   name: black cap
   description: "It's a baseball hat in a tasteless black colour."
@@ -125,18 +143,12 @@
     sprite: Clothing/Head/Soft/blacksoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBlacksoft]
   id: ClothingHeadHatBlacksoftFlipped
-  name: black cap flipped
-  description: "It's a baseball hat in a tasteless black colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
+  name: black cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreysoft
   name: grey cap
   description: "It's a baseball hat in a tasteless grey colour."
@@ -147,18 +159,12 @@
     sprite: Clothing/Head/Soft/greysoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreysoft]
   id: ClothingHeadHatGreysoftFlipped
-  name: grey cap 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
+  name: grey cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatMimesoft
   name: mime cap
   description: "It's a baseball hat in a tasteless white colour."
@@ -169,18 +175,12 @@
     sprite: Clothing/Head/Soft/mimesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft]
   id: ClothingHeadHatMimesoftFlipped
-  name: mime cap 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
+  name: mime cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatOrangesoft
   name: orange cap
   description: It's a baseball hat in a good-looking orange colour.
@@ -191,18 +191,12 @@
     sprite: Clothing/Head/Soft/orangesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatOrangesoft]
   id: ClothingHeadHatOrangesoftFlipped
-  name: orange cap 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
+  name: orange cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatPurplesoft
   name: purple cap
   description: It's a baseball hat in a tasteless purple colour.
@@ -218,18 +212,18 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatPurplesoft]
   id: ClothingHeadHatPurplesoftFlipped
-  name: purple cap flipped
-  description: It's a baseball hat in a tasteless purple colour. Flipped.
+  name: purple cap
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatRedsoft
   name: red cap
   description: It's a baseball hat in a tasteless red colour.
@@ -240,18 +234,12 @@
     sprite: Clothing/Head/Soft/redsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatRedsoft]
   id: ClothingHeadHatRedsoftFlipped
-  name: red cap 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
+  name: red cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatSecsoft
   name: security cap
   description: It's a robust baseball hat in tasteful red colour.
@@ -262,18 +250,12 @@
     sprite: Clothing/Head/Soft/secsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatSecsoft]
   id: ClothingHeadHatSecsoftFlipped
-  name: security cap 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
+  name: security cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatYellowsoft
   name: yellow cap
   description: A yellow baseball hat.
@@ -284,20 +266,14 @@
     sprite: Clothing/Head/Soft/yellowsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatYellowsoft]
   id: ClothingHeadHatYellowsoftFlipped
-  name: yellow cap 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
+  name: yellow cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBizarreSoft
-  name: troublemaker's soft
+  name: troublemaker's cap
   description: A truly.. bizarre accessory.
   components:
   - type: Sprite
@@ -306,18 +282,12 @@
     sprite: Clothing/Head/Soft/bizarresoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft]
   id: ClothingHeadHatBizarreSoftFlipped
-  name: troublemaker's soft flipped
-  description: A truly.. bizarre accessory, flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
+  name: troublemaker's cap
     
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatParamedicsoft
   name: paramedic cap
   description: "It's a paramedic's baseball hat with a medical logo."
@@ -333,12 +303,12 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatParamedicsoft]
   id: ClothingHeadHatParamedicsoftFlipped
-  name: paramedic cap flipped
-  description: "It's a paramedic's baseball hat with a medical logo. Flipped."
+  name: paramedic cap
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
index b3513bb5cd..adf7e7620a 100644
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
deleted file mode 100644
index b3513bb5cd..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from civstation at commit https://github.com/Civ13/Civ13/commit/ec52cbb95d59b717d4d8c480b35ac133e5b58088#diff-fba188fb2db5d16e5d41985147336a8f96085f761b903e016fffd869b63e497d",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..f5372ea5a3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
index 83a38bf11b..81d3b938b9 100644
--- a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
deleted file mode 100644
index 86b28c561a..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, repaletted for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png
index 79b4d66da0..2f7a32ae93 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..5a4e035e63
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
index 2b73b340e6..b60639b265 100644
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
deleted file mode 100644
index 8089773135..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by MagnusCrowe (Github) for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..140bf71b78
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
index ade65863af..3fb7add363 100644
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}