diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
index 5c5f2fd230..70c04e49e8 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
+++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
@@ -496,7 +496,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
             }
 
             //Play reaction sound client-side
-            _audioSystem.PlayAtCoords("/Audio/Effects/chemistry/bubbles.ogg", Owner.Transform.GridPosition);
+            _audioSystem.PlayAtCoords("/Audio/Effects/Chemistry/bubbles.ogg", Owner.Transform.GridPosition);
         }
 
         /// <summary>
diff --git a/Content.Server/GameObjects/Components/Items/RCDComponent.cs b/Content.Server/GameObjects/Components/Items/RCDComponent.cs
index 3eb7d40fe8..a126e6adff 100644
--- a/Content.Server/GameObjects/Components/Items/RCDComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/RCDComponent.cs
@@ -67,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Items
 
         public void SwapMode(UseEntityEventArgs eventArgs)
         {
-            _entitySystemManager.GetEntitySystem<AudioSystem>().PlayFromEntity("/Audio/items/genhit.ogg", Owner);
+            _entitySystemManager.GetEntitySystem<AudioSystem>().PlayFromEntity("/Audio/Items/genhit.ogg", Owner);
             int mode = (int) this._mode; //Firstly, cast our RCDmode mode to an int (enums are backed by ints anyway by default)
             mode = (++mode) % _modes.Length; //Then, do a rollover on the value so it doesnt hit an invalid state
             this._mode = (RcdMode) mode; //Finally, cast the newly acquired int mode to an RCDmode so we can use it.
@@ -130,7 +130,7 @@ namespace Content.Server.GameObjects.Components.Items
                     var snapPos = mapGrid.SnapGridCellFor(eventArgs.ClickLocation, SnapGridOffset.Center);
                     var ent = _serverEntityManager.SpawnEntity("solid_wall", mapGrid.GridTileToLocal(snapPos));
                     ent.Transform.LocalRotation = Owner.Transform.LocalRotation; //Now apply icon smoothing.
-                    _entitySystemManager.GetEntitySystem<AudioSystem>().PlayFromEntity("/Audio/items/deconstruct.ogg", Owner);
+                    _entitySystemManager.GetEntitySystem<AudioSystem>().PlayFromEntity("/Audio/Items/deconstruct.ogg", Owner);
                     _ammo--;
                     return; //Alright we're done here
                 default:
@@ -142,7 +142,7 @@ namespace Content.Server.GameObjects.Components.Items
             if (canPlaceTile) //If desiredTile is null by this point, something has gone horribly wrong and you need to fix it.
             {
                 mapGrid.SetTile(eventArgs.ClickLocation, new Tile(desiredTile.TileId));
-                _entitySystemManager.GetEntitySystem<AudioSystem>().PlayFromEntity("/Audio/items/deconstruct.ogg", Owner);
+                _entitySystemManager.GetEntitySystem<AudioSystem>().PlayFromEntity("/Audio/Items/deconstruct.ogg", Owner);
                 _ammo--;
             }
         }
diff --git a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs b/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs
index acf9a52fac..97172bfb7e 100644
--- a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs
+++ b/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs
@@ -14,7 +14,7 @@ namespace Content.Server.GameObjects.Components.Mining
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
-            serializer.DataField(ref MiningSound, "miningSound", "/Audio/Items/mining/pickaxe.ogg");
+            serializer.DataField(ref MiningSound, "miningSound", "/Audio/Items/Mining/pickaxe.ogg");
             serializer.DataField(ref MiningSpeedMultiplier, "miningSpeedMultiplier", 1f);
         }
     }
diff --git a/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml b/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml
index c1fb020f24..86a6df972f 100644
--- a/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml
+++ b/Resources/Prototypes/BodySystem/Mechanisms/basic_human_organs.yml
@@ -4,10 +4,10 @@
   name: "human heart (debug)"
   components:
   - type: Sprite
-    sprite: Objects/BodySystem/Organs/basic_human.rsi
+    sprite: Mobs/Parts/organs_human.rsi
     state: heart_human
   - type: Icon
-    sprite: Objects/BodySystem/Organs/basic_human.rsi
+    sprite: Mobs/Parts/organs_human.rsi
     state: heart_human
   - type: DroppedMechanism
     debugLoadMechanismData: mechanism.Heart.BasicHuman
diff --git a/Resources/Prototypes/Catalog/Fills/belt.yml b/Resources/Prototypes/Catalog/Fills/belt.yml
new file mode 100644
index 0000000000..80a0e508af
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/belt.yml
@@ -0,0 +1,6 @@
+- type: entity
+  id: UtilityBeltClothingFilled
+  parent: UtilityBeltClothing
+  suffix: Filled
+  components:
+  - type: UtilityBeltClothingFill
diff --git a/Resources/Prototypes/Catalog/Fills/crate.yml b/Resources/Prototypes/Catalog/Fills/crate.yml
new file mode 100644
index 0000000000..4ea8960674
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/crate.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: CrateFlashlights
+  parent: CrateGeneric
+  name: flashlight crate (x5)
+  components:
+  - type: StorageFill
+    contents:
+      - FlashlightLantern
+      - FlashlightLantern
+      - FlashlightLantern
+      - FlashlightLantern
+      - FlashlightLantern
+
+- type: entity
+  id: CrateLightBulb
+  parent: CrateGeneric
+  name: light bulb crate (x10)
+  components:
+  - type: StorageFill
+    contents:
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+      - LightBulb
+
+- type: entity
+  id: CrateFireExtinguisher
+  parent: CrateGeneric
+  name: fire extinguisher crate (x3)
+  components:
+  - type: StorageFill
+    contents:
+      - FireExtinguisher
+      - FireExtinguisher
+      - FireExtinguisher
+
+- type: entity
+  id: CratePen
+  parent: CrateGeneric
+  name: pen  crate (x10)
+  components:
+  - type: StorageFill
+    contents:
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+      - Pen
+
+- type: entity
+  id: CrateBikeHorn
+  parent: CrateGeneric
+  name: bike horn crate (x5)
+  components:
+  - type: StorageFill
+    contents:
+      - BikeHorn
+      - BikeHorn
+      - BikeHorn
+      - BikeHorn
+      - BikeHorn
+
+- type: entity
+  id: CrateCleaver
+  parent: CrateGeneric
+  name: cleaver crate (x5)
+  components:
+  - type: StorageFill
+    contents:
+      - ButchCleaver
+      - ButchCleaver
+      - ButchCleaver
+      - ButchCleaver
+      - ButchCleaver
+
+- type: entity
+  id: CrateFuelTank
+  parent: CrateGeneric
+  name: fuel tank
+  components:
+  - type: StorageFill
+    contents:
+      - WeldingFuelTank
+
+- type: entity
+  id: CrateMedicalScanner
+  parent: CrateGeneric
+  name: medical scanner
+  components:
+  - type: StorageFill
+    contents:
+      - MedicalScanner
+
+- type: entity
+  id: CrateGlass
+  parent: CrateGeneric
+  name: glass sheet crate (x50)
+  components:
+  - type: StorageFill
+    contents:
+      - GlassStack
+
+- type: entity
+  id: CrateCable
+  parent: CrateGeneric
+  name: cable coil crate (x50)
+  components:
+  - type: StorageFill
+    contents:
+      - CableStack
diff --git a/Resources/Prototypes/Catalog/Fills/lockers.yml b/Resources/Prototypes/Catalog/Fills/lockers.yml
new file mode 100644
index 0000000000..a805b806b1
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/lockers.yml
@@ -0,0 +1,291 @@
+- type: entity
+  id: LockerJanitor
+  parent: WardrobeMixed
+  name: "custodial closet"
+  description: "It's a storage unit for janitorial clothes and gear."
+  components:
+  - type: CustodialClosetFill
+
+- type: entity
+  id: LockerToolFilled
+  parent: LockerTool
+  suffix: Filled
+  components:
+  - type: ToolLockerFill
+
+- type: entity
+  id: LockerEmergencyFilledRandom
+  parent: LockerEmergency
+  suffix: Filled, Random
+  components:
+  - type: EmergencyClosetFill
+
+- type: entity
+  id: LockerBoozeFilled
+  suffix: Filled
+  parent: LockerBooze
+
+- type: entity
+  id: LockerQuarterMasterFilled
+  suffix: Filled
+  parent: LockerQuarterMaster
+
+- type: entity
+  id: LockerCaptainFilled
+  suffix: Filled
+  parent: LockerCaptain
+
+- type: entity
+  id: LockerHeadOfPersonnelFilled
+  suffix: Filled
+  parent: LockerHeadOfPersonnel
+
+- type: entity
+  id: LockerChiefEngineerFilled
+  suffix: Filled
+  parent: LockerChiefEngineer
+
+- type: entity
+  id: LockerElectricalSuppliesFilled
+  suffix: Filled
+  parent: LockerElectricalSupplies
+
+- type: entity
+  id: LockerWeldingSuppliesFilled
+  suffix: Filled
+  parent: LockerWeldingSupplies
+
+- type: entity
+  id: LockerAtmosphericsFilled
+  suffix: Filled
+  parent: LockerAtmospherics
+
+- type: entity
+  id: LockerEngineerFilled
+  suffix: Filled
+  parent: LockerEngineer
+
+- type: entity
+  id: LockerBotanistFilled
+  suffix: Filled
+  parent: LockerBotanist
+
+- type: entity
+  id: LockerMedicineFilled
+  suffix: Filled
+  parent: LockerMedicine
+
+- type: entity
+  id: LockerMedicalFilled
+  suffix: Filled
+  parent: LockerMedical
+
+- type: entity
+  id: LockerChemistryFilled
+  suffix: Filled
+  parent: LockerChemistry
+
+- type: entity
+  id: LockerChiefMedicalOfficerFilled
+  suffix: Filled
+  parent: LockerChiefMedicalOfficer
+
+- type: entity
+  id: LockerResearchDirectorFilled
+  suffix: Filled
+  parent: LockerResearchDirector
+
+- type: entity
+  id: LockerHeadOfSecurityFilled
+  suffix: Filled
+  parent: LockerHeadOfSecurity
+
+- type: entity
+  id: LockerWardenFilled
+  suffix: Filled
+  parent: LockerWarden
+
+- type: entity
+  id: LockerSecurityFilled
+  suffix: Filled
+  parent: LockerSecurity
+
+- type: entity
+  id: LockerFormalFilled
+  suffix: Filled
+  parent: LockerFormal
+
+- type: entity
+  id: LockerChefFilled
+  suffix: Filled
+  parent: LockerChef
+
+- type: entity
+  id: LockerJanitorFilled
+  suffix: Filled
+  parent: LockerJanitor
+
+- type: entity
+  id: LockerLegalFilled
+  suffix: Filled
+  parent: LockerLegal
+
+- type: entity
+  id: WardrobeChapelFilled
+  suffix: Filled
+  parent: WardrobeChapel
+
+- type: entity
+  id: WardrobeSecurityFilled
+  suffix: Filled
+  parent: WardrobeSecurity
+
+- type: entity
+  id: WardrobeCargoFilled
+  suffix: Filled
+  parent: WardrobeCargo
+
+- type: entity
+  id: WardrobeAtmosphericsFilled
+  suffix: Filled
+  parent: WardrobeAtmospherics
+
+- type: entity
+  id: WardrobeEngineeringFilled
+  suffix: Filled
+  parent: WardrobeEngineering
+
+- type: entity
+  id: WardrobeMedicalDoctorFilled
+  suffix: Filled
+  parent: WardrobeMedicalDoctor
+
+- type: entity
+  id: WardrobeRoboticsFilled
+  suffix: Filled
+  parent: WardrobeRobotics
+
+- type: entity
+  id: WardrobeChemistryFilled
+  suffix: Filled
+  parent: WardrobeChemistry
+
+- type: entity
+  id: WardrobeGeneticsFilled
+  suffix: Filled
+  parent: WardrobeGenetics
+
+- type: entity
+  id: WardrobeVirologyFilled
+  suffix: Filled
+  parent: WardrobeVirology
+
+- type: entity
+  id: WardrobeScienceFilled
+  suffix: Filled
+  parent: WardrobeScience
+
+- type: entity
+  id: WardrobeBotanistFilled
+  suffix: Filled
+  parent: WardrobeBotanist
+
+- type: entity
+  id: LockerL3Filled
+  suffix: Filled, Generic
+  parent: LockerL3
+
+- type: entity
+  id: LockerL3VirologyFilled
+  suffix: Filled, Virology
+  parent: LockerL3Virology
+
+- type: entity
+  id: LockerL3SecurityFilled
+  suffix: Filled, Security
+  parent: LockerL3Security
+
+- type: entity
+  id: LockerL3JanitorFilled
+  suffix: Filled, Janitor
+  parent: LockerL3Janitor
+
+- type: entity
+  id: LockerL3ScienceFilled
+  suffix: Filled, Science
+  parent: LockerL3Virology
+
+- type: entity
+  id: LockerSyndicatePersonalFilled
+  suffix: Filled
+  parent: LockerSyndicatePersonal
+
+- type: entity
+  id: LockerBombFilled
+  parent: LockerBomb
+  suffix: Filled
+
+- type: entity
+  id: LockerRadiationSuitFilled
+  parent: LockerRadiationSuit
+  suffix: Filled
+
+- type: entity
+  id: LockerFireFilled
+  parent: LockerFire
+  suffix: Filled
+
+- type: entity
+  id: WardrobePajama
+  parent: WardrobeWhite
+  name: pajama wardrobe
+
+- type: entity
+  id: WardrobeBlueFilled
+  suffix: Filled
+  parent: WardrobeBlue
+
+- type: entity
+  id: WardrobePinkFilled
+  suffix: Filled
+  parent: WardrobePink
+
+- type: entity
+  id: WardrobeBlackFilled
+  suffix: Filled
+  parent: WardrobeBlack
+
+- type: entity
+  id: WardrobeGreenFilled
+  suffix: Filled
+  parent: WardrobeGreen
+
+- type: entity
+  id: WardrobePrisonFilled
+  suffix: Filled
+  parent: WardrobePrison
+
+- type: entity
+  id: WardrobeYellowFilled
+  suffix: Filled
+  parent: WardrobeYellow
+
+- type: entity
+  id: WardrobeWhiteFilled
+  suffix: Filled
+  parent: WardrobeWhite
+
+- type: entity
+  id: WardrobePajamaFilled
+  suffix: Filled
+  parent: WardrobePajama
+
+- type: entity
+  id: WardrobeGreyFilled
+  suffix: Filled
+  parent: WardrobeGrey
+
+- type: entity
+  id: WardrobeMixedFilled
+  suffix: Filled
+  parent: WardrobeMixed
diff --git a/Resources/Prototypes/Catalog/Cargo/products.yml b/Resources/Prototypes/Catalog/cargo_products.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/Cargo/products.yml
rename to Resources/Prototypes/Catalog/cargo_products.yml
diff --git a/Resources/Prototypes/Catalog/Uplink/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/Uplink/uplink_catalog.yml
rename to Resources/Prototypes/Catalog/uplink_catalog.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml
deleted file mode 100644
index 0de263da73..0000000000
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/job_closests.yml
+++ /dev/null
@@ -1,217 +0,0 @@
-# Formal
-- type: entity
-  id: LockerFormal
-  parent: WardrobeBlack
-  name: "formal closet"
-  description: "It's a storage unit for formal clothing."
-
-# Chef
-- type: entity
-  id: LockerChef
-  parent: WardrobeBlack
-  name: "chef's closet"
-  description: "It's a storage unit for foodservice garments and mouse traps."
-
-# Janitor
-- type: entity
-  id: LockerJanitor
-  parent: WardrobeMixed
-  name: "custodial closet"
-  description: "It's a storage unit for janitorial clothes and gear."
-  components:
-  - type: CustodialClosetFill
-
-# Legal
-- type: entity
-  id: LockerLegal
-  parent: WardrobeBlue
-  name: "legal closet"
-  description: "It's a storage unit for courtroom apparel and items."
-
-# Chapel
-- type: entity
-  id: WardrobeChapel
-  parent: WardrobeBlack
-  name: "chaplain's wardrobe"
-  description: "It's a storage unit for Nanotrasen-approved religious attire."
-
-# Security wardrobe
-- type: entity
-  id: WardrobeSecurity
-  parent: WardrobeBase
-  name: "security wardrobe"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state: generic
-      state_closed: red_door
-
-  - type: Icon
-    state: red_door
-
-# Cargo wardrobe
-- type: entity
-  id: WardrobeCargo
-  parent: WardrobePrison
-  name: "cargo wardrobe"
-
-# Atmospherics wardrobe
-- type: entity
-  id: WardrobeAtmospherics
-  parent: WardrobeBase
-  name: "atmospherics wardrobe"
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state: generic
-      state_closed: atmos_wardrobe_door
-
-  - type: Icon
-    state: atmos_door
-
-# Engineering wardrobe
-- type: entity
-  id: WardrobeEngineering
-  parent: WardrobeYellow
-  name: "engineering wardrobe"
-
-# Medical doctor wardrobe
-- type: entity
-  id: WardrobeMedicalDoctor
-  parent: WardrobeWhite
-  name: "medical doctor's wardrobe"
-
-# Robotics wardrobe
-- type: entity
-  id: WardrobeRobotics
-  parent: WardrobeBlack
-  name: "robotics wardrobe"
-
-# Chemistry wardrobe
-- type: entity
-  id: WardrobeChemistry
-  parent: WardrobeWhite
-  name: "chemistry wardrobe"
-
-# Genetics wardrobe
-- type: entity
-  id: WardrobeGenetics
-  parent: WardrobeWhite
-  name: "genetics wardrobe"
-
-# Virology wardrobe
-- type: entity
-  id: WardrobeVirology
-  parent: WardrobeWhite
-  name: "virology wardrobe"
-
-# Science wardrobe
-- type: entity
-  id: WardrobeScience
-  parent: WardrobeWhite
-  name: "science wardrobe"
-
-# Botanist wardrobe
-- type: entity
-  id: WardrobeBotanist
-  parent: WardrobeGreen
-  name: "botanist wardrobe"
-
-
-# LockerFormal Filled
-- type: entity
-  id: LockerFormalFilled
-  suffix: Filled
-  parent: LockerFormal
-
-# LockerChef Filled
-- type: entity
-  id: LockerChefFilled
-  suffix: Filled
-  parent: LockerChef
-
-# LockerJanitor Filled
-- type: entity
-  id: LockerJanitorFilled
-  suffix: Filled
-  parent: LockerJanitor
-
-# LockerLegal Filled
-- type: entity
-  id: LockerLegalFilled
-  suffix: Filled
-  parent: LockerLegal
-
-# WardrobeChapel Filled
-- type: entity
-  id: WardrobeChapelFilled
-  suffix: Filled
-  parent: WardrobeChapel
-
-# WardrobeSecurity Filled
-- type: entity
-  id: WardrobeSecurityFilled
-  suffix: Filled
-  parent: WardrobeSecurity
-
-# WardrobeCargo Filled
-- type: entity
-  id: WardrobeCargoFilled
-  suffix: Filled
-  parent: WardrobeCargo
-
-# WardrobeAtmospherics Filled
-- type: entity
-  id: WardrobeAtmosphericsFilled
-  suffix: Filled
-  parent: WardrobeAtmospherics
-
-# WardrobeEngineering Filled
-- type: entity
-  id: WardrobeEngineeringFilled
-  suffix: Filled
-  parent: WardrobeEngineering
-
-# WardrobeMedicalDoctor Filled
-- type: entity
-  id: WardrobeMedicalDoctorFilled
-  suffix: Filled
-  parent: WardrobeMedicalDoctor
-
-# WardrobeRobotics Filled
-- type: entity
-  id: WardrobeRoboticsFilled
-  suffix: Filled
-  parent: WardrobeRobotics
-
-# WardrobeChemistry Filled
-- type: entity
-  id: WardrobeChemistryFilled
-  suffix: Filled
-  parent: WardrobeChemistry
-
-# WardrobeGenetics Filled
-- type: entity
-  id: WardrobeGeneticsFilled
-  suffix: Filled
-  parent: WardrobeGenetics
-
-# WardrobeVirology Filled
-- type: entity
-  id: WardrobeVirologyFilled
-  suffix: Filled
-  parent: WardrobeVirology
-
-# WardrobeScience Filled
-- type: entity
-  id: WardrobeScienceFilled
-  suffix: Filled
-  parent: WardrobeScience
-
-# WardrobeBotanist Filled
-- type: entity
-  id: WardrobeBotanistFilled
-  suffix: Filled
-  parent: WardrobeBotanist
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml b/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml
deleted file mode 100644
index 80305400e2..0000000000
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/syndicate.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Base syndicate closet
-- type: entity
-  id: LockerSyndicateBase
-  name: armory closet
-  parent: LockerGeneric
-  abstract: true
-  components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state: syndicate
-
-  - type: Icon
-    state: syndicate_door
-
-# Personal syndicate closet
-- type: entity
-  id: LockerSyndicatePersonal
-  parent: LockerSyndicateBase
-  description: "It's a personal storage unit for operative gear."
-
-
-# LockerSyndicatePersonal Filled
-- type: entity
-  id: LockerSyndicatePersonalFilled
-  suffix: Filled
-  parent: LockerSyndicatePersonal
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
new file mode 100644
index 0000000000..a81ea26599
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -0,0 +1,117 @@
+- type: entity
+  parent: Clothing
+  id: BackpackClothing
+  name: backpack
+  description: A convenient storage pack
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/backpack.rsi
+    state: backpack
+  - type: Icon
+    sprite: Clothing/Back/Backpacks/backpack.rsi
+    state: backpack
+  - type: Clothing
+    size: 9999
+    QuickEquip: false
+    Slots:
+    - back
+    sprite: Clothing/Back/Backpacks/backpack.rsi
+    HeldPrefix: backpack
+  - type: Storage
+    capacity: 100
+
+- type: entity
+  parent: BackpackClothing
+  id: ClownPack
+  name: giggles von honkerton
+  description: It's a backpack made by Honk! Co.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/clown.rsi
+    state: clown
+  - type: Icon
+    sprite: Clothing/Back/Backpacks/clown.rsi
+    state: clown
+  - type: Clothing
+    sprite: Clothing/Back/Backpacks/clown.rsi
+    HeldPrefix: clown
+
+- type: entity
+  parent: BackpackClothing
+  id: SecPack
+  name: security backpack
+  description: It's a very robust backpack.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/security.rsi
+    state: security
+  - type: Icon
+    sprite: Clothing/Back/Backpacks/security.rsi
+    state: security
+  - type: Clothing
+    sprite: Clothing/Back/Backpacks/security.rsi
+    HeldPrefix: security
+
+- type: entity
+  parent: BackpackClothing
+  id: BackpackEngineering
+  name: engineering backpack
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/engineering.rsi
+    state: engineering
+  - type: Icon
+    sprite: Clothing/Back/Backpacks/engineering.rsi
+    state: engineering
+  - type: Clothing
+    sprite: Clothing/Back/Backpacks/engineering.rsi
+    HeldPrefix: engineering
+
+- type: entity
+  parent: BackpackClothing
+  id: BackpackMedical
+  name: medical backpack
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/medical.rsi
+    state: medical
+  - type: Icon
+    sprite: Clothing/Back/Backpacks/medical.rsi
+    state: medical
+  - type: Clothing
+    sprite: Clothing/Back/Backpacks/medical.rsi
+    HeldPrefix: medical
+
+- type: entity
+  parent: BackpackClothing
+  id: BackpackCaptain
+  name: captain's backpack
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/captain.rsi
+    state: captain
+  - type: Icon
+    sprite: Clothing/Back/Backpacks/captain.rsi
+    state: captain
+  - type: Clothing
+    sprite: Clothing/Back/Backpacks/captain.rsi
+    HeldPrefix: captain
+
+- type: entity
+  parent: BackpackClothing
+  id: BackpackHolding
+  name: bag of holding
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/holding.rsi
+    state: holding
+    layers:
+    - state: holding
+    - state: holding-unlit
+      shader: unshaded
+  - type: Icon
+    sprite: Clothing/Back/Backpacks/holding.rsi
+    state: holding
+  - type: Clothing
+    sprite: Clothing/Back/Backpacks/holding.rsi
+    HeldPrefix: holding
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Back/courier.yml b/Resources/Prototypes/Entities/Clothing/Back/courier.yml
new file mode 100644
index 0000000000..0c7bd92be9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Back/courier.yml
@@ -0,0 +1,140 @@
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBag
+  name: messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier.rsi
+    state: courier
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier.rsi
+    state: courier
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier.rsi
+    ClothingPrefix: courier
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagChemistry
+  name: chemistry messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_chemistry.rsi
+    state: courier-chemistry
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_chemistry.rsi
+    state: courier-chemistry
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_chemistry.rsi
+    HeldPrefix: medical
+    ClothingPrefix: courier-chemistry
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagMedical
+  name: medical messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_medical.rsi
+    state: courier-medical
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_medical.rsi
+    state: courier-medical
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_medical.rsi
+    HeldPrefix: medical
+    ClothingPrefix: courier-medical
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagVirology
+  name: virology messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_virology.rsi
+    state: courier-virology
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_virology.rsi
+    state: courier-virology
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_virology.rsi
+    HeldPrefix: medical
+    ClothingPrefix: courier-virology
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagEngineering
+  name: engineering messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_engineering.rsi
+    state: courier-engineering
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_engineering.rsi
+    state: courier-engineering
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_engineering.rsi
+    HeldPrefix: engineering
+    ClothingPrefix: courier-engineering
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagScience
+  name: science messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_science.rsi
+    state: courier-science
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_science.rsi
+    state: courier-science
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_science.rsi
+    ClothingPrefix: courier-science
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagCaptain
+  name: captain's messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_captain.rsi
+    state: courier-captain
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_captain.rsi
+    state: courier-captain
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_captain.rsi
+    HeldPrefix: captain
+    ClothingPrefix: courier-captain
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagHydroponics
+  name: hydroponics messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_hydroponics.rsi
+    state: courier-hydroponics
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_hydroponics.rsi
+    state: courier-hydroponics
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_hydroponics.rsi
+    ClothingPrefix: courier-hydroponics
+
+- type: entity
+  parent: BackpackClothing
+  id: MessengerBagSecurity
+  name: security messenger bag
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Couriers/courier_security.rsi
+    state: courier-security
+  - type: Icon
+    sprite: Clothing/Back/Couriers/courier_security.rsi
+    state: courier-security
+  - type: Clothing
+    sprite: Clothing/Back/Couriers/courier_security.rsi
+    HeldPrefix: security
+    ClothingPrefix: courier-security
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
new file mode 100644
index 0000000000..ea8c45c9e0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -0,0 +1,158 @@
+- type: entity
+  parent: BackpackClothing
+  id: Satchel
+  name: satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel.rsi
+    state: satchel
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel.rsi
+    state: satchel
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel.rsi
+    ClothingPrefix: satchel
+  - type: Storage
+    capacity: 300
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelEngineering
+  name: engineering satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
+    state: satchel-engineering
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
+    state: satchel-engineering
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
+    HeldPrefix: engineering
+    ClothingPrefix: satchel-engineering
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelMedical
+  name: medical satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_medical.rsi
+    state: satchel-medical
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_medical.rsi
+    state: satchel-medical
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_medical.rsi
+    HeldPrefix: medical
+    ClothingPrefix: satchel-medical
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelChemistry
+  name: chemistry satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
+    state: satchel-chemistry
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
+    state: satchel-chemistry
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
+    HeldPrefix: medical
+    ClothingPrefix: satchel-chemistry
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelGenetics
+  name: genetics satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
+    state: satchel-genetics
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
+    state: satchel-genetics
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
+    HeldPrefix: medical
+    ClothingPrefix: satchel-genetics
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelVirology
+  name: virology satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_virology.rsi
+    state: satchel-virology
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_virology.rsi
+    state: satchel-virology
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_virology.rsi
+    HeldPrefix: medical
+    ClothingPrefix: satchel-virology
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelScience
+  name: science satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_science.rsi
+    state: satchel-science
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_science.rsi
+    state: satchel-science
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_science.rsi
+    ClothingPrefix: satchel-science
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelSecurity
+  name: security satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_security.rsi
+    state: satchel-security
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_security.rsi
+    state: satchel-security
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_security.rsi
+    HeldPrefix: security
+    ClothingPrefix: satchel-security
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelCaptain
+  name: captain's satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_captain.rsi
+    state: satchel-captain
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_captain.rsi
+    state: satchel-captain
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_captain.rsi
+    HeldPrefix: captain
+    ClothingPrefix: satchel-captain
+
+- type: entity
+  parent: BackpackClothing
+  id: SatchelHydroponics
+  name: hydroponics satchel
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
+    state: satchel-hydroponics
+  - type: Icon
+    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
+    state: satchel-hydroponics
+  - type: Clothing
+    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
+    ClothingPrefix: satchel-hydroponics
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Items/Clothing/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
similarity index 87%
rename from Resources/Prototypes/Entities/Items/Clothing/belts.yml
rename to Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index a04cd843bf..878bfa26d8 100644
--- a/Resources/Prototypes/Entities/Items/Clothing/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -25,13 +25,6 @@
   - type: Storage
     capacity: 40 # Full tool loadout is 35, plus an extra
 
-- type: entity
-  id: UtilityBeltClothingFilled
-  parent: UtilityBeltClothing
-  suffix: Filled
-  components:
-  - type: UtilityBeltClothingFill
-
 - type: entity
   parent: BeltBase
   id: SuspendersClothing
diff --git a/Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml b/Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml
rename to Resources/Prototypes/Entities/Clothing/Belt/identification_cards.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/ears.yml b/Resources/Prototypes/Entities/Clothing/Earpieces/ears.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/ears.yml
rename to Resources/Prototypes/Entities/Clothing/Earpieces/ears.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/eyes.yml b/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Items/Clothing/eyes.yml
rename to Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
index ff84b68580..4ceb57f1a6 100644
--- a/Resources/Prototypes/Entities/Items/Clothing/eyes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
@@ -6,7 +6,6 @@
   - type: Clothing
     Slots: [eyes]
 
-
 - type: entity
   parent: GlassesBase
   id: MesonGlasses
@@ -22,7 +21,6 @@
   - type: Clothing
     sprite: Clothing/Glasses/meson_scanners.rsi
 
-
 - type: entity
   parent: GlassesBase
   id: SunGlasses
diff --git a/Resources/Prototypes/Entities/Items/Clothing/gloves.yml b/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/gloves.yml
rename to Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
new file mode 100644
index 0000000000..97989772ae
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -0,0 +1,3223 @@
+- type: entity
+  parent: Clothing
+  id: HatBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots:
+    - Helmet
+  - type: Sprite
+    state: icon
+  - type: Icon
+    state: icon
+
+- type: entity
+  parent: HatBase
+  id: HatAliceMccrea
+  name: alice mccrea
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/alice_mccrea_1.rsi
+  - type: Icon
+    sprite: Clothing/Head/alice_mccrea_1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/alice_mccrea_1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatAliceMccreaup
+  name: alice mccrea (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/alice_mccrea_1up.rsi
+  - type: Icon
+    sprite: Clothing/Head/alice_mccrea_1up.rsi
+  - type: Clothing
+    sprite: Clothing/Head/alice_mccrea_1up.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatAmp
+  name: amp
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/amp.rsi
+  - type: Icon
+    sprite: Clothing/Head/amp.rsi
+  - type: Clothing
+    sprite: Clothing/Head/amp.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatAssetProtectionRig
+  name: asset protection rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/asset_protection_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/asset_protection_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/asset_protection_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatAssetProtectionRigSealed
+  name: asset protection rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/asset_protection_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/asset_protection_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/asset_protection_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatAtmosHelm
+  name: atmos helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/atmos_helm.rsi
+  - type: Icon
+    sprite: Clothing/Head/atmos_helm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/atmos_helm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandana
+  name: bandana
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandana.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandana.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandana.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandblack
+  name: bandana black
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandblack.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandblack.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandblack.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandblue
+  name: bandana blue
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandblue.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandblue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandblue.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandbotany
+  name: bandana botany
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandbotany.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandbotany.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandbotany.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandcamo
+  name: bandana camo
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandcamo.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandcamo.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandcamo.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandgold
+  name: bandana gold
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandgold.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandgold.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandgold.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandgreen
+  name: bandana green
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandgreen.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandgreen.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandgreen.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandorange
+  name: bandana orange
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandorange.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandorange.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandorange.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandpurple
+  name: bandana purple
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandpurple.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandpurple.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandpurple.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandred
+  name: bandana red
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandred.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandred.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandred.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBandskull
+  name: bandana skull
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bandskull.rsi
+  - type: Icon
+    sprite: Clothing/Head/bandskull.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bandskull.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBearpelt
+  name: bear pelt
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bearpelt.rsi
+  - type: Icon
+    sprite: Clothing/Head/bearpelt.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bearpelt.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeaverHat
+  name: beaver hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beaver_hat.rsi
+  - type: Icon
+    sprite: Clothing/Head/beaver_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beaver_hat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeret
+  name: beret
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret.rsi
+  - type: Icon
+    sprite: Clothing/Head/beret.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beret.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeretBadge
+  name: beret badge
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret_badge.rsi
+  - type: Icon
+    sprite: Clothing/Head/beret_badge.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beret_badge.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeretEngineering
+  name: beret engineering
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret_engineering.rsi
+  - type: Icon
+    sprite: Clothing/Head/beret_engineering.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beret_engineering.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeretHoS
+  name: beret HoS
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret_hos.rsi
+    state: beret_hos
+  - type: Icon
+    sprite: Clothing/Head/beret_hos.rsi
+    state: beret_hos
+  - type: Clothing
+    sprite: Clothing/Head/beret_hos.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeretNavyHos
+  name: beret navy HoS
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret_navy_hos.rsi
+  - type: Icon
+    sprite: Clothing/Head/beret_navy_hos.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beret_navy_hos.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeretNavyOfficer
+  name: beret navy officer
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret_navy_officer.rsi
+  - type: Icon
+    sprite: Clothing/Head/beret_navy_officer.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beret_navy_officer.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeretNavyWarden
+  name: beret navy warden
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret_navy_warden.rsi
+  - type: Icon
+    sprite: Clothing/Head/beret_navy_warden.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beret_navy_warden.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBeretPurple
+  name: beret purple
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/beret_purple.rsi
+  - type: Icon
+    sprite: Clothing/Head/beret_purple.rsi
+  - type: Clothing
+    sprite: Clothing/Head/beret_purple.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioCmo
+  name: bio - cmo
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_cmo.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_cmo.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_cmo.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioGeneral
+  name: bio - general
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_general.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_general.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_general.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioJanitor
+  name: bio - janitor
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_janitor.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_janitor.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioScientist
+  name: bio - scientist
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_scientist.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_scientist.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_scientist.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioSecurity
+  name: bio - security
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_security.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_security.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioVirology
+  name: bio - virology
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_virology.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_virology.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_virology.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBluesoft
+  name: bluesoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bluesoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/bluesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bluesoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBluesoftFlipped
+  name: bluesoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bluesoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/bluesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bluesoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBoaterHat
+  name: boater hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/boater_hat.rsi
+  - type: Icon
+    sprite: Clothing/Head/boater_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/boater_hat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuit
+  name: bombsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuit.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuit.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuit.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuitold
+  name: bombsuit old
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuitold.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuitold.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuitold.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuitsec
+  name: bombsuit sec
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuitsec.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuitsec.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuitsec.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuitsecold
+  name: bombsuit sec old
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuitsecold.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuitsecold.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuitsecold.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuitWhite
+  name: bombsuit white
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuit_white.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuit_white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuit_white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBowler
+  name: bowler
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bowler.rsi
+  - type: Icon
+    sprite: Clothing/Head/bowler.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bowler.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBowlerHat
+  name: bowler hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bowler_hat.rsi
+  - type: Icon
+    sprite: Clothing/Head/bowler_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bowler_hat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBrucehachert
+  name: bruce hachert
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/brucehachert.rsi
+  - type: Icon
+    sprite: Clothing/Head/brucehachert.rsi
+  - type: Clothing
+    sprite: Clothing/Head/brucehachert.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBunny
+  name: bunny
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bunny.rsi
+  - type: Icon
+    sprite: Clothing/Head/bunny.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bunny.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCake
+  name: cake
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cake0.rsi
+  - type: Icon
+    sprite: Clothing/Head/cake0.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cake0.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCakeLit
+  name: cake (lit)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cake1.rsi
+  - type: Icon
+    sprite: Clothing/Head/cake1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cake1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCapcap
+  name: cap cap
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/capcap.rsi
+  - type: Icon
+    sprite: Clothing/Head/capcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/capcap.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCapspace
+  name: cap space
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/capspace.rsi
+  - type: Icon
+    sprite: Clothing/Head/capspace.rsi
+  - type: Clothing
+    sprite: Clothing/Head/capspace.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCaptain
+  name: captain
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/captain.rsi
+  - type: Icon
+    sprite: Clothing/Head/captain.rsi
+  - type: Clothing
+    sprite: Clothing/Head/captain.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCardborgH
+  name: cardborg h
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cardborg_h.rsi
+  - type: Icon
+    sprite: Clothing/Head/cardborg_h.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cardborg_h.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCargosoft
+  name: cargosoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cargosoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/cargosoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cargosoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCargosoftFlipped
+  name: cargosoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cargosoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/cargosoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cargosoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCat
+  name: cat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cat.rsi
+  - type: Icon
+    sprite: Clothing/Head/cat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCat2
+  name: cat2
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cat2.rsi
+  - type: Icon
+    sprite: Clothing/Head/cat2.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cat2.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCat3
+  name: cat3
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cat3.rsi
+  - type: Icon
+    sprite: Clothing/Head/cat3.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cat3.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCentcom
+  name: centcom
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/centcom.rsi
+  - type: Icon
+    sprite: Clothing/Head/centcom.rsi
+  - type: Clothing
+    sprite: Clothing/Head/centcom.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCespaceHelmet
+  name: ce space helmet
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cespace_helmet.rsi
+  - type: Icon
+    sprite: Clothing/Head/cespace_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cespace_helmet.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCeRig
+  name: ce rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ce_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/ce_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ce_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCeRigSealed
+  name: ce rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ce_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/ce_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ce_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatChaplainHood
+  name: chaplain hood
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/chaplain_hood.rsi
+  - type: Icon
+    sprite: Clothing/Head/chaplain_hood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/chaplain_hood.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatChefhat
+  name: chef hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/chefhat.rsi
+  - type: Icon
+    sprite: Clothing/Head/chefhat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/chefhat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatChickenhead
+  name: chicken head
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/chickenhead.rsi
+  - type: Icon
+    sprite: Clothing/Head/chickenhead.rsi
+  - type: Clothing
+    sprite: Clothing/Head/chickenhead.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatConstructiondrone
+  name: construction drone
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/constructiondrone.rsi
+  - type: Icon
+    sprite: Clothing/Head/constructiondrone.rsi
+  - type: Clothing
+    sprite: Clothing/Head/constructiondrone.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCorpsoft
+  name: corpsoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/corpsoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/corpsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/corpsoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCorpsoftFlipped
+  name: corpsoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/corpsoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/corpsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/corpsoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCosmo
+  name: cosmo
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cosmo.rsi
+  - type: Icon
+    sprite: Clothing/Head/cosmo.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cosmo.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCowboy
+  name: cowboy
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cowboy.rsi
+  - type: Icon
+    sprite: Clothing/Head/cowboy.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cowboy.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCulthood
+  name: cult hood
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/culthood.rsi
+  - type: Icon
+    sprite: Clothing/Head/culthood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/culthood.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCultHelmet
+  name: cult helmet
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cult_helmet.rsi
+  - type: Icon
+    sprite: Clothing/Head/cult_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cult_helmet.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCultHoodalt
+  name: cult hood alt
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cult_hoodalt.rsi
+  - type: Icon
+    sprite: Clothing/Head/cult_hoodalt.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cult_hoodalt.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatDeathsquad
+  name: deathsquad
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/deathsquad.rsi
+  - type: Icon
+    sprite: Clothing/Head/deathsquad.rsi
+  - type: Clothing
+    sprite: Clothing/Head/deathsquad.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatDetective
+  name: detective
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/detective.rsi
+  - type: Icon
+    sprite: Clothing/Head/detective.rsi
+  - type: Clothing
+    sprite: Clothing/Head/detective.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatDetective2
+  name: detective2
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/detective2.rsi
+  - type: Icon
+    sprite: Clothing/Head/detective2.rsi
+  - type: Clothing
+    sprite: Clothing/Head/detective2.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEdvinTelephosphor
+  name: edvin telephosphor
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/edvin_telephosphor_1.rsi
+  - type: Icon
+    sprite: Clothing/Head/edvin_telephosphor_1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/edvin_telephosphor_1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEmergencyhelm
+  name: emergency helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/emergencyhelm.rsi
+  - type: Icon
+    sprite: Clothing/Head/emergencyhelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/emergencyhelm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEngineeringRig
+  name: engineering rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/engineering_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/engineering_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/engineering_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEngineeringRigSealed
+  name: engineering rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/engineering_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/engineering_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/engineering_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEngspaceHelmet
+  name: engspace helmet
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/engspace_helmet.rsi
+  - type: Icon
+    sprite: Clothing/Head/engspace_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/engspace_helmet.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEngHelm
+  name: eng helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/eng_helm.rsi
+  - type: Icon
+    sprite: Clothing/Head/eng_helm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/eng_helm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEnosAdlai
+  name: enos adlai
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/enos_adlai_1.rsi
+  - type: Icon
+    sprite: Clothing/Head/enos_adlai_1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/enos_adlai_1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEvaRig
+  name: EVA rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/eva_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/eva_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/eva_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatEvaRigSealed
+  name: EVA rig sealed
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/eva_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/eva_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/eva_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatFeatherTrilby
+  name: feather trilby
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/feather_trilby.rsi
+  - type: Icon
+    sprite: Clothing/Head/feather_trilby.rsi
+  - type: Clothing
+    sprite: Clothing/Head/feather_trilby.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatFedora
+  name: fedora
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/fedora.rsi
+  - type: Icon
+    sprite: Clothing/Head/fedora.rsi
+  - type: Clothing
+    sprite: Clothing/Head/fedora.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatFez
+  name: fez
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/fez.rsi
+  - type: Icon
+    sprite: Clothing/Head/fez.rsi
+  - type: Clothing
+    sprite: Clothing/Head/fez.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatFlatCap
+  name: flat cap
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/flat_cap.rsi
+  - type: Icon
+    sprite: Clothing/Head/flat_cap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/flat_cap.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatGentcap
+  name: gent cap
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/gentcap.rsi
+  - type: Icon
+    sprite: Clothing/Head/gentcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/gentcap.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatGladiator
+  name: gladiator
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/gladiator.rsi
+  - type: Icon
+    sprite: Clothing/Head/gladiator.rsi
+  - type: Clothing
+    sprite: Clothing/Head/gladiator.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatGreenbandana
+  name: greenbandana
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/greenbandana.rsi
+  - type: Icon
+    sprite: Clothing/Head/greenbandana.rsi
+  - type: Clothing
+    sprite: Clothing/Head/greenbandana.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatGreensoft
+  name: greensoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/greensoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/greensoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/greensoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatGreensoftFlipped
+  name: greensoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/greensoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/greensoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/greensoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatGreysoft
+  name: greysoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/greysoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/greysoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/greysoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatGreysoftFlipped
+  name: greysoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/greysoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/greysoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/greysoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHackerRig
+  name: hacker rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hacker_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/hacker_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hacker_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHackerRigSealed
+  name: hacker rig sealed
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hacker_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/hacker_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hacker_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHairflower
+  name: hairflower
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hairflower.rsi
+  - type: Icon
+    sprite: Clothing/Head/hairflower.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hairflower.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatDblue
+  name: hardhat dblue
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_dblue.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_dblue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_dblue.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhat Orange
+  name: hardhat orange
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_orange.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_orange.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_orange.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatPumpkin
+  name: hardhat pumpkin
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_pumpkin.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_pumpkin.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_pumpkin.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatRed
+  name: hardhat red
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_red.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_red.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatWhite
+  name: hardhat white
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_white.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatYellow
+  name: hardhat yellow
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_yellow.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_yellow.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatPumpkinAlt
+  name: hardhat pumpkin (alt)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat1_pumpkin.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat1_pumpkin.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat1_pumpkin.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHasturhood
+  name: hasturhood
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hasturhood.rsi
+  - type: Icon
+    sprite: Clothing/Head/hasturhood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hasturhood.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHazardRig
+  name: hazard rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hazard_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/hazard_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hazard_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHazardRigSealed
+  name: hazard rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hazard_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/hazard_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hazard_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHeadslime
+  name: headslime
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/headslime.rsi
+  - type: Icon
+    sprite: Clothing/Head/headslime.rsi
+  - type: Clothing
+    sprite: Clothing/Head/headslime.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHelmet
+  name: helmet
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/helmet.rsi
+  - type: Icon
+    sprite: Clothing/Head/helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/helmet.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHelmetold
+  name: helmet old
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/helmetold.rsi
+  - type: Icon
+    sprite: Clothing/Head/helmetold.rsi
+  - type: Clothing
+    sprite: Clothing/Head/helmetold.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHgpiratecap
+  name: hg pirate cap
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hgpiratecap.rsi
+  - type: Icon
+    sprite: Clothing/Head/hgpiratecap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hgpiratecap.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHmHelmet
+  name: HM helmet
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hm_helmet.rsi
+  - type: Icon
+    sprite: Clothing/Head/hm_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hm_helmet.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHopcap
+  name: hop cap
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hopcap.rsi
+  - type: Icon
+    sprite: Clothing/Head/hopcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hopcap.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHoshat
+  name: HoS hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hoshat.rsi
+  - type: Icon
+    sprite: Clothing/Head/hoshat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hoshat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatIhsvoidhelm
+  name: IHS voidhelm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ihsvoidhelm.rsi
+  - type: Icon
+    sprite: Clothing/Head/ihsvoidhelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ihsvoidhelm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatIhsvoidhelmOn
+  name: IHS voidhelm (on)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ihsvoidhelm_on.rsi
+  - type: Icon
+    sprite: Clothing/Head/ihsvoidhelm_on.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ihsvoidhelm_on.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatIhsRig
+  name: IHS rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ihs_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/ihs_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ihs_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatIhsRigSealed
+  name: IHS rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ihs_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/ihs_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ihs_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatKitten
+  name: kitten
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/kitten.rsi
+  - type: Icon
+    sprite: Clothing/Head/kitten.rsi
+  - type: Clothing
+    sprite: Clothing/Head/kitten.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatKitty
+  name: kitty
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/kitty.rsi
+  - type: Icon
+    sprite: Clothing/Head/kitty.rsi
+  - type: Clothing
+    sprite: Clothing/Head/kitty.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatKittyinner
+  name: kitty inner
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/kittyinner.rsi
+  - type: Icon
+    sprite: Clothing/Head/kittyinner.rsi
+  - type: Clothing
+    sprite: Clothing/Head/kittyinner.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatKrinnHat
+  name: krinn hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/krinn_hat.rsi
+  - type: Icon
+    sprite: Clothing/Head/krinn_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/krinn_hat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatLightRiot
+  name: light riot
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/light_riot.rsi
+  - type: Icon
+    sprite: Clothing/Head/light_riot.rsi
+  - type: Clothing
+    sprite: Clothing/Head/light_riot.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatLightRiotOn
+  name: light riot (on)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/light_riot_on.rsi
+  - type: Icon
+    sprite: Clothing/Head/light_riot_on.rsi
+  - type: Clothing
+    sprite: Clothing/Head/light_riot_on.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMagus
+  name: magus
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/magus.rsi
+  - type: Icon
+    sprite: Clothing/Head/magus.rsi
+  - type: Clothing
+    sprite: Clothing/Head/magus.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMailman
+  name: mailman
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mailman.rsi
+  - type: Icon
+    sprite: Clothing/Head/mailman.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mailman.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMarisa
+  name: marisa
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/marisa.rsi
+  - type: Icon
+    sprite: Clothing/Head/marisa.rsi
+  - type: Clothing
+    sprite: Clothing/Head/marisa.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMedicalHelm
+  name: medical helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/medical_helm.rsi
+  - type: Icon
+    sprite: Clothing/Head/medical_helm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/medical_helm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMedicalRig
+  name: medical rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/medical_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/medical_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/medical_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMedicalRigSealed
+  name: medical rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/medical_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/medical_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/medical_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMercRig
+  name: merc rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/merc_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/merc_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/merc_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMercRigSealed
+  name: merc rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/merc_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/merc_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/merc_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMetroid
+  name: metroid
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/metroid.rsi
+  - type: Icon
+    sprite: Clothing/Head/metroid.rsi
+  - type: Clothing
+    sprite: Clothing/Head/metroid.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMimesoft
+  name: mimesoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mimesoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/mimesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mimesoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMimesoftFlipped
+  name: mimesoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mimesoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/mimesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mimesoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMiningHelm
+  name: mining helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mining_helm.rsi
+  - type: Icon
+    sprite: Clothing/Head/mining_helm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mining_helm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMonkey
+  name: monkey
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/monkey.rsi
+  - type: Icon
+    sprite: Clothing/Head/monkey.rsi
+  - type: Clothing
+    sprite: Clothing/Head/monkey.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMouseBrown
+  name: mouse brown
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mouse_brown.rsi
+  - type: Icon
+    sprite: Clothing/Head/mouse_brown.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mouse_brown.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMouseGray
+  name: mouse gray
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mouse_gray.rsi
+  - type: Icon
+    sprite: Clothing/Head/mouse_gray.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mouse_gray.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMouseWhite
+  name: mouse white
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mouse_white.rsi
+  - type: Icon
+    sprite: Clothing/Head/mouse_white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mouse_white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNeilpattersonHat
+  name: neil patterson hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/neilpatterson0_hat.rsi
+  - type: Icon
+    sprite: Clothing/Head/neilpatterson0_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/neilpatterson0_hat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNeilpatterson1Hat
+  name: neil patterson1 hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/neilpatterson1_hat.rsi
+  - type: Icon
+    sprite: Clothing/Head/neilpatterson1_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/neilpatterson1_hat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNinjaRig
+  name: ninja rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ninja_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/ninja_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ninja_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNinjaRigSealed
+  name: ninja rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ninja_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/ninja_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ninja_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNorahBriggs
+  name: norah briggs
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/norah_briggs_1.rsi
+  - type: Icon
+    sprite: Clothing/Head/norah_briggs_1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/norah_briggs_1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNorahBriggsup
+  name: norah briggs (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/norah_briggs_1up.rsi
+  - type: Icon
+    sprite: Clothing/Head/norah_briggs_1up.rsi
+  - type: Clothing
+    sprite: Clothing/Head/norah_briggs_1up.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNunHood
+  name: nun hood
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/nun_hood.rsi
+  - type: Icon
+    sprite: Clothing/Head/nun_hood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/nun_hood.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNursehat
+  name: nurse hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/nursehat.rsi
+  - type: Icon
+    sprite: Clothing/Head/nursehat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/nursehat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNymph
+  name: nymph
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/nymph.rsi
+  - type: Icon
+    sprite: Clothing/Head/nymph.rsi
+  - type: Clothing
+    sprite: Clothing/Head/nymph.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatOfficercap
+  name: officer cap
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/officercap.rsi
+  - type: Icon
+    sprite: Clothing/Head/officercap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/officercap.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatOrangesoft
+  name: orangesoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/orangesoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/orangesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/orangesoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatOrangesoftFlipped
+  name: orangesoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/orangesoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/orangesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/orangesoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatOrangeBandana
+  name: orange bandana
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/orange_bandana.rsi
+  - type: Icon
+    sprite: Clothing/Head/orange_bandana.rsi
+  - type: Clothing
+    sprite: Clothing/Head/orange_bandana.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPai-cat
+  name: pai-cat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pai-cat.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pai-monkey.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pai-mouse.rsi
+  - type: Icon
+    sprite: Clothing/Head/pai-mouse.rsi
+  - type: Clothing
+    sprite: Clothing/Head/pai-mouse.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPai-repairbot
+  name: pai-repairbot
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pai-repairbot.rsi
+  - type: Icon
+    sprite: Clothing/Head/pai-repairbot.rsi
+  - type: Clothing
+    sprite: Clothing/Head/pai-repairbot.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPaintedwelding
+  name: painted welding mask
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/paintedwelding.rsi
+  - type: Icon
+    sprite: Clothing/Head/paintedwelding.rsi
+  - type: Clothing
+    sprite: Clothing/Head/paintedwelding.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPaintedweldingup
+  name: painted welding mask (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/paintedweldingup.rsi
+  - type: Icon
+    sprite: Clothing/Head/paintedweldingup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/paintedweldingup.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPaper
+  name: paper
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/paper.rsi
+  - type: Icon
+    sprite: Clothing/Head/paper.rsi
+  - type: Clothing
+    sprite: Clothing/Head/paper.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPetehat
+  name: pete hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/petehat.rsi
+  - type: Icon
+    sprite: Clothing/Head/petehat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/petehat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPhilosopherWig
+  name: philosopher wig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/philosopher_wig.rsi
+  - type: Icon
+    sprite: Clothing/Head/philosopher_wig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/philosopher_wig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPirate
+  name: pirate
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pirate.rsi
+  - type: Icon
+    sprite: Clothing/Head/pirate.rsi
+  - type: Clothing
+    sprite: Clothing/Head/pirate.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPlaguedoctor
+  name: plague doctor
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/plaguedoctor.rsi
+  - type: Icon
+    sprite: Clothing/Head/plaguedoctor.rsi
+  - type: Clothing
+    sprite: Clothing/Head/plaguedoctor.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPolicehelm
+  name: police helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/policehelm.rsi
+  - type: Icon
+    sprite: Clothing/Head/policehelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/policehelm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPurplesoft
+  name: purple soft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/purplesoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/purplesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/purplesoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPurplesoftFlipped
+  name: purplesoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/purplesoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/purplesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/purplesoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPwig
+  name: pwig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pwig.rsi
+  - type: Icon
+    sprite: Clothing/Head/pwig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/pwig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRad
+  name: rad
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rad.rsi
+  - type: Icon
+    sprite: Clothing/Head/rad.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rad.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRainbowsoft
+  name: rainbowsoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rainbowsoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/rainbowsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rainbowsoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRainbowsoftFlipped
+  name: rainbowsoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rainbowsoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/rainbowsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rainbowsoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRedcoat
+  name: redcoat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/redcoat.rsi
+  - type: Icon
+    sprite: Clothing/Head/redcoat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/redcoat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRedsoft
+  name: redsoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/redsoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/redsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/redsoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRedsoftFlipped
+  name: redsoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/redsoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/redsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/redsoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRedwizard
+  name: red wizard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/redwizard.rsi
+  - type: Icon
+    sprite: Clothing/Head/redwizard.rsi
+  - type: Clothing
+    sprite: Clothing/Head/redwizard.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRepairbot
+  name: repairbot
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/repairbot.rsi
+  - type: Icon
+    sprite: Clothing/Head/repairbot.rsi
+  - type: Clothing
+    sprite: Clothing/Head/repairbot.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRichard
+  name: richard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/richard.rsi
+  - type: Icon
+    sprite: Clothing/Head/richard.rsi
+  - type: Clothing
+    sprite: Clothing/Head/richard.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-old
+  name: rig-old
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-old.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-old.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-old.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-atmos
+  name: rig-atmos
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-atmos.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-atmos.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-atmos.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-engineering
+  name: rig-engineering
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-engineering.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-engineering.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-engineering.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-hazardhardsuit
+  name: rig-hazardhardsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-hazardhardsuit.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-hazardhardsuit.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-hazardhardsuit.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-medical
+  name: rig-medical
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-medical.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-medical.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-medical.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-mining
+  name: rig-mining
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-mining.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-mining.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-mining.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-sectg
+  name: rig-sectg
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-sectg.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-sectg.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-sectg.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-syndie
+  name: rig-syndie
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-syndie.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-syndie.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-syndie.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-white
+  name: rig-white
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-white.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRig-wiz
+  name: rig-wiz
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rig-wiz.rsi
+  - type: Icon
+    sprite: Clothing/Head/rig-wiz.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rig-wiz.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRiot
+  name: riot
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/riot.rsi
+  - type: Icon
+    sprite: Clothing/Head/riot.rsi
+  - type: Clothing
+    sprite: Clothing/Head/riot.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatS-ninja
+  name: s-ninja
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/s-ninja.rsi
+  - type: Icon
+    sprite: Clothing/Head/s-ninja.rsi
+  - type: Clothing
+    sprite: Clothing/Head/s-ninja.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSantahat
+  name: santa hat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/santahat.rsi
+  - type: Icon
+    sprite: Clothing/Head/santahat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/santahat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatScaf
+  name: scaf
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/scaf.rsi
+  - type: Icon
+    sprite: Clothing/Head/scaf.rsi
+  - type: Clothing
+    sprite: Clothing/Head/scaf.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatScienceRig
+  name: science rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/science_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/science_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/science_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatScienceRigSealed
+  name: science rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/science_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/science_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/science_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSecsoft
+  name: secsoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/secsoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/secsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/secsoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSecsoftFlipped
+  name: secsoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/secsoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/secsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/secsoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSecurity
+  name: security
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/security.rsi
+  - type: Icon
+    sprite: Clothing/Head/security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/security.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSecurityRig
+  name: security rig
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/security_rig.rsi
+  - type: Icon
+    sprite: Clothing/Head/security_rig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/security_rig.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSecurityRigSealed
+  name: security rig (sealed)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/security_rig_sealed.rsi
+  - type: Icon
+    sprite: Clothing/Head/security_rig_sealed.rsi
+  - type: Clothing
+    sprite: Clothing/Head/security_rig_sealed.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSecHelm
+  name: sec helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/sec_helm.rsi
+  - type: Icon
+    sprite: Clothing/Head/sec_helm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/sec_helm.rsi
+
+- type: entity
+  id: HatSkub
+  name: Skub Hat
+  description: 'Best paired with the Skub Suit.'
+  components:
+  - type: Sprite
+  - type: Icon
+    sprite: Clothing/Head/skubhead.rsi
+  - type: Clothing
+    sprite: Clothing/Head/skubhead.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSombrero
+  name: sombrero
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/sombrero.rsi
+  - type: Icon
+    sprite: Clothing/Head/sombrero.rsi
+  - type: Clothing
+    sprite: Clothing/Head/sombrero.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSpace
+  name: space
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/space.rsi
+  - type: Icon
+    sprite: Clothing/Head/space.rsi
+  - type: Clothing
+    sprite: Clothing/Head/space.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSurgcapBlue
+  name: surgcap blue
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/surgcap_blue.rsi
+  - type: Icon
+    sprite: Clothing/Head/surgcap_blue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/surgcap_blue.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSurgcapGreen
+  name: surgcap green
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/surgcap_green.rsi
+  - type: Icon
+    sprite: Clothing/Head/surgcap_green.rsi
+  - type: Clothing
+    sprite: Clothing/Head/surgcap_green.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSurgcapPurple
+  name: surgcap purple
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/surgcap_purple.rsi
+  - type: Icon
+    sprite: Clothing/Head/surgcap_purple.rsi
+  - type: Clothing
+    sprite: Clothing/Head/surgcap_purple.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSwat-alt
+  name: swat-alt
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/swat-alt.rsi
+  - type: Icon
+    sprite: Clothing/Head/swat-alt.rsi
+  - type: Clothing
+    sprite: Clothing/Head/swat-alt.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSwat
+  name: swat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/swat.rsi
+  - type: Icon
+    sprite: Clothing/Head/swat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/swat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSwathelm
+  name: swat helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/swathelm.rsi
+  - type: Icon
+    sprite: Clothing/Head/swathelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/swathelm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSwatold
+  name: swat old
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/swatold.rsi
+  - type: Icon
+    sprite: Clothing/Head/swatold.rsi
+  - type: Clothing
+    sprite: Clothing/Head/swatold.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSwatup
+  name: swat helm (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/swatup.rsi
+  - type: Icon
+    sprite: Clothing/Head/swatup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/swatup.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black-blue
+  name: syndicate-helm-black-blue
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black-blue.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black-blue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black-blue.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black-engie
+  name: syndicate-helm-black-engie
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black-engie.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black-engie.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black-engie.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black-engie1
+  name: syndicate-helm-black-engie1
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black-engie1.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black-engie1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black-engie1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black-green
+  name: syndicate-helm-black-green
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black-green.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black-green.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black-green.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black-med
+  name: syndicate-helm-black-med
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black-med.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black-med.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black-med.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black-orange
+  name: syndicate-helm-black-orange
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black-orange.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black-orange.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black-orange.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black-red
+  name: syndicate-helm-black-red
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black-red.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black-red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black-red.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-black
+  name: syndicate-helm-black
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-black.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-black.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-black.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-blue
+  name: syndicate-helm-blue
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-blue.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-blue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-blue.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-green-dark
+  name: syndicate-helm-green-dark
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-green-dark.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-green-dark.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-green-dark.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-green
+  name: syndicate-helm-green
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-green.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-green.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-green.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-orange
+  name: syndicate-helm-orange
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-orange.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-orange.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-orange.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-orangeLight
+  name: syndicate-helm-orange light
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-orange_light.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-orange_light.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-orange_light.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate-helm-orangeLight1
+  name: syndicate-helm-orange light1
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate-helm-orange_light1.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate-helm-orange_light1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate-helm-orange_light1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndicate
+  name: syndicate
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndicate.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndicate.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSyndieHelm
+  name: syndie helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/syndie_helm.rsi
+  - type: Icon
+    sprite: Clothing/Head/syndie_helm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/syndie_helm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatThunderdome
+  name: thunderdome
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/thunderdome.rsi
+  - type: Icon
+    sprite: Clothing/Head/thunderdome.rsi
+  - type: Clothing
+    sprite: Clothing/Head/thunderdome.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatTophat
+  name: tophat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/tophat.rsi
+  - type: Icon
+    sprite: Clothing/Head/tophat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/tophat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatUshankadown
+  name: ushanka (down)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ushankadown.rsi
+  - type: Icon
+    sprite: Clothing/Head/ushankadown.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ushankadown.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatUshankaup
+  name: ushanka (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/ushankaup.rsi
+  - type: Icon
+    sprite: Clothing/Head/ushankaup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/ushankaup.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatV62
+  name: v62
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/v62.rsi
+  - type: Icon
+    sprite: Clothing/Head/v62.rsi
+  - type: Clothing
+    sprite: Clothing/Head/v62.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatViking
+  name: viking
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/viking.rsi
+  - type: Icon
+    sprite: Clothing/Head/viking.rsi
+  - type: Clothing
+    sprite: Clothing/Head/viking.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatVioletwizard
+  name: violetwizard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/violetwizard.rsi
+  - type: Icon
+    sprite: Clothing/Head/violetwizard.rsi
+  - type: Clothing
+    sprite: Clothing/Head/violetwizard.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatVoid
+  name: void
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/void.rsi
+  - type: Icon
+    sprite: Clothing/Head/void.rsi
+  - type: Clothing
+    sprite: Clothing/Head/void.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatWelding
+  name: welding mask
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/welding.rsi
+  - type: Icon
+    sprite: Clothing/Head/welding.rsi
+  - type: Clothing
+    sprite: Clothing/Head/welding.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatWeldingup
+  name: welding mask (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/weldingup.rsi
+  - type: Icon
+    sprite: Clothing/Head/weldingup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/weldingup.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatWitch
+  name: witch
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/witch.rsi
+  - type: Icon
+    sprite: Clothing/Head/witch.rsi
+  - type: Clothing
+    sprite: Clothing/Head/witch.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatWizard-fake
+  name: wizard-fake
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/wizard-fake.rsi
+  - type: Icon
+    sprite: Clothing/Head/wizard-fake.rsi
+  - type: Clothing
+    sprite: Clothing/Head/wizard-fake.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatWizard
+  name: wizard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/wizard.rsi
+  - type: Icon
+    sprite: Clothing/Head/wizard.rsi
+  - type: Clothing
+    sprite: Clothing/Head/wiza
+
+- type: entity
+  parent: HatBase
+  id: HatXenom
+  name: xenom
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/xenom.rsi
+  - type: Icon
+    sprite: Clothing/Head/xenom.rsi
+  - type: Clothing
+    sprite: Clothing/Head/xenom.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatXenos
+  name: xenos
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/xenos.rsi
+  - type: Icon
+    sprite: Clothing/Head/xenos.rsi
+  - type: Clothing
+    sprite: Clothing/Head/xenos.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatXmashat
+  name: xmashat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/xmashat.rsi
+  - type: Icon
+    sprite: Clothing/Head/xmashat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/xmashat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatYellowsoft
+  name: yellowsoft
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/yellowsoft.rsi
+  - type: Icon
+    sprite: Clothing/Head/yellowsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/yellowsoft.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatYellowsoftFlipped
+  name: yellowsoft flipped
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/yellowsoft_flipped.rsi
+  - type: Icon
+    sprite: Clothing/Head/yellowsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/yellowsoft_flipped.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatYukiMatsuda
+  name: yuki matsuda
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/yuki_matsuda_1.rsi
+  - type: Icon
+    sprite: Clothing/Head/yuki_matsuda_1.rsi
+  - type: Clothing
+    sprite: Clothing/Head/yuki_matsuda_1.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatYukiMatsudaup
+  name: yuki matsuda (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/yuki_matsuda_1up.rsi
+  - type: Icon
+    sprite: Clothing/Head/yuki_matsuda_1up.rsi
+  - type: Clothing
+    sprite: Clothing/Head/yuki_matsuda_1up.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatZhanScarf
+  name: zhan scarf
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/zhan_scarf.rsi
+  - type: Icon
+    sprite: Clothing/Head/zhan_scarf.rsi
+  - type: Clothing
+    sprite: Clothing/Head/zhan_scarf.rsi
diff --git a/Resources/Prototypes/Entities/Items/Clothing/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/masks.yml
rename to Resources/Prototypes/Entities/Clothing/Masks/masks.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/cloaks.yml
rename to Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/neck.yml b/Resources/Prototypes/Entities/Clothing/Neck/neck.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/neck.yml
rename to Resources/Prototypes/Entities/Clothing/Neck/neck.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml
rename to Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index cc6727e1be..558b6f148e 100644
--- a/Resources/Prototypes/Entities/Items/Clothing/outer/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -7,11 +7,9 @@
   - type: Sprite
     sprite: Clothing/OuterClothing/armor.rsi
     state: armoralt
-
   - type: Icon
     sprite: Clothing/OuterClothing/armor.rsi
     state: armoralt
-
   - type: Clothing
     sprite: Clothing/OuterClothing/armor.rsi
     ClothingPrefix: armoralt
@@ -24,9 +22,7 @@
   components:
   - type: Sprite
     state: armor
-
   - type: Icon
     state: armor
-
   - type: Clothing
     ClothingPrefix: armor
diff --git a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/outer_clothing.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml
rename to Resources/Prototypes/Entities/Clothing/OuterClothing/outer_clothing.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/shoes/clown.yml b/Resources/Prototypes/Entities/Clothing/Shoes/clown.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/shoes/clown.yml
rename to Resources/Prototypes/Entities/Clothing/Shoes/clown.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/shoes/jackboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/jackboots.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/shoes/jackboots.yml
rename to Resources/Prototypes/Entities/Clothing/Shoes/jackboots.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/shoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/shoes.yml
rename to Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/under/jobs/civilian/bartender.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/bartender.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Items/Clothing/under/jobs/civilian/bartender.yml
rename to Resources/Prototypes/Entities/Clothing/Uniforms/bartender.yml
index bc2d155a92..cc979b45d2 100644
--- a/Resources/Prototypes/Entities/Items/Clothing/under/jobs/civilian/bartender.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/bartender.yml
@@ -7,11 +7,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/bartender.rsi
     state: barman
-
   - type: Icon
     sprite: Clothing/Uniforms/bartender.rsi
     state: barman
-
   - type: Clothing
     sprite: Clothing/Uniforms/bartender.rsi
 
@@ -22,10 +20,8 @@
   components:
   - type: Sprite
     state: skirt
-
   - type: Icon
     state: skirt
-
   - type: Clothing
     ClothingPrefix: skirt
     femaleMask: UniformTop
@@ -38,9 +34,7 @@
   components:
   - type: Sprite
     state: purple
-
   - type: Icon
     state: purple
-
   - type: Clothing
     ClothingPrefix: purple
diff --git a/Resources/Prototypes/Entities/Items/Clothing/under/color.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Items/Clothing/under/color.yml
rename to Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
index 9c58b0eb87..2e450da638 100644
--- a/Resources/Prototypes/Entities/Items/Clothing/under/color.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml
@@ -6,10 +6,8 @@
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/color.rsi
-
   - type: Icon
     sprite: Clothing/Uniforms/color.rsi
-
   - type: Clothing
     sprite: Clothing/Uniforms/color.rsi
 
@@ -22,10 +20,8 @@
   components:
   - type: Sprite
     state: grey
-
   - type: Icon
     state: grey
-
   - type: Clothing
     HeldPrefix: grey
 
@@ -37,10 +33,8 @@
   components:
   - type: Sprite
     state: grey_skirt
-
   - type: Icon
     state: grey_skirt
-
   - type: Clothing
     ClothingPrefix: grey_skirt
     femaleMask: UniformTop
@@ -53,10 +47,8 @@
   components:
   - type: Sprite
     state: black
-
   - type: Icon
     state: black
-
   - type: Clothing
     HeldPrefix: black
 
@@ -67,10 +59,8 @@
   components:
   - type: Sprite
     state: black_skirt
-
   - type: Icon
     state: black_skirt
-
   - type: Clothing
     ClothingPrefix: black_skirt
     femaleMask: UniformTop
@@ -83,10 +73,8 @@
   components:
   - type: Sprite
     state: blue
-
   - type: Icon
     state: blue
-
   - type: Clothing
     HeldPrefix: blue
 
@@ -97,10 +85,8 @@
   components:
   - type: Sprite
     state: blue_skirt
-
   - type: Icon
     state: blue_skirt
-
   - type: Clothing
     ClothingPrefix: blue_skirt
     femaleMask: UniformTop
@@ -113,10 +99,8 @@
   components:
   - type: Sprite
     state: green
-
   - type: Icon
     state: green
-
   - type: Clothing
     HeldPrefix: green
 
@@ -127,10 +111,8 @@
   components:
   - type: Sprite
     state: green_skirt
-
   - type: Icon
     state: green_skirt
-
   - type: Clothing
     ClothingPrefix: green_skirt
     femaleMask: UniformTop
@@ -144,10 +126,8 @@
   components:
   - type: Sprite
     state: orange
-
   - type: Icon
     state: orange
-
   - type: Clothing
     HeldPrefix: orange
 
@@ -158,10 +138,8 @@
   components:
   - type: Sprite
     state: orange_skirt
-
   - type: Icon
     state: orange_skirt
-
   - type: Clothing
     ClothingPrefix: orange_skirt
     femaleMask: UniformTop
@@ -175,10 +153,8 @@
   components:
   - type: Sprite
     state: pink
-
   - type: Icon
     state: pink
-
   - type: Clothing
     ClothingPrefix: pink
     HeldPrefix: purple
@@ -190,10 +166,8 @@
   components:
   - type: Sprite
     state: pink_skirt
-
   - type: Icon
     state: pink_skirt
-
   - type: Clothing
     ClothingPrefix: pink_skirt
     femaleMask: UniformTop
@@ -206,10 +180,8 @@
   components:
   - type: Sprite
     state: red
-
   - type: Icon
     state: red
-
   - type: Clothing
     HeldPrefix: red
 
@@ -220,10 +192,8 @@
   components:
   - type: Sprite
     state: red_skirt
-
   - type: Icon
     state: red_skirt
-
   - type: Clothing
     ClothingPrefix: red_skirt
     femaleMask: UniformTop
@@ -236,10 +206,8 @@
   components:
   - type: Sprite
     state: white
-
   - type: Icon
     state: white
-
   - type: Clothing
     HeldPrefix: white
 
@@ -250,10 +218,8 @@
   components:
   - type: Sprite
     state: white_skirt
-
   - type: Icon
     state: white_skirt
-
   - type: Clothing
     ClothingPrefix: white_skirt
     femaleMask: UniformTop
@@ -266,10 +232,8 @@
   components:
   - type: Sprite
     state: yellow
-
   - type: Icon
     state: yellow
-
   - type: Clothing
     HeldPrefix: yellow
 
@@ -280,10 +244,8 @@
   components:
   - type: Sprite
     state: yellow_skirt
-
   - type: Icon
     state: yellow_skirt
-
   - type: Clothing
     ClothingPrefix: yellow_skirt
     femaleMask: UniformTop
@@ -296,10 +258,8 @@
   components:
   - type: Sprite
     state: darkblue
-
   - type: Icon
     state: darkblue
-
   - type: Clothing
     ClothingPrefix: darkblue
     HeldPrefix: blue
@@ -311,10 +271,8 @@
   components:
   - type: Sprite
     state: darkblue_skirt
-
   - type: Icon
     state: darkblue_skirt
-
   - type: Clothing
     ClothingPrefix: darkblue_skirt
     femaleMask: UniformTop
@@ -327,10 +285,8 @@
   components:
   - type: Sprite
     state: teal
-
   - type: Icon
     state: teal
-
   - type: Clothing
     ClothingPrefix: teal
     HeldPrefix: blue
@@ -342,10 +298,8 @@
   components:
   - type: Sprite
     state: teal_skirt
-
   - type: Icon
     state: teal_skirt
-
   - type: Clothing
     ClothingPrefix: teal_skirt
     femaleMask: UniformTop
@@ -358,10 +312,8 @@
   components:
   - type: Sprite
     state: lightpurple
-
   - type: Icon
     state: lightpurple
-
   - type: Clothing
     ClothingPrefix: lightpurple
     HeldPrefix: purple
@@ -373,10 +325,8 @@
   components:
   - type: Sprite
     state: lightpurple_skirt
-
   - type: Icon
     state: lightpurple_skirt
-
   - type: Clothing
     ClothingPrefix: lightpurple_skirt
     femaleMask: UniformTop
@@ -389,10 +339,8 @@
   components:
   - type: Sprite
     state: darkgreen
-
   - type: Icon
     state: darkgreen
-
   - type: Clothing
     ClothingPrefix: darkgreen
     HeldPrefix: green
@@ -404,10 +352,8 @@
   components:
   - type: Sprite
     state: darkgreen_skirt
-
   - type: Icon
     state: darkgreen_skirt
-
   - type: Clothing
     ClothingPrefix: darkgreen_skirt
     femaleMask: UniformTop
@@ -420,10 +366,8 @@
   components:
   - type: Sprite
     state: lightbrown
-
   - type: Icon
     state: lightbrown
-
   - type: Clothing
     HeldPrefix: lightbrown
 
@@ -434,10 +378,8 @@
   components:
   - type: Sprite
     state: lightbrown_skirt
-
   - type: Icon
     state: lightbrown_skirt
-
   - type: Clothing
     ClothingPrefix: lightbrown_skirt
     femaleMask: UniformTop
@@ -450,10 +392,8 @@
   components:
   - type: Sprite
     state: brown
-
   - type: Icon
     state: brown
-
   - type: Clothing
     ClothingPrefix: brown
     HeldPrefix: lightbrown
@@ -465,10 +405,8 @@
   components:
   - type: Sprite
     state: brown_skirt
-
   - type: Icon
     state: brown_skirt
-
   - type: Clothing
     ClothingPrefix: brown_skirt
     femaleMask: UniformTop
@@ -481,10 +419,8 @@
   components:
   - type: Sprite
     state: maroon
-
   - type: Icon
     state: maroon
-
   - type: Clothing
     ClothingPrefix: maroon
     HeldPrefix: red
@@ -496,10 +432,8 @@
   components:
   - type: Sprite
     state: maroon_skirt
-
   - type: Icon
     state: maroon_skirt
-
   - type: Clothing
     ClothingPrefix: maroon_skirt
     femaleMask: UniformTop
@@ -513,10 +447,8 @@
   components:
   - type: Sprite
     state: rainbow
-
   - type: Icon
     state: rainbow
-
   - type: Clothing
     HeldPrefix: rainbow
 
@@ -527,10 +459,8 @@
   components:
   - type: Sprite
     state: rainbow_skirt
-
   - type: Icon
     state: rainbow_skirt
-
   - type: Clothing
     ClothingPrefix: rainbow_skirt
     femaleMask: UniformTop
diff --git a/Resources/Prototypes/Entities/Items/Clothing/uniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Items/Clothing/uniforms.yml
rename to Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
index 7caadec27d..c027ce1a5e 100644
--- a/Resources/Prototypes/Entities/Items/Clothing/uniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml
@@ -6,7 +6,6 @@
   - type: Clothing
     Slots: [innerclothing]
 
-
 - type: entity
   parent: UniformBase
   id: JanitorUniform
@@ -16,11 +15,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_janitor.rsi
     state: janitor
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_janitor.rsi
     state: janitor
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_janitor.rsi
 
@@ -32,15 +29,12 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_engineering.rsi
     state: engine
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_engineering.rsi
     state: engine
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_engineering.rsi
 
-
 - type: entity
   parent: UniformBase
   id: UniformAssistant
@@ -49,11 +43,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_assistant.rsi
     state: assistant
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_assistant.rsi
     state: assistant
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_assistant.rsi
 
@@ -66,11 +58,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_clown.rsi
     state: icon
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_clown.rsi
     state: icon
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_clown.rsi
     femaleMask: UniformTop
@@ -84,11 +74,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_sec.rsi
     state: icon
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_sec.rsi
     state: icon
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_sec.rsi
 
@@ -101,11 +89,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
     state: cargotech
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
     state: cargotech
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_cargotech.rsi
 
@@ -118,11 +104,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_chef.rsi
     state: chef
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_chef.rsi
     state: chef
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_chef.rsi
 
@@ -135,11 +119,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_captain.rsi
     state: captain
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_captain.rsi
     state: captain
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_captain.rsi
 
@@ -152,11 +134,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hop.rsi
     state: hop
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_hop.rsi
     state: hop
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hop.rsi
 
@@ -169,11 +149,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_ce.rsi
     state: ce
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_ce.rsi
     state: ce
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_ce.rsi
 
@@ -186,11 +164,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_cmo.rsi
     state: cmo
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_cmo.rsi
     state: cmo
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_cmo.rsi
 
@@ -203,11 +179,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_md.rsi
     state: md
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_md.rsi
     state: md
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_md.rsi
 
@@ -220,11 +194,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_scientist.rsi
     state: scientist
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_scientist.rsi
     state: scientist
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_scientist.rsi
 
@@ -237,11 +209,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_rd.rsi
     state: rd
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_rd.rsi
     state: rd
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_rd.rsi
 
@@ -254,11 +224,9 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_mime.rsi
     state: icon
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_mime.rsi
     state: icon
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_mime.rsi
 
@@ -271,10 +239,8 @@
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hos.rsi
     state: hos
-
   - type: Icon
     sprite: Clothing/Uniforms/uniform_hos.rsi
     state: hos
-
   - type: Clothing
     sprite: Clothing/Uniforms/uniform_hos.rsi
diff --git a/Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml b/Resources/Prototypes/Entities/Clothing/clothing_base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml
rename to Resources/Prototypes/Entities/Clothing/clothing_base.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Doors/airlock_access.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Doors/airlock_access.yml
rename to Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml
rename to Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Doors/airlock_types.yml
rename to Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml
diff --git a/Resources/Prototypes/Entities/Buildings/catwalk.yml b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/catwalk.yml
rename to Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
diff --git a/Resources/Prototypes/Entities/Buildings/furniture.yml b/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/furniture.yml
rename to Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
diff --git a/Resources/Prototypes/Entities/Buildings/instruments.yml b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
similarity index 89%
rename from Resources/Prototypes/Entities/Buildings/instruments.yml
rename to Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
index 7d4954ea06..22c23b358d 100644
--- a/Resources/Prototypes/Entities/Buildings/instruments.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
@@ -1,26 +1,25 @@
  - type: entity
    name: baseinstrument
-   id: BaseInstrument
+   id: BasePlaceableInstrument
    abstract: true
    components:
    - type: Instrument
      handheld: false
-
    - type: Clickable
    - type: InteractionOutline
-
+   - type: Anchorable
    - type: Collidable
      shapes:
-     - !type:PhysShapeAabb
-       layer: [MobMask, Impassable]
-
+       - !type:PhysShapeAabb
+         mask:
+           - Impassable
+           - MobImpassable
+           - VaultImpassable
    - type: SnapGrid
      offset: Center
-
    - type: Damageable
    - type: Destructible
      thresholdvalue: 50
-
    - type: UserInterface
      interfaces:
      - key: enum.InstrumentUiKey.Key
@@ -28,7 +27,7 @@
 
  - type: entity
    name: piano
-   parent: BaseInstrument
+   parent: BasePlaceableInstrument
    id: PianoInstrument
    description: Play Needles Piano Now.
    components:
@@ -40,18 +39,10 @@
    - type: Icon
      sprite: Objects/Fun/Instruments/otherinstruments.rsi
      state: piano
-   - type: Anchorable
-   - type: Collidable
-     shapes:
-       - !type:PhysShapeAabb
-         mask:
-           - Impassable
-           - MobImpassable
-           - VaultImpassable
 
  - type: entity
    name: minimoog
-   parent: BaseInstrument
+   parent: BasePlaceableInstrument
    id: MinimoogInstrument
    components:
    - type: Instrument
@@ -65,7 +56,7 @@
 
  - type: entity
    name: church organ
-   parent: BaseInstrument
+   parent: BasePlaceableInstrument
    id: ChurchOrganInstrument
    description: This thing really blows!
    components:
@@ -80,7 +71,7 @@
 
  - type: entity
    name: xylophone
-   parent: BaseInstrument
+   parent: BasePlaceableInstrument
    id: XylophoneInstrument
    components:
    - type: Instrument
diff --git a/Resources/Prototypes/Entities/Buildings/shuttle.yml b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/shuttle.yml
rename to Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
diff --git a/Resources/Prototypes/Entities/potted_plants.yml b/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml
similarity index 100%
rename from Resources/Prototypes/Entities/potted_plants.yml
rename to Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml
diff --git a/Resources/Prototypes/Entities/Buildings/table.yml b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/table.yml
rename to Resources/Prototypes/Entities/Constructible/Ground/table.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
new file mode 100644
index 0000000000..f6f74f5642
--- /dev/null
+++ b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
@@ -0,0 +1,101 @@
+- type: entity
+  abstract: true
+  id: WireBase
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Collidable
+  - type: SnapGrid
+    offset: Center
+  - type: Icon
+    texture: Constructible/Power/eightdirwire.png
+  - type: Sprite
+    drawdepth: BelowFloor  
+  - type: IconSmooth
+    mode: CardinalFlags
+  - type: Destructible
+    thresholdvalue: 100
+  - type: SubFloorHide
+  
+- type: entity
+  parent: WireBase
+  id: HVWire
+  name: HV Wire
+  components:
+  - type: Sprite
+    sprite: Constructible/Power/hv_cable.rsi
+    state: hvcable_0
+  - type: IconSmooth
+    base: hvcable_
+    key: hv_cables
+  - type: NodeContainer
+    nodeTypes: { HVPower : ["AdjacentNode"] }
+  - type: Wire
+    wireDroppedOnCutPrototype: HVWireStack1
+    wireType: HighVoltage
+  - type: Destructible
+    spawnondestroy: HVWireStack1
+  
+- type: entity
+  parent: WireBase
+  id: MVWire
+  name: MV Wire
+  components:
+  - type: Sprite
+    color: Yellow
+    sprite: Constructible/Power/mv_cable.rsi
+    state: mvcable_0
+  - type: IconSmooth
+    base: mvcable_
+    key: mv_cables
+  - type: NodeContainer
+    nodeTypes: { MVPower : ["AdjacentNode"] }
+  - type: Wire
+    wireDroppedOnCutPrototype: MVWireStack1
+    wireType: MediumVoltage
+  - type: Destructible
+    spawnondestroy: MVWireStack1
+    
+- type: entity
+  parent: WireBase
+  id: ApcExtensionCable
+  name: Apc Extension Cable
+  components:
+  - type: Sprite
+    color: Green
+    sprite: Constructible/Power/lv_cable.rsi
+    state: lvcable_0
+  - type: IconSmooth
+    base: lvcable_
+    key: lv_cables
+  - type: NodeContainer
+    nodeTypes: { Apc : ["AdjacentNode"] }
+  - type: PowerProvider
+    voltage: Apc
+  - type: Wire
+    wireDroppedOnCutPrototype: ApcExtensionCableStack1
+    wireType: Apc
+  - type: Destructible
+    spawnondestroy: ApcExtensionCableStack1
+    
+#Depriciated, to be removed from maps
+
+- type: entity
+  id: Wire
+  name: Depriciated Wire
+  parent: ApcExtensionCable
+  components:
+  - type: NodeContainer
+    nodeTypes: { HVPower : ["AdjacentNode"], Apc : ["AdjacentNode"] }
+
+- type: entity
+  id: Generator
+  name: Depriciated Generator
+  parent: DebugGenerator
+  components:
+  - type: PowerSupplier
+    voltage: High
+    supplyRate: 100000
+  
diff --git a/Resources/Prototypes/Entities/Buildings/Computers/arcade.yml b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Computers/arcade.yml
rename to Resources/Prototypes/Entities/Constructible/Power/arcade.yml
diff --git a/Resources/Prototypes/Entities/Buildings/booze_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/booze_dispenser.yml
rename to Resources/Prototypes/Entities/Constructible/Power/booze_dispenser.yml
diff --git a/Resources/Prototypes/Entities/Buildings/chem_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/chem_dispenser.yml
rename to Resources/Prototypes/Entities/Constructible/Power/chem_dispenser.yml
diff --git a/Resources/Prototypes/Entities/Buildings/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Power/chem_master.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/chem_master.yml
rename to Resources/Prototypes/Entities/Constructible/Power/chem_master.yml
diff --git a/Resources/Prototypes/Entities/Buildings/computers.yml b/Resources/Prototypes/Entities/Constructible/Power/computers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/computers.yml
rename to Resources/Prototypes/Entities/Constructible/Power/computers.yml
diff --git a/Resources/Prototypes/Entities/Buildings/gravity_generator.yml b/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/gravity_generator.yml
rename to Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
diff --git a/Resources/Prototypes/Entities/Buildings/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/lathe.yml
rename to Resources/Prototypes/Entities/Constructible/Power/lathe.yml
diff --git a/Resources/Prototypes/Entities/Buildings/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/medical_scanner.yml
rename to Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
diff --git a/Resources/Prototypes/Entities/kitchen.yml b/Resources/Prototypes/Entities/Constructible/Power/microwave.yml
similarity index 100%
rename from Resources/Prototypes/Entities/kitchen.yml
rename to Resources/Prototypes/Entities/Constructible/Power/microwave.yml
diff --git a/Resources/Prototypes/Entities/Buildings/power.yml b/Resources/Prototypes/Entities/Constructible/Power/power.yml
similarity index 77%
rename from Resources/Prototypes/Entities/Buildings/power.yml
rename to Resources/Prototypes/Entities/Constructible/Power/power.yml
index 33d6697e62..3b519ffb79 100644
--- a/Resources/Prototypes/Entities/Buildings/power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power.yml
@@ -1,86 +1,4 @@
 - type: entity
-  abstract: true
-  id: WireBase
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Collidable
-  - type: SnapGrid
-    offset: Center
-  - type: Icon
-    texture: Constructible/Power/eightdirwire.png
-  - type: Sprite
-    drawdepth: BelowFloor  
-  - type: IconSmooth
-    mode: CardinalFlags
-  - type: Destructible
-    thresholdvalue: 100
-  - type: SubFloorHide
-  
-- type: entity
-  parent: WireBase
-  id: HVWire
-  name: HV Wire
-  components:
-  - type: Sprite
-    sprite: Constructible/Power/hv_cable.rsi
-    state: hvcable_0
-  - type: IconSmooth
-    base: hvcable_
-    key: hv_cables
-  - type: NodeContainer
-    nodeTypes: { HVPower : ["AdjacentNode"] }
-  - type: Wire
-    wireDroppedOnCutPrototype: HVWireStack1
-    wireType: HighVoltage
-  - type: Destructible
-    spawnondestroy: HVWireStack1
-  
-- type: entity
-  parent: WireBase
-  id: MVWire
-  name: MV Wire
-  components:
-  - type: Sprite
-    color: Yellow
-    sprite: Constructible/Power/mv_cable.rsi
-    state: mvcable_0
-  - type: IconSmooth
-    base: mvcable_
-    key: mv_cables
-  - type: NodeContainer
-    nodeTypes: { MVPower : ["AdjacentNode"] }
-  - type: Wire
-    wireDroppedOnCutPrototype: MVWireStack1
-    wireType: MediumVoltage
-  - type: Destructible
-    spawnondestroy: MVWireStack1
-    
-- type: entity
-  parent: WireBase
-  id: ApcExtensionCable
-  name: Apc Extension Cable
-  components:
-  - type: Sprite
-    color: Green
-    sprite: Constructible/Power/lv_cable.rsi
-    state: lvcable_0
-  - type: IconSmooth
-    base: lvcable_
-    key: lv_cables
-  - type: NodeContainer
-    nodeTypes: { Apc : ["AdjacentNode"] }
-  - type: PowerProvider
-    voltage: Apc
-  - type: Wire
-    wireDroppedOnCutPrototype: ApcExtensionCableStack1
-    wireType: Apc
-  - type: Destructible
-    spawnondestroy: ApcExtensionCableStack1
-    
-- type: entity
   id: DebugGenerator 
   name: Debug Generator
   placement:
@@ -372,23 +290,6 @@
   
 #Depriciated, to be removed from maps
 
-- type: entity
-  id: Wire
-  name: Depriciated Wire
-  parent: ApcExtensionCable
-  components:
-  - type: NodeContainer
-    nodeTypes: { HVPower : ["AdjacentNode"], Apc : ["AdjacentNode"] }
-
-- type: entity
-  id: Generator
-  name: Depriciated Generator
-  parent: DebugGenerator
-  components:
-  - type: PowerSupplier
-    voltage: High
-    supplyRate: 100000
-  
 - type: entity
   id: APC
   name: Depriciated Apc
diff --git a/Resources/Prototypes/Entities/Buildings/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/reagent_dispenser_base.yml
rename to Resources/Prototypes/Entities/Constructible/Power/reagent_dispenser_base.yml
diff --git a/Resources/Prototypes/Entities/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml
similarity index 100%
rename from Resources/Prototypes/Entities/research.yml
rename to Resources/Prototypes/Entities/Constructible/Power/research.yml
diff --git a/Resources/Prototypes/Entities/Buildings/soda_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/soda_dispenser.yml
rename to Resources/Prototypes/Entities/Constructible/Power/soda_dispenser.yml
diff --git a/Resources/Prototypes/Entities/Buildings/turret.yml b/Resources/Prototypes/Entities/Constructible/Power/turret.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/turret.yml
rename to Resources/Prototypes/Entities/Constructible/Power/turret.yml
diff --git a/Resources/Prototypes/Entities/Buildings/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/vending_machines.yml
rename to Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
similarity index 68%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
index dab5b0d4bf..42e52bc063 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/bar.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml
@@ -7,14 +7,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: cabinet
-
   - type: Icon
     state: cabinet_door
 
-
-# LockerBooze Filled
-- type: entity
-  id: LockerBoozeFilled
-  suffix: Filled
-  parent: LockerBooze
-
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
similarity index 63%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
index 9fffb51618..8617c60f86 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/cargo.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
@@ -1,4 +1,3 @@
-# QM
 - type: entity
   id: LockerQuarterMaster
   parent: LockerSecureBase
@@ -8,12 +7,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: qm
-
   - type: Icon
     state: qm_door
-
-# LockerQuarterMaster Filled
-- type: entity
-  id: LockerQuarterMasterFilled
-  suffix: Filled
-  parent: LockerQuarterMaster
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
similarity index 64%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
index 9fcae278e7..c343609336 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/command.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml
@@ -1,4 +1,3 @@
-# Captain
 - type: entity
   id: LockerCaptain
   parent: LockerSecureBase
@@ -8,11 +7,9 @@
     visuals:
     - type: StorageVisualizer2D
       state: cap
-
   - type: Icon
     state: cap_door
 
-# HoP
 - type: entity
   id: LockerHeadOfPersonnel
   parent: LockerSecureBase
@@ -22,19 +19,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: hop
-
   - type: Icon
     state: hop_door
-
-
-# LockerCaptain Filled
-- type: entity
-  id: LockerCaptainFilled
-  suffix: Filled
-  parent: LockerCaptain
-
-# LockerHeadOfPersonnel Filled
-- type: entity
-  id: LockerHeadOfPersonnelFilled
-  suffix: Filled
-  parent: LockerHeadOfPersonnel
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
similarity index 68%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
index da9de55482..6d59bb7900 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/engineering.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml
@@ -8,7 +8,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: ce
-
   - type: Icon
     state: ce_door
 
@@ -23,7 +22,6 @@
     - type: StorageVisualizer2D
       state: eng
       state_closed: eng_elec_door
-
   - type: Icon
     state: eng_elec_door
 
@@ -38,7 +36,6 @@
     - type: StorageVisualizer2D
       state: eng
       state_closed: eng_weld_door
-
   - type: Icon
     state: eng_weld_door
 
@@ -52,7 +49,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: atmos
-
   - type: Icon
     state: atmos_door
 
@@ -66,37 +62,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: eng_secure
-
   - type: Icon
     state: eng_secure_door
-
-
-# LockerChiefEngineer Filled
-- type: entity
-  id: LockerChiefEngineerFilled
-  suffix: Filled
-  parent: LockerChiefEngineer
-
-# LockerElectricalSupplies Filled
-- type: entity
-  id: LockerElectricalSuppliesFilled
-  suffix: Filled
-  parent: LockerElectricalSupplies
-
-# LockerWeldingSupplies Filled
-- type: entity
-  id: LockerWeldingSuppliesFilled
-  suffix: Filled
-  parent: LockerWeldingSupplies
-
-# LockerAtmospherics Filled
-- type: entity
-  id: LockerAtmosphericsFilled
-  suffix: Filled
-  parent: LockerAtmospherics
-
-# LockerEngineer Filled
-- type: entity
-  id: LockerEngineerFilled
-  suffix: Filled
-  parent: LockerEngineer
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/freezer.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/freezer.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
index b42535ea02..8a22253df9 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/freezer.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml
@@ -7,6 +7,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: freezer
-
   - type: Icon
     state: freezer_door
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
similarity index 67%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
index 899a3f5add..41f1663f90 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/hydroponics.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml
@@ -7,13 +7,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: hydro
-
   - type: Icon
     state: hydro_door
-
-
-# LockerBotanist Filled
-- type: entity
-  id: LockerBotanistFilled
-  suffix: Filled
-  parent: LockerBotanist
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
similarity index 69%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
index 81828589b4..2381731940 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/medical.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml
@@ -9,7 +9,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: med
-
   - type: Icon
     state: med_door
 
@@ -23,7 +22,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: med_secure
-
   - type: Icon
     state: med_secure_door
 
@@ -38,7 +36,6 @@
     - type: StorageVisualizer2D
       state: med
       state_closed: chemical_door
-
   - type: Icon
     state: chemical_door
 
@@ -52,31 +49,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: cmo
-
   - type: Icon
     state: cmo_door
-
-
-# LockerMedicine Filled
-- type: entity
-  id: LockerMedicineFilled
-  suffix: Filled
-  parent: LockerMedicine
-
-# LockerMedical Filled
-- type: entity
-  id: LockerMedicalFilled
-  suffix: Filled
-  parent: LockerMedical
-
-# LockerChemistry Filled
-- type: entity
-  id: LockerChemistryFilled
-  suffix: Filled
-  parent: LockerChemistry
-
-# LockerChiefMedicalOfficer Filled
-- type: entity
-  id: LockerChiefMedicalOfficerFilled
-  suffix: Filled
-  parent: LockerChiefMedicalOfficer
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
similarity index 63%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
index be2181ff49..db275643c0 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/scientist.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml
@@ -7,14 +7,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: rd
-
   - type: Icon
     state: rd_door
-
-
-# LockerResearchDirector Filled
-- type: entity
-  id: LockerResearchDirectorFilled
-  suffix: Filled
-  parent: LockerResearchDirector
-
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
similarity index 68%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
index a2a9e0a2ec..fc0bf34105 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/Secure/security.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml
@@ -8,7 +8,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: hos
-
   - type: Icon
     state: hos_door
 
@@ -22,7 +21,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: warden
-
   - type: Icon
     state: warden_door
 
@@ -36,24 +34,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: sec
-
   - type: Icon
     state: sec_door
-
-# LockerHeadOfSecurity Filled
-- type: entity
-  id: LockerHeadOfSecurityFilled
-  suffix: Filled
-  parent: LockerHeadOfSecurity
-
-# LockerWarden Filled
-- type: entity
-  id: LockerWardenFilled
-  suffix: Filled
-  parent: LockerWarden
-
-# LockerSecurity Filled
-- type: entity
-  id: LockerSecurityFilled
-  suffix: Filled
-  parent: LockerSecurity
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Storage/closet.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/closet_secure.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
new file mode 100644
index 0000000000..de9fc35780
--- /dev/null
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
@@ -0,0 +1,28 @@
+# Security wardrobe
+- type: entity
+  id: WardrobeSecurity
+  parent: WardrobeBase
+  name: "security wardrobe"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: red_door
+  - type: Icon
+    state: red_door
+
+# Atmospherics wardrobe
+- type: entity
+  id: WardrobeAtmospherics
+  parent: WardrobeBase
+  name: "atmospherics wardrobe"
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: generic
+      state_closed: atmos_wardrobe_door
+  - type: Icon
+    state: atmos_door
+
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
similarity index 61%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
index cd5074bb67..1160afc127 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/l3closet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml
@@ -9,7 +9,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: bio
-
   - type: Icon
     state: bio_door
 
@@ -22,7 +21,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: bio_viro
-
   - type: Icon
     state: bio_viro_door
 
@@ -35,7 +33,6 @@
     visuals:
     - type: StorageVisualizer2D
       state: bio_sec
-
   - type: Icon
     state: bio_sec_door
 
@@ -48,37 +45,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: bio_jan
-
   - type: Icon
     state: bio_jan_door
-
-
-# LockerL3 Filled
-- type: entity
-  id: LockerL3Filled
-  suffix: Filled, Generic
-  parent: LockerL3
-
-# LockerL3Virology Filled
-- type: entity
-  id: LockerL3VirologyFilled
-  suffix: Filled, Virology
-  parent: LockerL3Virology
-
-# LockerL3Security Filled
-- type: entity
-  id: LockerL3SecurityFilled
-  suffix: Filled, Security
-  parent: LockerL3Security
-
-# LockerL3Janitor Filled
-- type: entity
-  id: LockerL3JanitorFilled
-  suffix: Filled, Janitor
-  parent: LockerL3Janitor
-
-# LockerL3Science Filled
-- type: entity
-  id: LockerL3ScienceFilled
-  suffix: Filled, Science
-  parent: LockerL3Virology
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml
new file mode 100644
index 0000000000..a0aef85851
--- /dev/null
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/name_variants.yml
@@ -0,0 +1,73 @@
+- type: entity
+  id: LockerFormal
+  parent: WardrobeBlack
+  name: "formal closet"
+  description: "It's a storage unit for formal clothing."
+
+- type: entity
+  id: LockerChef
+  parent: WardrobeBlack
+  name: "chef's closet"
+  description: "It's a storage unit for foodservice garments and mouse traps."
+
+- type: entity
+  id: WardrobeChapel
+  parent: WardrobeBlack
+  name: "chaplain's wardrobe"
+  description: "It's a storage unit for Nanotrasen-approved religious attire."
+
+- type: entity
+  id: LockerLegal
+  parent: WardrobeBlue
+  name: "legal closet"
+  description: "It's a storage unit for courtroom apparel and items."
+
+- type: entity
+  id: WardrobeCargo
+  parent: WardrobePrison
+  name: "cargo wardrobe"
+
+- type: entity
+  id: WardrobeEngineering
+  parent: WardrobeYellow
+  name: "engineering wardrobe"
+
+- type: entity
+  id: WardrobeMedicalDoctor
+  parent: WardrobeWhite
+  name: "medical doctor's wardrobe"
+
+- type: entity
+  id: WardrobeRobotics
+  parent: WardrobeBlack
+  name: "robotics wardrobe"
+
+- type: entity
+  id: WardrobeChemistry
+  parent: WardrobeWhite
+  name: "chemistry wardrobe"
+
+- type: entity
+  id: WardrobeGenetics
+  parent: WardrobeWhite
+  name: "genetics wardrobe"
+
+- type: entity
+  id: WardrobeVirology
+  parent: WardrobeWhite
+  name: "virology wardrobe"
+
+- type: entity
+  id: WardrobeScience
+  parent: WardrobeWhite
+  name: "science wardrobe"
+
+- type: entity
+  id: WardrobeBotanist
+  parent: WardrobeGreen
+  name: "botanist wardrobe"
+
+- type: entity
+  id: LockerSyndicatePersonal
+  parent: LockerSyndicateBase
+  description: "It's a personal storage unit for operative gear."
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml
new file mode 100644
index 0000000000..d54724893f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml
@@ -0,0 +1,13 @@
+# Base syndicate closet
+- type: entity
+  id: LockerSyndicateBase
+  name: armory closet
+  parent: LockerGeneric
+  abstract: true
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state: syndicate
+  - type: Icon
+    state: syndicate_door
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/utility_closets.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
similarity index 73%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/utility_closets.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
index b6edc7de89..ffb54c3ebe 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/utility_closets.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml
@@ -13,14 +13,6 @@
   - type: Icon
     state: eng_tool_door
 
-# Filled tool closet
-- type: entity
-  id: LockerToolFilled
-  suffix: Filled
-  parent: LockerTool
-  components:
-  - type: ToolLockerFill
-
 # Radiation suit closet
 - type: entity
   id: LockerRadiationSuit
@@ -33,16 +25,9 @@
     - type: StorageVisualizer2D
       state: eng
       state_closed: eng_rad_door
-
   - type: Icon
     state: eng_rad_door
 
-# Filled
-- type: entity
-  id: LockerRadiationSuitFilled
-  parent: LockerRadiationSuit
-  suffix: Filled
-
 # Emergency closet
 - type: entity
   id: LockerEmergency
@@ -54,18 +39,9 @@
     visuals:
     - type: StorageVisualizer2D
       state: emergency
-
   - type: Icon
     state: emergency_door
 
-# Filled random
-- type: entity
-  id: LockerEmergencyFilledRandom
-  parent: LockerEmergency
-  suffix: Filled, Random
-  components:
-  - type: EmergencyClosetFill
-
 # Fire safety closet
 - type: entity
   id: LockerFire
@@ -77,16 +53,9 @@
     visuals:
     - type: StorageVisualizer2D
       state: fire
-
   - type: Icon
     state: fire_door
 
-# Filled
-- type: entity
-  id: LockerFireFilled
-  parent: LockerFire
-  suffix: Filled
-
 # EOD closet
 - type: entity
   id: LockerBomb
@@ -98,12 +67,5 @@
     visuals:
     - type: StorageVisualizer2D
       state: bomb
-
   - type: Icon
     state: bomb_door
-
-# Filled
-- type: entity
-  id: LockerBombFilled
-  parent: LockerBomb
-  suffix: Filled
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
similarity index 68%
rename from Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
index d18a3fd466..9843a45469 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/Closets/wardrobe.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml
@@ -15,11 +15,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: blue_door
-
   - type: Icon
     state: blue_door
 
-
 # Pink wardrobe
 - type: entity
   id: WardrobePink
@@ -31,11 +29,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: pink_door
-
   - type: Icon
     state: pink_door
 
-
 # Black wardrobe
 - type: entity
   id: WardrobeBlack
@@ -47,11 +43,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: black_door
-
   - type: Icon
     state: black_door
 
-
 # Green wardrobe
 - type: entity
   id: WardrobeGreen
@@ -63,11 +57,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: green_door
-
   - type: Icon
     state: green_door
 
-
 # Prison wardrobe
 - type: entity
   id: WardrobePrison
@@ -79,11 +71,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: orange_door
-
   - type: Icon
     state: orange_door
 
-
 # Yellow wardrobe
 - type: entity
   id: WardrobeYellow
@@ -95,11 +85,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: yellow_door
-
   - type: Icon
     state: yellow_door
 
-
 # White wardrobe
 - type: entity
   id: WardrobeWhite
@@ -111,18 +99,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: white_door
-
   - type: Icon
     state: white_door
 
-
-# Pajama wardrobe
-- type: entity
-  id: WardrobePajama
-  parent: WardrobeWhite
-  name: pajama wardrobe
-
-
 # Grey wardrobe
 - type: entity
   id: WardrobeGrey
@@ -134,11 +113,9 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: grey_door
-
   - type: Icon
     state: grey_door
 
-
 # Mixed wardrobe
 - type: entity
   id: WardrobeMixed
@@ -150,67 +127,5 @@
     - type: StorageVisualizer2D
       state: generic
       state_closed: mixed_door
-
   - type: Icon
     state: mixed_door
-
-
-# WardrobeBlue Filled
-- type: entity
-  id: WardrobeBlueFilled
-  suffix: Filled
-  parent: WardrobeBlue
-
-# WardrobePink Filled
-- type: entity
-  id: WardrobePinkFilled
-  suffix: Filled
-  parent: WardrobePink
-
-# WardrobeBlack Filled
-- type: entity
-  id: WardrobeBlackFilled
-  suffix: Filled
-  parent: WardrobeBlack
-
-# WardrobeGreen Filled
-- type: entity
-  id: WardrobeGreenFilled
-  suffix: Filled
-  parent: WardrobeGreen
-
-# WardrobePrison Filled
-- type: entity
-  id: WardrobePrisonFilled
-  suffix: Filled
-  parent: WardrobePrison
-
-# WardrobeYellow Filled
-- type: entity
-  id: WardrobeYellowFilled
-  suffix: Filled
-  parent: WardrobeYellow
-
-# WardrobeWhite Filled
-- type: entity
-  id: WardrobeWhiteFilled
-  suffix: Filled
-  parent: WardrobeWhite
-
-# WardrobePajama Filled
-- type: entity
-  id: WardrobePajamaFilled
-  suffix: Filled
-  parent: WardrobePajama
-
-# WardrobeGrey Filled
-- type: entity
-  id: WardrobeGreyFilled
-  suffix: Filled
-  parent: WardrobeGrey
-
-# WardrobeMixed Filled
-- type: entity
-  id: WardrobeMixedFilled
-  suffix: Filled
-  parent: WardrobeMixed
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/fuel_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/fuel_tank.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/storage_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/storage_tank.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/water_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/water_tank.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
diff --git a/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml
similarity index 59%
rename from Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml
rename to Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml
index c3bae9afb7..05b07e418d 100644
--- a/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_types.yml
@@ -118,125 +118,3 @@
   - type: Icon
     sprite: Constructible/Structures/Crates/o2.rsi
     state: o2crate
-
-- type: entity
-  id: CrateFlashlights
-  parent: CrateGeneric
-  name: flashlight crate (x5)
-  components:
-  - type: StorageFill
-    contents:
-      - FlashlightLantern
-      - FlashlightLantern
-      - FlashlightLantern
-      - FlashlightLantern
-      - FlashlightLantern
-
-- type: entity
-  id: CrateLightBulb
-  parent: CrateGeneric
-  name: light bulb crate (x10)
-  components:
-  - type: StorageFill
-    contents:
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-
-- type: entity
-  id: CrateFireExtinguisher
-  parent: CrateGeneric
-  name: fire extinguisher crate (x3)
-  components:
-  - type: StorageFill
-    contents:
-      - FireExtinguisher
-      - FireExtinguisher
-      - FireExtinguisher
-
-- type: entity
-  id: CratePen
-  parent: CrateGeneric
-  name: pen  crate (x10)
-  components:
-  - type: StorageFill
-    contents:
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-
-- type: entity
-  id: CrateBikeHorn
-  parent: CrateGeneric
-  name: bike horn crate (x5)
-  components:
-  - type: StorageFill
-    contents:
-      - BikeHorn
-      - BikeHorn
-      - BikeHorn
-      - BikeHorn
-      - BikeHorn
-
-- type: entity
-  id: CrateCleaver
-  parent: CrateGeneric
-  name: cleaver crate (x5)
-  components:
-  - type: StorageFill
-    contents:
-      - ButchCleaver
-      - ButchCleaver
-      - ButchCleaver
-      - ButchCleaver
-      - ButchCleaver
-
-- type: entity
-  id: CrateFuelTank
-  parent: CrateGeneric
-  name: fuel tank
-  components:
-  - type: StorageFill
-    contents:
-      - WeldingFuelTank
-
-- type: entity
-  id: CrateMedicalScanner
-  parent: CrateGeneric
-  name: medical scanner
-  components:
-  - type: StorageFill
-    contents:
-      - MedicalScanner
-
-- type: entity
-  id: CrateGlass
-  parent: CrateGeneric
-  name: glass sheet crate (x50)
-  components:
-  - type: StorageFill
-    contents:
-      - GlassStack
-
-- type: entity
-  id: CrateCable
-  parent: CrateGeneric
-  name: cable coil crate (x50)
-  components:
-  - type: StorageFill
-    contents:
-      - CableStack
diff --git a/Resources/Prototypes/Entities/Buildings/asteroid.yml b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/asteroid.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
diff --git a/Resources/Prototypes/Entities/Buildings/bar_sign.yml b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/bar_sign.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
diff --git a/Resources/Prototypes/Entities/Buildings/emergency_light.yml b/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/emergency_light.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml
diff --git a/Resources/Prototypes/Entities/Buildings/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/girder.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/girder.yml
diff --git a/Resources/Prototypes/Entities/Buildings/lighting.yml b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/lighting.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
diff --git a/Resources/Prototypes/Entities/Buildings/low_wall.yml b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/low_wall.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
diff --git a/Resources/Prototypes/Entities/Buildings/mirror.yml b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/mirror.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
diff --git a/Resources/Prototypes/Entities/Buildings/walls.yml b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/walls.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/walls.yml
diff --git a/Resources/Prototypes/Entities/Buildings/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Buildings/windows.yml
rename to Resources/Prototypes/Entities/Constructible/Walls/windows.yml
diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/construction_ghost.yml
rename to Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml
diff --git a/Resources/Prototypes/Entities/Markers/drag_shadow.yml b/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/drag_shadow.yml
rename to Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml
diff --git a/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml
rename to Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml
diff --git a/Resources/Prototypes/Entities/Markers/marker_base.yml b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/marker_base.yml
rename to Resources/Prototypes/Entities/Effects/Markers/marker_base.yml
diff --git a/Resources/Prototypes/Entities/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/spawn_points.yml
rename to Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml
diff --git a/Resources/Prototypes/Entities/Markers/spawn_points_jobs.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/spawn_points_jobs.yml
rename to Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml
diff --git a/Resources/Prototypes/Entities/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/timed_spawners.yml
rename to Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml
diff --git a/Resources/Prototypes/Entities/Markers/trash_spawner.yml b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/trash_spawner.yml
rename to Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml
diff --git a/Resources/Prototypes/Entities/Markers/warp_point.yml b/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Markers/warp_point.yml
rename to Resources/Prototypes/Entities/Effects/Markers/warp_point.yml
diff --git a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml
deleted file mode 100644
index 8a4e97b64f..0000000000
--- a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml
+++ /dev/null
@@ -1,417 +0,0 @@
-- type: entity
-  parent: Clothing
-  id: BackpackClothing
-  name: backpack
-  description: A convenient storage pack
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Backpacks/backpack.rsi
-    state: backpack
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/backpack.rsi
-    state: backpack
-  - type: Clothing
-    size: 9999
-    QuickEquip: false
-    Slots:
-    - back
-    sprite: Clothing/Back/Backpacks/backpack.rsi
-    HeldPrefix: backpack
-  - type: Storage
-    capacity: 100
-
-- type: entity
-  parent: BackpackClothing
-  id: ClownPack
-  name: giggles von honkerton
-  description: It's a backpack made by Honk! Co.
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Backpacks/clown.rsi
-    state: clown
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/clown.rsi
-    state: clown
-  - type: Clothing
-    sprite: Clothing/Back/Backpacks/clown.rsi
-    HeldPrefix: clown
-
-- type: entity
-  parent: BackpackClothing
-  id: SecPack
-  name: security backpack
-  description: It's a very robust backpack.
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Backpacks/security.rsi
-    state: security
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/security.rsi
-    state: security
-  - type: Clothing
-    sprite: Clothing/Back/Backpacks/security.rsi
-    HeldPrefix: security
-
-- type: entity
-  parent: BackpackClothing
-  id: BackpackEngineering
-  name: engineering backpack
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Backpacks/engineering.rsi
-    state: engineering
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/engineering.rsi
-    state: engineering
-  - type: Clothing
-    sprite: Clothing/Back/Backpacks/engineering.rsi
-    HeldPrefix: engineering
-
-- type: entity
-  parent: BackpackClothing
-  id: BackpackMedical
-  name: medical backpack
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Backpacks/medical.rsi
-    state: medical
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/medical.rsi
-    state: medical
-  - type: Clothing
-    sprite: Clothing/Back/Backpacks/medical.rsi
-    HeldPrefix: medical
-
-- type: entity
-  parent: BackpackClothing
-  id: BackpackCaptain
-  name: captain's backpack
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Backpacks/captain.rsi
-    state: captain
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/captain.rsi
-    state: captain
-  - type: Clothing
-    sprite: Clothing/Back/Backpacks/captain.rsi
-    HeldPrefix: captain
-
-- type: entity
-  parent: BackpackClothing
-  id: BackpackHolding
-  name: bag of holding
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Backpacks/holding.rsi
-    state: holding
-    layers:
-    - state: holding
-    - state: holding-unlit
-      shader: unshaded
-  - type: Icon
-    sprite: Clothing/Back/Backpacks/holding.rsi
-    state: holding
-  - type: Clothing
-    sprite: Clothing/Back/Backpacks/holding.rsi
-    HeldPrefix: holding
-
-- type: entity
-  parent: BackpackClothing
-  id: Satchel
-  name: satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel.rsi
-    state: satchel
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel.rsi
-    state: satchel
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel.rsi
-    ClothingPrefix: satchel
-  - type: Storage
-    capacity: 300
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelEngineering
-  name: engineering satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
-    state: satchel-engineering
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
-    state: satchel-engineering
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
-    HeldPrefix: engineering
-    ClothingPrefix: satchel-engineering
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelMedical
-  name: medical satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_medical.rsi
-    state: satchel-medical
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_medical.rsi
-    state: satchel-medical
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_medical.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-medical
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelChemistry
-  name: chemistry satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
-    state: satchel-chemistry
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
-    state: satchel-chemistry
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-chemistry
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelGenetics
-  name: genetics satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
-    state: satchel-genetics
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
-    state: satchel-genetics
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_genetics.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-genetics
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelVirology
-  name: virology satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_virology.rsi
-    state: satchel-virology
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_virology.rsi
-    state: satchel-virology
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_virology.rsi
-    HeldPrefix: medical
-    ClothingPrefix: satchel-virology
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelScience
-  name: science satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_science.rsi
-    state: satchel-science
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_science.rsi
-    state: satchel-science
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_science.rsi
-    ClothingPrefix: satchel-science
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelSecurity
-  name: security satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_security.rsi
-    state: satchel-security
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_security.rsi
-    state: satchel-security
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_security.rsi
-    HeldPrefix: security
-    ClothingPrefix: satchel-security
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelCaptain
-  name: captain's satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_captain.rsi
-    state: satchel-captain
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_captain.rsi
-    state: satchel-captain
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_captain.rsi
-    HeldPrefix: captain
-    ClothingPrefix: satchel-captain
-
-- type: entity
-  parent: BackpackClothing
-  id: SatchelHydroponics
-  name: hydroponics satchel
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
-    state: satchel-hydroponics
-  - type: Icon
-    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
-    state: satchel-hydroponics
-  - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
-    ClothingPrefix: satchel-hydroponics
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBag
-  name: messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier.rsi
-    state: courier
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier.rsi
-    state: courier
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier.rsi
-    ClothingPrefix: courier
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagChemistry
-  name: chemistry messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_chemistry.rsi
-    state: courier-chemistry
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_chemistry.rsi
-    state: courier-chemistry
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_chemistry.rsi
-    HeldPrefix: medical
-    ClothingPrefix: courier-chemistry
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagMedical
-  name: medical messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_medical.rsi
-    state: courier-medical
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_medical.rsi
-    state: courier-medical
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_medical.rsi
-    HeldPrefix: medical
-    ClothingPrefix: courier-medical
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagVirology
-  name: virology messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_virology.rsi
-    state: courier-virology
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_virology.rsi
-    state: courier-virology
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_virology.rsi
-    HeldPrefix: medical
-    ClothingPrefix: courier-virology
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagEngineering
-  name: engineering messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_engineering.rsi
-    state: courier-engineering
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_engineering.rsi
-    state: courier-engineering
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_engineering.rsi
-    HeldPrefix: engineering
-    ClothingPrefix: courier-engineering
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagScience
-  name: science messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_science.rsi
-    state: courier-science
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_science.rsi
-    state: courier-science
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_science.rsi
-    ClothingPrefix: courier-science
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagCaptain
-  name: captain's messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_captain.rsi
-    state: courier-captain
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_captain.rsi
-    state: courier-captain
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_captain.rsi
-    HeldPrefix: captain
-    ClothingPrefix: courier-captain
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagHydroponics
-  name: hydroponics messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_hydroponics.rsi
-    state: courier-hydroponics
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_hydroponics.rsi
-    state: courier-hydroponics
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_hydroponics.rsi
-    ClothingPrefix: courier-hydroponics
-
-- type: entity
-  parent: BackpackClothing
-  id: MessengerBagSecurity
-  name: security messenger bag
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Couriers/courier_security.rsi
-    state: courier-security
-  - type: Icon
-    sprite: Clothing/Back/Couriers/courier_security.rsi
-    state: courier-security
-  - type: Clothing
-    sprite: Clothing/Back/Couriers/courier_security.rsi
-    HeldPrefix: security
-    ClothingPrefix: courier-security
diff --git a/Resources/Prototypes/Entities/Items/Clothing/hats.yml b/Resources/Prototypes/Entities/Items/Clothing/hats.yml
deleted file mode 100644
index 2d6d079aa2..0000000000
--- a/Resources/Prototypes/Entities/Items/Clothing/hats.yml
+++ /dev/null
@@ -1,3226 +0,0 @@
-
-- type: entity
-  parent: Clothing
-  id: HatBase
-  abstract: true
-  components:
-  - type: Clothing
-    Slots:
-    - Helmet
-  - type: Sprite
-    state: icon
-  - type: Icon
-    state: icon
-
-- type: entity
-  id: HatAliceMccrea
-  name: alice mccrea
-  description: ''
-  components:
-  - sprite: Clothing/Head/alice_mccrea_1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/alice_mccrea_1.rsi
-    type: Icon
-  - sprite: Clothing/Head/alice_mccrea_1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatAliceMccreaup
-  name: alice mccrea (up)
-  description: ''
-  components:
-  - sprite: Clothing/Head/alice_mccrea_1up.rsi
-    type: Sprite
-  - sprite: Clothing/Head/alice_mccrea_1up.rsi
-    type: Icon
-  - sprite: Clothing/Head/alice_mccrea_1up.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatAmp
-  name: amp
-  description: ''
-  components:
-  - sprite: Clothing/Head/amp.rsi
-    type: Sprite
-  - sprite: Clothing/Head/amp.rsi
-    type: Icon
-  - sprite: Clothing/Head/amp.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatAssetProtectionRig
-  name: asset protection rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/asset_protection_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/asset_protection_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/asset_protection_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatAssetProtectionRigSealed
-  name: asset protection rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/asset_protection_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/asset_protection_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/asset_protection_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatAtmosHelm
-  name: atmos helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/atmos_helm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/atmos_helm.rsi
-    type: Icon
-  - sprite: Clothing/Head/atmos_helm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandana
-  name: bandana
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandana.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandana.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandana.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandblack
-  name: bandana black
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandblack.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandblack.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandblack.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandblue
-  name: bandana blue
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandblue.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandblue.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandblue.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandbotany
-  name: bandana botany
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandbotany.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandbotany.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandbotany.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandcamo
-  name: bandana camo
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandcamo.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandcamo.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandcamo.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandgold
-  name: bandana gold
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandgold.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandgold.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandgold.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandgreen
-  name: bandana green
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandgreen.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandgreen.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandgreen.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandorange
-  name: bandana orange
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandorange.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandorange.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandorange.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandpurple
-  name: bandana purple
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandpurple.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandpurple.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandpurple.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandred
-  name: bandana red
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandred.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandred.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandred.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBandskull
-  name: bandana skull
-  description: ''
-  components:
-  - sprite: Clothing/Head/bandskull.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bandskull.rsi
-    type: Icon
-  - sprite: Clothing/Head/bandskull.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBearpelt
-  name: bear pelt
-  description: ''
-  components:
-  - sprite: Clothing/Head/bearpelt.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bearpelt.rsi
-    type: Icon
-  - sprite: Clothing/Head/bearpelt.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeaverHat
-  name: beaver hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/beaver_hat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beaver_hat.rsi
-    type: Icon
-  - sprite: Clothing/Head/beaver_hat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeret
-  name: beret
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beret.rsi
-    type: Icon
-  - sprite: Clothing/Head/beret.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeretBadge
-  name: beret badge
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret_badge.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beret_badge.rsi
-    type: Icon
-  - sprite: Clothing/Head/beret_badge.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeretEngineering
-  name: beret engineering
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret_engineering.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beret_engineering.rsi
-    type: Icon
-  - sprite: Clothing/Head/beret_engineering.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeretHoS
-  name: beret HoS
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret_hos.rsi
-    type: Sprite
-    state: beret_hos
-  - sprite: Clothing/Head/beret_hos.rsi
-    type: Icon
-    state: beret_hos
-  - sprite: Clothing/Head/beret_hos.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeretNavyHos
-  name: beret navy HoS
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret_navy_hos.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beret_navy_hos.rsi
-    type: Icon
-  - sprite: Clothing/Head/beret_navy_hos.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeretNavyOfficer
-  name: beret navy officer
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret_navy_officer.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beret_navy_officer.rsi
-    type: Icon
-  - sprite: Clothing/Head/beret_navy_officer.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeretNavyWarden
-  name: beret navy warden
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret_navy_warden.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beret_navy_warden.rsi
-    type: Icon
-  - sprite: Clothing/Head/beret_navy_warden.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBeretPurple
-  name: beret purple
-  description: ''
-  components:
-  - sprite: Clothing/Head/beret_purple.rsi
-    type: Sprite
-  - sprite: Clothing/Head/beret_purple.rsi
-    type: Icon
-  - sprite: Clothing/Head/beret_purple.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBioCmo
-  name: bio - cmo
-  description: ''
-  components:
-  - sprite: Clothing/Head/bio_cmo.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bio_cmo.rsi
-    type: Icon
-  - sprite: Clothing/Head/bio_cmo.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBioGeneral
-  name: bio - general
-  description: ''
-  components:
-  - sprite: Clothing/Head/bio_general.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bio_general.rsi
-    type: Icon
-  - sprite: Clothing/Head/bio_general.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBioJanitor
-  name: bio - janitor
-  description: ''
-  components:
-  - sprite: Clothing/Head/bio_janitor.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bio_janitor.rsi
-    type: Icon
-  - sprite: Clothing/Head/bio_janitor.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBioScientist
-  name: bio - scientist
-  description: ''
-  components:
-  - sprite: Clothing/Head/bio_scientist.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bio_scientist.rsi
-    type: Icon
-  - sprite: Clothing/Head/bio_scientist.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBioSecurity
-  name: bio - security
-  description: ''
-  components:
-  - sprite: Clothing/Head/bio_security.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bio_security.rsi
-    type: Icon
-  - sprite: Clothing/Head/bio_security.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBioVirology
-  name: bio - virology
-  description: ''
-  components:
-  - sprite: Clothing/Head/bio_virology.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bio_virology.rsi
-    type: Icon
-  - sprite: Clothing/Head/bio_virology.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBluesoft
-  name: bluesoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/bluesoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bluesoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/bluesoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBluesoftFlipped
-  name: bluesoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/bluesoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bluesoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/bluesoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBoaterHat
-  name: boater hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/boater_hat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/boater_hat.rsi
-    type: Icon
-  - sprite: Clothing/Head/boater_hat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBombsuit
-  name: bombsuit
-  description: ''
-  components:
-  - sprite: Clothing/Head/bombsuit.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bombsuit.rsi
-    type: Icon
-  - sprite: Clothing/Head/bombsuit.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBombsuitold
-  name: bombsuit old
-  description: ''
-  components:
-  - sprite: Clothing/Head/bombsuitold.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bombsuitold.rsi
-    type: Icon
-  - sprite: Clothing/Head/bombsuitold.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBombsuitsec
-  name: bombsuit sec
-  description: ''
-  components:
-  - sprite: Clothing/Head/bombsuitsec.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bombsuitsec.rsi
-    type: Icon
-  - sprite: Clothing/Head/bombsuitsec.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBombsuitsecold
-  name: bombsuit sec old
-  description: ''
-  components:
-  - sprite: Clothing/Head/bombsuitsecold.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bombsuitsecold.rsi
-    type: Icon
-  - sprite: Clothing/Head/bombsuitsecold.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBombsuitWhite
-  name: bombsuit white
-  description: ''
-  components:
-  - sprite: Clothing/Head/bombsuit_white.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bombsuit_white.rsi
-    type: Icon
-  - sprite: Clothing/Head/bombsuit_white.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBowler
-  name: bowler
-  description: ''
-  components:
-  - sprite: Clothing/Head/bowler.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bowler.rsi
-    type: Icon
-  - sprite: Clothing/Head/bowler.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBowlerHat
-  name: bowler hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/bowler_hat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bowler_hat.rsi
-    type: Icon
-  - sprite: Clothing/Head/bowler_hat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBrucehachert
-  name: bruce hachert
-  description: ''
-  components:
-  - sprite: Clothing/Head/brucehachert.rsi
-    type: Sprite
-  - sprite: Clothing/Head/brucehachert.rsi
-    type: Icon
-  - sprite: Clothing/Head/brucehachert.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatBunny
-  name: bunny
-  description: ''
-  components:
-  - sprite: Clothing/Head/bunny.rsi
-    type: Sprite
-  - sprite: Clothing/Head/bunny.rsi
-    type: Icon
-  - sprite: Clothing/Head/bunny.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCake
-  name: cake
-  description: ''
-  components:
-  - sprite: Clothing/Head/cake0.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cake0.rsi
-    type: Icon
-  - sprite: Clothing/Head/cake0.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCakeLit
-  name: cake (lit)
-  description: ''
-  components:
-  - sprite: Clothing/Head/cake1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cake1.rsi
-    type: Icon
-  - sprite: Clothing/Head/cake1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCapcap
-  name: cap cap
-  description: ''
-  components:
-  - sprite: Clothing/Head/capcap.rsi
-    type: Sprite
-  - sprite: Clothing/Head/capcap.rsi
-    type: Icon
-  - sprite: Clothing/Head/capcap.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCapspace
-  name: cap space
-  description: ''
-  components:
-  - sprite: Clothing/Head/capspace.rsi
-    type: Sprite
-  - sprite: Clothing/Head/capspace.rsi
-    type: Icon
-  - sprite: Clothing/Head/capspace.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCaptain
-  name: captain
-  description: ''
-  components:
-  - sprite: Clothing/Head/captain.rsi
-    type: Sprite
-  - sprite: Clothing/Head/captain.rsi
-    type: Icon
-  - sprite: Clothing/Head/captain.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCardborgH
-  name: cardborg h
-  description: ''
-  components:
-  - sprite: Clothing/Head/cardborg_h.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cardborg_h.rsi
-    type: Icon
-  - sprite: Clothing/Head/cardborg_h.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCargosoft
-  name: cargosoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/cargosoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cargosoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/cargosoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCargosoftFlipped
-  name: cargosoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/cargosoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cargosoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/cargosoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCat
-  name: cat
-  description: ''
-  components:
-  - sprite: Clothing/Head/cat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cat.rsi
-    type: Icon
-  - sprite: Clothing/Head/cat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCat2
-  name: cat2
-  description: ''
-  components:
-  - sprite: Clothing/Head/cat2.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cat2.rsi
-    type: Icon
-  - sprite: Clothing/Head/cat2.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCat3
-  name: cat3
-  description: ''
-  components:
-  - sprite: Clothing/Head/cat3.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cat3.rsi
-    type: Icon
-  - sprite: Clothing/Head/cat3.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCentcom
-  name: centcom
-  description: ''
-  components:
-  - sprite: Clothing/Head/centcom.rsi
-    type: Sprite
-  - sprite: Clothing/Head/centcom.rsi
-    type: Icon
-  - sprite: Clothing/Head/centcom.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCespaceHelmet
-  name: ce space helmet
-  description: ''
-  components:
-  - sprite: Clothing/Head/cespace_helmet.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cespace_helmet.rsi
-    type: Icon
-  - sprite: Clothing/Head/cespace_helmet.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCeRig
-  name: ce rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/ce_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ce_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/ce_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCeRigSealed
-  name: ce rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/ce_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ce_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/ce_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatChaplainHood
-  name: chaplain hood
-  description: ''
-  components:
-  - sprite: Clothing/Head/chaplain_hood.rsi
-    type: Sprite
-  - sprite: Clothing/Head/chaplain_hood.rsi
-    type: Icon
-  - sprite: Clothing/Head/chaplain_hood.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatChefhat
-  name: chef hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/chefhat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/chefhat.rsi
-    type: Icon
-  - sprite: Clothing/Head/chefhat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatChickenhead
-  name: chicken head
-  description: ''
-  components:
-  - sprite: Clothing/Head/chickenhead.rsi
-    type: Sprite
-  - sprite: Clothing/Head/chickenhead.rsi
-    type: Icon
-  - sprite: Clothing/Head/chickenhead.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatConstructiondrone
-  name: construction drone
-  description: ''
-  components:
-  - sprite: Clothing/Head/constructiondrone.rsi
-    type: Sprite
-  - sprite: Clothing/Head/constructiondrone.rsi
-    type: Icon
-  - sprite: Clothing/Head/constructiondrone.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCorpsoft
-  name: corpsoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/corpsoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/corpsoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/corpsoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCorpsoftFlipped
-  name: corpsoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/corpsoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/corpsoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/corpsoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCosmo
-  name: cosmo
-  description: ''
-  components:
-  - sprite: Clothing/Head/cosmo.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cosmo.rsi
-    type: Icon
-  - sprite: Clothing/Head/cosmo.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCowboy
-  name: cowboy
-  description: ''
-  components:
-  - sprite: Clothing/Head/cowboy.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cowboy.rsi
-    type: Icon
-  - sprite: Clothing/Head/cowboy.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCulthood
-  name: cult hood
-  description: ''
-  components:
-  - sprite: Clothing/Head/culthood.rsi
-    type: Sprite
-  - sprite: Clothing/Head/culthood.rsi
-    type: Icon
-  - sprite: Clothing/Head/culthood.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCultHelmet
-  name: cult helmet
-  description: ''
-  components:
-  - sprite: Clothing/Head/cult_helmet.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cult_helmet.rsi
-    type: Icon
-  - sprite: Clothing/Head/cult_helmet.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatCultHoodalt
-  name: cult hood alt
-  description: ''
-  components:
-  - sprite: Clothing/Head/cult_hoodalt.rsi
-    type: Sprite
-  - sprite: Clothing/Head/cult_hoodalt.rsi
-    type: Icon
-  - sprite: Clothing/Head/cult_hoodalt.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatDeathsquad
-  name: deathsquad
-  description: ''
-  components:
-  - sprite: Clothing/Head/deathsquad.rsi
-    type: Sprite
-  - sprite: Clothing/Head/deathsquad.rsi
-    type: Icon
-  - sprite: Clothing/Head/deathsquad.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatDetective
-  name: detective
-  description: ''
-  components:
-  - sprite: Clothing/Head/detective.rsi
-    type: Sprite
-  - sprite: Clothing/Head/detective.rsi
-    type: Icon
-  - sprite: Clothing/Head/detective.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatDetective2
-  name: detective2
-  description: ''
-  components:
-  - sprite: Clothing/Head/detective2.rsi
-    type: Sprite
-  - sprite: Clothing/Head/detective2.rsi
-    type: Icon
-  - sprite: Clothing/Head/detective2.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEdvinTelephosphor
-  name: edvin telephosphor
-  description: ''
-  components:
-  - sprite: Clothing/Head/edvin_telephosphor_1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/edvin_telephosphor_1.rsi
-    type: Icon
-  - sprite: Clothing/Head/edvin_telephosphor_1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEmergencyhelm
-  name: emergency helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/emergencyhelm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/emergencyhelm.rsi
-    type: Icon
-  - sprite: Clothing/Head/emergencyhelm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEngineeringRig
-  name: engineering rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/engineering_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/engineering_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/engineering_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEngineeringRigSealed
-  name: engineering rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/engineering_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/engineering_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/engineering_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEngspaceHelmet
-  name: engspace helmet
-  description: ''
-  components:
-  - sprite: Clothing/Head/engspace_helmet.rsi
-    type: Sprite
-  - sprite: Clothing/Head/engspace_helmet.rsi
-    type: Icon
-  - sprite: Clothing/Head/engspace_helmet.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEngHelm
-  name: eng helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/eng_helm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/eng_helm.rsi
-    type: Icon
-  - sprite: Clothing/Head/eng_helm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEnosAdlai
-  name: enos adlai
-  description: ''
-  components:
-  - sprite: Clothing/Head/enos_adlai_1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/enos_adlai_1.rsi
-    type: Icon
-  - sprite: Clothing/Head/enos_adlai_1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEvaRig
-  name: EVA rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/eva_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/eva_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/eva_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatEvaRigSealed
-  name: EVA rig sealed
-  description: ''
-  components:
-  - sprite: Clothing/Head/eva_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/eva_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/eva_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatFeatherTrilby
-  name: feather trilby
-  description: ''
-  components:
-  - sprite: Clothing/Head/feather_trilby.rsi
-    type: Sprite
-  - sprite: Clothing/Head/feather_trilby.rsi
-    type: Icon
-  - sprite: Clothing/Head/feather_trilby.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatFedora
-  name: fedora
-  description: ''
-  components:
-  - sprite: Clothing/Head/fedora.rsi
-    type: Sprite
-  - sprite: Clothing/Head/fedora.rsi
-    type: Icon
-  - sprite: Clothing/Head/fedora.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatFez
-  name: fez
-  description: ''
-  components:
-  - sprite: Clothing/Head/fez.rsi
-    type: Sprite
-  - sprite: Clothing/Head/fez.rsi
-    type: Icon
-  - sprite: Clothing/Head/fez.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatFlatCap
-  name: flat cap
-  description: ''
-  components:
-  - sprite: Clothing/Head/flat_cap.rsi
-    type: Sprite
-  - sprite: Clothing/Head/flat_cap.rsi
-    type: Icon
-  - sprite: Clothing/Head/flat_cap.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatGentcap
-  name: gent cap
-  description: ''
-  components:
-  - sprite: Clothing/Head/gentcap.rsi
-    type: Sprite
-  - sprite: Clothing/Head/gentcap.rsi
-    type: Icon
-  - sprite: Clothing/Head/gentcap.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatGladiator
-  name: gladiator
-  description: ''
-  components:
-  - sprite: Clothing/Head/gladiator.rsi
-    type: Sprite
-  - sprite: Clothing/Head/gladiator.rsi
-    type: Icon
-  - sprite: Clothing/Head/gladiator.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatGreenbandana
-  name: greenbandana
-  description: ''
-  components:
-  - sprite: Clothing/Head/greenbandana.rsi
-    type: Sprite
-  - sprite: Clothing/Head/greenbandana.rsi
-    type: Icon
-  - sprite: Clothing/Head/greenbandana.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatGreensoft
-  name: greensoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/greensoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/greensoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/greensoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatGreensoftFlipped
-  name: greensoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/greensoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/greensoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/greensoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatGreysoft
-  name: greysoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/greysoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/greysoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/greysoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatGreysoftFlipped
-  name: greysoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/greysoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/greysoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/greysoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHackerRig
-  name: hacker rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/hacker_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hacker_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/hacker_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHackerRigSealed
-  name: hacker rig sealed
-  description: ''
-  components:
-  - sprite: Clothing/Head/hacker_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hacker_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/hacker_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHairflower
-  name: hairflower
-  description: ''
-  components:
-  - sprite: Clothing/Head/hairflower.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hairflower.rsi
-    type: Icon
-  - sprite: Clothing/Head/hairflower.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHardhatDblue
-  name: hardhat dblue
-  description: ''
-  components:
-  - sprite: Clothing/Head/hardhat0_dblue.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hardhat0_dblue.rsi
-    type: Icon
-  - sprite: Clothing/Head/hardhat0_dblue.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHardhat Orange
-  name: hardhat orange
-  description: ''
-  components:
-  - sprite: Clothing/Head/hardhat0_orange.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hardhat0_orange.rsi
-    type: Icon
-  - sprite: Clothing/Head/hardhat0_orange.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHardhatPumpkin
-  name: hardhat pumpkin
-  description: ''
-  components:
-  - sprite: Clothing/Head/hardhat0_pumpkin.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hardhat0_pumpkin.rsi
-    type: Icon
-  - sprite: Clothing/Head/hardhat0_pumpkin.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHardhatRed
-  name: hardhat red
-  description: ''
-  components:
-  - sprite: Clothing/Head/hardhat0_red.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hardhat0_red.rsi
-    type: Icon
-  - sprite: Clothing/Head/hardhat0_red.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHardhatWhite
-  name: hardhat white
-  description: ''
-  components:
-  - sprite: Clothing/Head/hardhat0_white.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hardhat0_white.rsi
-    type: Icon
-  - sprite: Clothing/Head/hardhat0_white.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHardhatYellow
-  name: hardhat yellow
-  description: ''
-  components:
-  - sprite: Clothing/Head/hardhat0_yellow.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hardhat0_yellow.rsi
-    type: Icon
-  - sprite: Clothing/Head/hardhat0_yellow.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHardhatPumpkinAlt
-  name: hardhat pumpkin (alt)
-  description: ''
-  components:
-  - sprite: Clothing/Head/hardhat1_pumpkin.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hardhat1_pumpkin.rsi
-    type: Icon
-  - sprite: Clothing/Head/hardhat1_pumpkin.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHasturhood
-  name: hasturhood
-  description: ''
-  components:
-  - sprite: Clothing/Head/hasturhood.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hasturhood.rsi
-    type: Icon
-  - sprite: Clothing/Head/hasturhood.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHazardRig
-  name: hazard rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/hazard_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hazard_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/hazard_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHazardRigSealed
-  name: hazard rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/hazard_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hazard_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/hazard_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHeadslime
-  name: headslime
-  description: ''
-  components:
-  - sprite: Clothing/Head/headslime.rsi
-    type: Sprite
-  - sprite: Clothing/Head/headslime.rsi
-    type: Icon
-  - sprite: Clothing/Head/headslime.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHelmet
-  name: helmet
-  description: ''
-  components:
-  - sprite: Clothing/Head/helmet.rsi
-    type: Sprite
-  - sprite: Clothing/Head/helmet.rsi
-    type: Icon
-  - sprite: Clothing/Head/helmet.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHelmetold
-  name: helmet old
-  description: ''
-  components:
-  - sprite: Clothing/Head/helmetold.rsi
-    type: Sprite
-  - sprite: Clothing/Head/helmetold.rsi
-    type: Icon
-  - sprite: Clothing/Head/helmetold.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHgpiratecap
-  name: hg pirate cap
-  description: ''
-  components:
-  - sprite: Clothing/Head/hgpiratecap.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hgpiratecap.rsi
-    type: Icon
-  - sprite: Clothing/Head/hgpiratecap.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHmHelmet
-  name: HM helmet
-  description: ''
-  components:
-  - sprite: Clothing/Head/hm_helmet.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hm_helmet.rsi
-    type: Icon
-  - sprite: Clothing/Head/hm_helmet.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHopcap
-  name: hop cap
-  description: ''
-  components:
-  - sprite: Clothing/Head/hopcap.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hopcap.rsi
-    type: Icon
-  - sprite: Clothing/Head/hopcap.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatHoshat
-  name: HoS hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/hoshat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/hoshat.rsi
-    type: Icon
-  - sprite: Clothing/Head/hoshat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatIhsvoidhelm
-  name: IHS voidhelm
-  description: ''
-  components:
-  - sprite: Clothing/Head/ihsvoidhelm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ihsvoidhelm.rsi
-    type: Icon
-  - sprite: Clothing/Head/ihsvoidhelm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatIhsvoidhelmOn
-  name: IHS voidhelm (on)
-  description: ''
-  components:
-  - sprite: Clothing/Head/ihsvoidhelm_on.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ihsvoidhelm_on.rsi
-    type: Icon
-  - sprite: Clothing/Head/ihsvoidhelm_on.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatIhsRig
-  name: IHS rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/ihs_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ihs_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/ihs_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatIhsRigSealed
-  name: IHS rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/ihs_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ihs_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/ihs_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatKitten
-  name: kitten
-  description: ''
-  components:
-  - sprite: Clothing/Head/kitten.rsi
-    type: Sprite
-  - sprite: Clothing/Head/kitten.rsi
-    type: Icon
-  - sprite: Clothing/Head/kitten.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatKitty
-  name: kitty
-  description: ''
-  components:
-  - sprite: Clothing/Head/kitty.rsi
-    type: Sprite
-  - sprite: Clothing/Head/kitty.rsi
-    type: Icon
-  - sprite: Clothing/Head/kitty.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatKittyinner
-  name: kitty inner
-  description: ''
-  components:
-  - sprite: Clothing/Head/kittyinner.rsi
-    type: Sprite
-  - sprite: Clothing/Head/kittyinner.rsi
-    type: Icon
-  - sprite: Clothing/Head/kittyinner.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatKrinnHat
-  name: krinn hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/krinn_hat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/krinn_hat.rsi
-    type: Icon
-  - sprite: Clothing/Head/krinn_hat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatLightRiot
-  name: light riot
-  description: ''
-  components:
-  - sprite: Clothing/Head/light_riot.rsi
-    type: Sprite
-  - sprite: Clothing/Head/light_riot.rsi
-    type: Icon
-  - sprite: Clothing/Head/light_riot.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatLightRiotOn
-  name: light riot (on)
-  description: ''
-  components:
-  - sprite: Clothing/Head/light_riot_on.rsi
-    type: Sprite
-  - sprite: Clothing/Head/light_riot_on.rsi
-    type: Icon
-  - sprite: Clothing/Head/light_riot_on.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMagus
-  name: magus
-  description: ''
-  components:
-  - sprite: Clothing/Head/magus.rsi
-    type: Sprite
-  - sprite: Clothing/Head/magus.rsi
-    type: Icon
-  - sprite: Clothing/Head/magus.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMailman
-  name: mailman
-  description: ''
-  components:
-  - sprite: Clothing/Head/mailman.rsi
-    type: Sprite
-  - sprite: Clothing/Head/mailman.rsi
-    type: Icon
-  - sprite: Clothing/Head/mailman.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMarisa
-  name: marisa
-  description: ''
-  components:
-  - sprite: Clothing/Head/marisa.rsi
-    type: Sprite
-  - sprite: Clothing/Head/marisa.rsi
-    type: Icon
-  - sprite: Clothing/Head/marisa.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMedicalHelm
-  name: medical helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/medical_helm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/medical_helm.rsi
-    type: Icon
-  - sprite: Clothing/Head/medical_helm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMedicalRig
-  name: medical rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/medical_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/medical_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/medical_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMedicalRigSealed
-  name: medical rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/medical_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/medical_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/medical_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMercRig
-  name: merc rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/merc_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/merc_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/merc_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMercRigSealed
-  name: merc rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/merc_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/merc_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/merc_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMetroid
-  name: metroid
-  description: ''
-  components:
-  - sprite: Clothing/Head/metroid.rsi
-    type: Sprite
-  - sprite: Clothing/Head/metroid.rsi
-    type: Icon
-  - sprite: Clothing/Head/metroid.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMimesoft
-  name: mimesoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/mimesoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/mimesoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/mimesoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMimesoftFlipped
-  name: mimesoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/mimesoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/mimesoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/mimesoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMiningHelm
-  name: mining helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/mining_helm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/mining_helm.rsi
-    type: Icon
-  - sprite: Clothing/Head/mining_helm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMonkey
-  name: monkey
-  description: ''
-  components:
-  - sprite: Clothing/Head/monkey.rsi
-    type: Sprite
-  - sprite: Clothing/Head/monkey.rsi
-    type: Icon
-  - sprite: Clothing/Head/monkey.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMouseBrown
-  name: mouse brown
-  description: ''
-  components:
-  - sprite: Clothing/Head/mouse_brown.rsi
-    type: Sprite
-  - sprite: Clothing/Head/mouse_brown.rsi
-    type: Icon
-  - sprite: Clothing/Head/mouse_brown.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMouseGray
-  name: mouse gray
-  description: ''
-  components:
-  - sprite: Clothing/Head/mouse_gray.rsi
-    type: Sprite
-  - sprite: Clothing/Head/mouse_gray.rsi
-    type: Icon
-  - sprite: Clothing/Head/mouse_gray.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatMouseWhite
-  name: mouse white
-  description: ''
-  components:
-  - sprite: Clothing/Head/mouse_white.rsi
-    type: Sprite
-  - sprite: Clothing/Head/mouse_white.rsi
-    type: Icon
-  - sprite: Clothing/Head/mouse_white.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNeilpattersonHat
-  name: neil patterson hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/neilpatterson0_hat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/neilpatterson0_hat.rsi
-    type: Icon
-  - sprite: Clothing/Head/neilpatterson0_hat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNeilpatterson1Hat
-  name: neil patterson1 hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/neilpatterson1_hat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/neilpatterson1_hat.rsi
-    type: Icon
-  - sprite: Clothing/Head/neilpatterson1_hat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNinjaRig
-  name: ninja rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/ninja_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ninja_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/ninja_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNinjaRigSealed
-  name: ninja rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/ninja_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ninja_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/ninja_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNorahBriggs
-  name: norah briggs
-  description: ''
-  components:
-  - sprite: Clothing/Head/norah_briggs_1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/norah_briggs_1.rsi
-    type: Icon
-  - sprite: Clothing/Head/norah_briggs_1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNorahBriggsup
-  name: norah briggs (up)
-  description: ''
-  components:
-  - sprite: Clothing/Head/norah_briggs_1up.rsi
-    type: Sprite
-  - sprite: Clothing/Head/norah_briggs_1up.rsi
-    type: Icon
-  - sprite: Clothing/Head/norah_briggs_1up.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNunHood
-  name: nun hood
-  description: ''
-  components:
-  - sprite: Clothing/Head/nun_hood.rsi
-    type: Sprite
-  - sprite: Clothing/Head/nun_hood.rsi
-    type: Icon
-  - sprite: Clothing/Head/nun_hood.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNursehat
-  name: nurse hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/nursehat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/nursehat.rsi
-    type: Icon
-  - sprite: Clothing/Head/nursehat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatNymph
-  name: nymph
-  description: ''
-  components:
-  - sprite: Clothing/Head/nymph.rsi
-    type: Sprite
-  - sprite: Clothing/Head/nymph.rsi
-    type: Icon
-  - sprite: Clothing/Head/nymph.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatOfficercap
-  name: officer cap
-  description: ''
-  components:
-  - sprite: Clothing/Head/officercap.rsi
-    type: Sprite
-  - sprite: Clothing/Head/officercap.rsi
-    type: Icon
-  - sprite: Clothing/Head/officercap.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatOrangesoft
-  name: orangesoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/orangesoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/orangesoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/orangesoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatOrangesoftFlipped
-  name: orangesoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/orangesoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/orangesoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/orangesoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatOrangeBandana
-  name: orange bandana
-  description: ''
-  components:
-  - sprite: Clothing/Head/orange_bandana.rsi
-    type: Sprite
-  - sprite: Clothing/Head/orange_bandana.rsi
-    type: Icon
-  - sprite: Clothing/Head/orange_bandana.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPai-cat
-  name: pai-cat
-  description: ''
-  components:
-  - sprite: Clothing/Head/pai-cat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/pai-cat.rsi
-    type: Icon
-  - sprite: Clothing/Head/pai-cat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPai-monkey
-  name: pai-monkey
-  description: ''
-  components:
-  - sprite: Clothing/Head/pai-monkey.rsi
-    type: Sprite
-  - sprite: Clothing/Head/pai-monkey.rsi
-    type: Icon
-  - sprite: Clothing/Head/pai-monkey.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPai-mouse
-  name: pai-mouse
-  description: ''
-  components:
-  - sprite: Clothing/Head/pai-mouse.rsi
-    type: Sprite
-  - sprite: Clothing/Head/pai-mouse.rsi
-    type: Icon
-  - sprite: Clothing/Head/pai-mouse.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPai-repairbot
-  name: pai-repairbot
-  description: ''
-  components:
-  - sprite: Clothing/Head/pai-repairbot.rsi
-    type: Sprite
-  - sprite: Clothing/Head/pai-repairbot.rsi
-    type: Icon
-  - sprite: Clothing/Head/pai-repairbot.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPaintedwelding
-  name: painted welding mask
-  description: ''
-  components:
-  - sprite: Clothing/Head/paintedwelding.rsi
-    type: Sprite
-  - sprite: Clothing/Head/paintedwelding.rsi
-    type: Icon
-  - sprite: Clothing/Head/paintedwelding.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPaintedweldingup
-  name: painted welding mask (up)
-  description: ''
-  components:
-  - sprite: Clothing/Head/paintedweldingup.rsi
-    type: Sprite
-  - sprite: Clothing/Head/paintedweldingup.rsi
-    type: Icon
-  - sprite: Clothing/Head/paintedweldingup.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPaper
-  name: paper
-  description: ''
-  components:
-  - sprite: Clothing/Head/paper.rsi
-    type: Sprite
-  - sprite: Clothing/Head/paper.rsi
-    type: Icon
-  - sprite: Clothing/Head/paper.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPetehat
-  name: pete hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/petehat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/petehat.rsi
-    type: Icon
-  - sprite: Clothing/Head/petehat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPhilosopherWig
-  name: philosopher wig
-  description: ''
-  components:
-  - sprite: Clothing/Head/philosopher_wig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/philosopher_wig.rsi
-    type: Icon
-  - sprite: Clothing/Head/philosopher_wig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPirate
-  name: pirate
-  description: ''
-  components:
-  - sprite: Clothing/Head/pirate.rsi
-    type: Sprite
-  - sprite: Clothing/Head/pirate.rsi
-    type: Icon
-  - sprite: Clothing/Head/pirate.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPlaguedoctor
-  name: plague doctor
-  description: ''
-  components:
-  - sprite: Clothing/Head/plaguedoctor.rsi
-    type: Sprite
-  - sprite: Clothing/Head/plaguedoctor.rsi
-    type: Icon
-  - sprite: Clothing/Head/plaguedoctor.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPolicehelm
-  name: police helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/policehelm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/policehelm.rsi
-    type: Icon
-  - sprite: Clothing/Head/policehelm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPurplesoft
-  name: purple soft
-  description: ''
-  components:
-  - sprite: Clothing/Head/purplesoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/purplesoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/purplesoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPurplesoftFlipped
-  name: purplesoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/purplesoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/purplesoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/purplesoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatPwig
-  name: pwig
-  description: ''
-  components:
-  - sprite: Clothing/Head/pwig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/pwig.rsi
-    type: Icon
-  - sprite: Clothing/Head/pwig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRad
-  name: rad
-  description: ''
-  components:
-  - sprite: Clothing/Head/rad.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rad.rsi
-    type: Icon
-  - sprite: Clothing/Head/rad.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRainbowsoft
-  name: rainbowsoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/rainbowsoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rainbowsoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/rainbowsoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRainbowsoftFlipped
-  name: rainbowsoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/rainbowsoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rainbowsoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/rainbowsoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRedcoat
-  name: redcoat
-  description: ''
-  components:
-  - sprite: Clothing/Head/redcoat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/redcoat.rsi
-    type: Icon
-  - sprite: Clothing/Head/redcoat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRedsoft
-  name: redsoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/redsoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/redsoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/redsoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRedsoftFlipped
-  name: redsoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/redsoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/redsoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/redsoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRedwizard
-  name: red wizard
-  description: ''
-  components:
-  - sprite: Clothing/Head/redwizard.rsi
-    type: Sprite
-  - sprite: Clothing/Head/redwizard.rsi
-    type: Icon
-  - sprite: Clothing/Head/redwizard.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRepairbot
-  name: repairbot
-  description: ''
-  components:
-  - sprite: Clothing/Head/repairbot.rsi
-    type: Sprite
-  - sprite: Clothing/Head/repairbot.rsi
-    type: Icon
-  - sprite: Clothing/Head/repairbot.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRichard
-  name: richard
-  description: ''
-  components:
-  - sprite: Clothing/Head/richard.rsi
-    type: Sprite
-  - sprite: Clothing/Head/richard.rsi
-    type: Icon
-  - sprite: Clothing/Head/richard.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-old
-  name: rig-old
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-old.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-old.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-old.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-atmos
-  name: rig-atmos
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-atmos.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-atmos.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-atmos.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-engineering
-  name: rig-engineering
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-engineering.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-engineering.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-engineering.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-hazardhardsuit
-  name: rig-hazardhardsuit
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-hazardhardsuit.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-hazardhardsuit.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-hazardhardsuit.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-medical
-  name: rig-medical
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-medical.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-medical.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-medical.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-mining
-  name: rig-mining
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-mining.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-mining.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-mining.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-sectg
-  name: rig-sectg
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-sectg.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-sectg.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-sectg.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-syndie
-  name: rig-syndie
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-syndie.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-syndie.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-syndie.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-white
-  name: rig-white
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-white.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-white.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-white.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRig-wiz
-  name: rig-wiz
-  description: ''
-  components:
-  - sprite: Clothing/Head/rig-wiz.rsi
-    type: Sprite
-  - sprite: Clothing/Head/rig-wiz.rsi
-    type: Icon
-  - sprite: Clothing/Head/rig-wiz.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatRiot
-  name: riot
-  description: ''
-  components:
-  - sprite: Clothing/Head/riot.rsi
-    type: Sprite
-  - sprite: Clothing/Head/riot.rsi
-    type: Icon
-  - sprite: Clothing/Head/riot.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatS-ninja
-  name: s-ninja
-  description: ''
-  components:
-  - sprite: Clothing/Head/s-ninja.rsi
-    type: Sprite
-  - sprite: Clothing/Head/s-ninja.rsi
-    type: Icon
-  - sprite: Clothing/Head/s-ninja.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSantahat
-  name: santa hat
-  description: ''
-  components:
-  - sprite: Clothing/Head/santahat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/santahat.rsi
-    type: Icon
-  - sprite: Clothing/Head/santahat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatScaf
-  name: scaf
-  description: ''
-  components:
-  - sprite: Clothing/Head/scaf.rsi
-    type: Sprite
-  - sprite: Clothing/Head/scaf.rsi
-    type: Icon
-  - sprite: Clothing/Head/scaf.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatScienceRig
-  name: science rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/science_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/science_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/science_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatScienceRigSealed
-  name: science rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/science_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/science_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/science_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSecsoft
-  name: secsoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/secsoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/secsoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/secsoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSecsoftFlipped
-  name: secsoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/secsoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/secsoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/secsoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSecurity
-  name: security
-  description: ''
-  components:
-  - sprite: Clothing/Head/security.rsi
-    type: Sprite
-  - sprite: Clothing/Head/security.rsi
-    type: Icon
-  - sprite: Clothing/Head/security.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSecurityRig
-  name: security rig
-  description: ''
-  components:
-  - sprite: Clothing/Head/security_rig.rsi
-    type: Sprite
-  - sprite: Clothing/Head/security_rig.rsi
-    type: Icon
-  - sprite: Clothing/Head/security_rig.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSecurityRigSealed
-  name: security rig (sealed)
-  description: ''
-  components:
-  - sprite: Clothing/Head/security_rig_sealed.rsi
-    type: Sprite
-  - sprite: Clothing/Head/security_rig_sealed.rsi
-    type: Icon
-  - sprite: Clothing/Head/security_rig_sealed.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSecHelm
-  name: sec helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/sec_helm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/sec_helm.rsi
-    type: Icon
-  - sprite: Clothing/Head/sec_helm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  parent: HatBase
-  id: HatSkub
-  name: Skub Hat
-  description: 'Best paired with the Skub Suit.'
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/skubhead.rsi
-  - type: Icon
-    sprite: Clothing/Head/skubhead.rsi
-  - type: Clothing
-    sprite: Clothing/Head/skubhead.rsi
-
-- type: entity
-  id: HatSombrero
-  name: sombrero
-  description: ''
-  components:
-  - sprite: Clothing/Head/sombrero.rsi
-    type: Sprite
-  - sprite: Clothing/Head/sombrero.rsi
-    type: Icon
-  - sprite: Clothing/Head/sombrero.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSpace
-  name: space
-  description: ''
-  components:
-  - sprite: Clothing/Head/space.rsi
-    type: Sprite
-  - sprite: Clothing/Head/space.rsi
-    type: Icon
-  - sprite: Clothing/Head/space.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSurgcapBlue
-  name: surgcap blue
-  description: ''
-  components:
-  - sprite: Clothing/Head/surgcap_blue.rsi
-    type: Sprite
-  - sprite: Clothing/Head/surgcap_blue.rsi
-    type: Icon
-  - sprite: Clothing/Head/surgcap_blue.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSurgcapGreen
-  name: surgcap green
-  description: ''
-  components:
-  - sprite: Clothing/Head/surgcap_green.rsi
-    type: Sprite
-  - sprite: Clothing/Head/surgcap_green.rsi
-    type: Icon
-  - sprite: Clothing/Head/surgcap_green.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSurgcapPurple
-  name: surgcap purple
-  description: ''
-  components:
-  - sprite: Clothing/Head/surgcap_purple.rsi
-    type: Sprite
-  - sprite: Clothing/Head/surgcap_purple.rsi
-    type: Icon
-  - sprite: Clothing/Head/surgcap_purple.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSwat-alt
-  name: swat-alt
-  description: ''
-  components:
-  - sprite: Clothing/Head/swat-alt.rsi
-    type: Sprite
-  - sprite: Clothing/Head/swat-alt.rsi
-    type: Icon
-  - sprite: Clothing/Head/swat-alt.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSwat
-  name: swat
-  description: ''
-  components:
-  - sprite: Clothing/Head/swat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/swat.rsi
-    type: Icon
-  - sprite: Clothing/Head/swat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSwathelm
-  name: swat helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/swathelm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/swathelm.rsi
-    type: Icon
-  - sprite: Clothing/Head/swathelm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSwatold
-  name: swat old
-  description: ''
-  components:
-  - sprite: Clothing/Head/swatold.rsi
-    type: Sprite
-  - sprite: Clothing/Head/swatold.rsi
-    type: Icon
-  - sprite: Clothing/Head/swatold.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSwatup
-  name: swat helm (up)
-  description: ''
-  components:
-  - sprite: Clothing/Head/swatup.rsi
-    type: Sprite
-  - sprite: Clothing/Head/swatup.rsi
-    type: Icon
-  - sprite: Clothing/Head/swatup.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black-blue
-  name: syndicate-helm-black-blue
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black-blue.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black-blue.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black-blue.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black-engie
-  name: syndicate-helm-black-engie
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black-engie.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black-engie.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black-engie.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black-engie1
-  name: syndicate-helm-black-engie1
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black-engie1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black-engie1.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black-engie1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black-green
-  name: syndicate-helm-black-green
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black-green.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black-green.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black-green.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black-med
-  name: syndicate-helm-black-med
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black-med.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black-med.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black-med.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black-orange
-  name: syndicate-helm-black-orange
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black-orange.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black-orange.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black-orange.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black-red
-  name: syndicate-helm-black-red
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black-red.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black-red.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black-red.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-black
-  name: syndicate-helm-black
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-black.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-black.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-black.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-blue
-  name: syndicate-helm-blue
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-blue.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-blue.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-blue.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-green-dark
-  name: syndicate-helm-green-dark
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-green-dark.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-green-dark.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-green-dark.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-green
-  name: syndicate-helm-green
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-green.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-green.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-green.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-orange
-  name: syndicate-helm-orange
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-orange.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-orange.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-orange.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-orangeLight
-  name: syndicate-helm-orange light
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-orange_light.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-orange_light.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-orange_light.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate-helm-orangeLight1
-  name: syndicate-helm-orange light1
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate-helm-orange_light1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate-helm-orange_light1.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate-helm-orange_light1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndicate
-  name: syndicate
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndicate.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndicate.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndicate.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatSyndieHelm
-  name: syndie helm
-  description: ''
-  components:
-  - sprite: Clothing/Head/syndie_helm.rsi
-    type: Sprite
-  - sprite: Clothing/Head/syndie_helm.rsi
-    type: Icon
-  - sprite: Clothing/Head/syndie_helm.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatThunderdome
-  name: thunderdome
-  description: ''
-  components:
-  - sprite: Clothing/Head/thunderdome.rsi
-    type: Sprite
-  - sprite: Clothing/Head/thunderdome.rsi
-    type: Icon
-  - sprite: Clothing/Head/thunderdome.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatTophat
-  name: tophat
-  description: ''
-  components:
-  - sprite: Clothing/Head/tophat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/tophat.rsi
-    type: Icon
-  - sprite: Clothing/Head/tophat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatUshankadown
-  name: ushanka (down)
-  description: ''
-  components:
-  - sprite: Clothing/Head/ushankadown.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ushankadown.rsi
-    type: Icon
-  - sprite: Clothing/Head/ushankadown.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatUshankaup
-  name: ushanka (up)
-  description: ''
-  components:
-  - sprite: Clothing/Head/ushankaup.rsi
-    type: Sprite
-  - sprite: Clothing/Head/ushankaup.rsi
-    type: Icon
-  - sprite: Clothing/Head/ushankaup.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatV62
-  name: v62
-  description: ''
-  components:
-  - sprite: Clothing/Head/v62.rsi
-    type: Sprite
-  - sprite: Clothing/Head/v62.rsi
-    type: Icon
-  - sprite: Clothing/Head/v62.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatViking
-  name: viking
-  description: ''
-  components:
-  - sprite: Clothing/Head/viking.rsi
-    type: Sprite
-  - sprite: Clothing/Head/viking.rsi
-    type: Icon
-  - sprite: Clothing/Head/viking.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatVioletwizard
-  name: violetwizard
-  description: ''
-  components:
-  - sprite: Clothing/Head/violetwizard.rsi
-    type: Sprite
-  - sprite: Clothing/Head/violetwizard.rsi
-    type: Icon
-  - sprite: Clothing/Head/violetwizard.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatVoid
-  name: void
-  description: ''
-  components:
-  - sprite: Clothing/Head/void.rsi
-    type: Sprite
-  - sprite: Clothing/Head/void.rsi
-    type: Icon
-  - sprite: Clothing/Head/void.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatWelding
-  name: welding mask
-  description: ''
-  components:
-  - sprite: Clothing/Head/welding.rsi
-    type: Sprite
-  - sprite: Clothing/Head/welding.rsi
-    type: Icon
-  - sprite: Clothing/Head/welding.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatWeldingup
-  name: welding mask (up)
-  description: ''
-  components:
-  - sprite: Clothing/Head/weldingup.rsi
-    type: Sprite
-  - sprite: Clothing/Head/weldingup.rsi
-    type: Icon
-  - sprite: Clothing/Head/weldingup.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatWitch
-  name: witch
-  description: ''
-  components:
-  - sprite: Clothing/Head/witch.rsi
-    type: Sprite
-  - sprite: Clothing/Head/witch.rsi
-    type: Icon
-  - sprite: Clothing/Head/witch.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatWizard-fake
-  name: wizard-fake
-  description: ''
-  components:
-  - sprite: Clothing/Head/wizard-fake.rsi
-    type: Sprite
-  - sprite: Clothing/Head/wizard-fake.rsi
-    type: Icon
-  - sprite: Clothing/Head/wizard-fake.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatWizard
-  name: wizard
-  description: ''
-  components:
-  - sprite: Clothing/Head/wizard.rsi
-    type: Sprite
-  - sprite: Clothing/Head/wizard.rsi
-    type: Icon
-  - sprite: Clothing/Head/wiza
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatXenom
-  name: xenom
-  description: ''
-  components:
-  - sprite: Clothing/Head/xenom.rsi
-    type: Sprite
-  - sprite: Clothing/Head/xenom.rsi
-    type: Icon
-  - sprite: Clothing/Head/xenom.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatXenos
-  name: xenos
-  description: ''
-  components:
-  - sprite: Clothing/Head/xenos.rsi
-    type: Sprite
-  - sprite: Clothing/Head/xenos.rsi
-    type: Icon
-  - sprite: Clothing/Head/xenos.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatXmashat
-  name: xmashat
-  description: ''
-  components:
-  - sprite: Clothing/Head/xmashat.rsi
-    type: Sprite
-  - sprite: Clothing/Head/xmashat.rsi
-    type: Icon
-  - sprite: Clothing/Head/xmashat.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatYellowsoft
-  name: yellowsoft
-  description: ''
-  components:
-  - sprite: Clothing/Head/yellowsoft.rsi
-    type: Sprite
-  - sprite: Clothing/Head/yellowsoft.rsi
-    type: Icon
-  - sprite: Clothing/Head/yellowsoft.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatYellowsoftFlipped
-  name: yellowsoft flipped
-  description: ''
-  components:
-  - sprite: Clothing/Head/yellowsoft_flipped.rsi
-    type: Sprite
-  - sprite: Clothing/Head/yellowsoft_flipped.rsi
-    type: Icon
-  - sprite: Clothing/Head/yellowsoft_flipped.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatYukiMatsuda
-  name: yuki matsuda
-  description: ''
-  components:
-  - sprite: Clothing/Head/yuki_matsuda_1.rsi
-    type: Sprite
-  - sprite: Clothing/Head/yuki_matsuda_1.rsi
-    type: Icon
-  - sprite: Clothing/Head/yuki_matsuda_1.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatYukiMatsudaup
-  name: yuki matsuda (up)
-  description: ''
-  components:
-  - sprite: Clothing/Head/yuki_matsuda_1up.rsi
-    type: Sprite
-  - sprite: Clothing/Head/yuki_matsuda_1up.rsi
-    type: Icon
-  - sprite: Clothing/Head/yuki_matsuda_1up.rsi
-    type: Clothing
-  parent: HatBase
-
-- type: entity
-  id: HatZhanScarf
-  name: zhan scarf
-  description: ''
-  components:
-  - sprite: Clothing/Head/zhan_scarf.rsi
-    type: Sprite
-  - sprite: Clothing/Head/zhan_scarf.rsi
-    type: Icon
-  - sprite: Clothing/Head/zhan_scarf.rsi
-    type: Clothing
-  parent: HatBase
diff --git a/Resources/Prototypes/Entities/Mobs/dummy_npcs.yml b/Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Mobs/dummy_npcs.yml
rename to Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml
diff --git a/Resources/Prototypes/Entities/Mobs/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Mobs/admin_ghost.yml
rename to Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
diff --git a/Resources/Prototypes/Entities/Mobs/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Mobs/observer.yml
rename to Resources/Prototypes/Entities/Mobs/Player/observer.yml
diff --git a/Resources/Prototypes/Entities/Mobs/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Mobs/human.yml
rename to Resources/Prototypes/Entities/Mobs/Species/human.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/drinks.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/food.yml b/Resources/Prototypes/Entities/Objects/Consumable/food.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/food.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/food.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/food_containers.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/food_containers.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml b/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/trash.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/trash.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/trash.yml
diff --git a/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
diff --git a/Resources/Prototypes/Entities/Items/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/pda.yml
rename to Resources/Prototypes/Entities/Objects/Devices/pda.yml
diff --git a/Resources/Prototypes/Entities/Items/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/bike_horn.yml
rename to Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
diff --git a/Resources/Prototypes/Entities/Items/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/dice.yml
rename to Resources/Prototypes/Entities/Objects/Fun/dice.yml
diff --git a/Resources/Prototypes/Entities/Items/Instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Items/Instruments.yml
rename to Resources/Prototypes/Entities/Objects/Fun/instruments.yml
index 58dd57b277..cf37a97409 100644
--- a/Resources/Prototypes/Entities/Items/Instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
@@ -10,6 +10,8 @@
     interfaces:
     - key: enum.InstrumentUiKey.Key
       type: InstrumentBoundUserInterface
+  - type: Item
+    Size: 24
 
 - type: entity
   name: synthesizer
diff --git a/Resources/Prototypes/Entities/Items/skub.yml b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/skub.yml
rename to Resources/Prototypes/Entities/Objects/Fun/skub.yml
diff --git a/Resources/Prototypes/Entities/Items/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/toys.yml
rename to Resources/Prototypes/Entities/Objects/Fun/toys.yml
diff --git a/Resources/Prototypes/Entities/Items/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/bedsheets.yml
rename to Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
diff --git a/Resources/Prototypes/Entities/Items/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/fire_extinguisher.yml
rename to Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
diff --git a/Resources/Prototypes/Entities/Items/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/handcuffs.yml
rename to Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
diff --git a/Resources/Prototypes/Entities/Items/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/paper.yml
rename to Resources/Prototypes/Entities/Objects/Misc/paper.yml
diff --git a/Resources/Prototypes/Entities/Items/teleporters.yml b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/teleporters.yml
rename to Resources/Prototypes/Entities/Objects/Misc/teleporters.yml
diff --git a/Resources/Prototypes/Entities/Items/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/utensils.yml
rename to Resources/Prototypes/Entities/Objects/Misc/utensils.yml
diff --git a/Resources/Prototypes/Entities/Items/light_bulb.yml b/Resources/Prototypes/Entities/Objects/Power/light_bulb.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/light_bulb.yml
rename to Resources/Prototypes/Entities/Objects/Power/light_bulb.yml
diff --git a/Resources/Prototypes/Entities/Items/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/powercells.yml
rename to Resources/Prototypes/Entities/Objects/Power/powercells.yml
diff --git a/Resources/Prototypes/Entities/Items/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/chemistry.yml
rename to Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
diff --git a/Resources/Prototypes/Entities/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
similarity index 100%
rename from Resources/Prototypes/Entities/janitor.yml
rename to Resources/Prototypes/Entities/Objects/Specific/janitor.yml
diff --git a/Resources/Prototypes/Entities/Items/medical.yml b/Resources/Prototypes/Entities/Objects/Specific/medical.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/medical.yml
rename to Resources/Prototypes/Entities/Objects/Specific/medical.yml
diff --git a/Resources/Prototypes/Entities/Items/flashlight.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/flashlight.yml
rename to Resources/Prototypes/Entities/Objects/Tools/flashlight.yml
diff --git a/Resources/Prototypes/Entities/Items/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/toolbox.yml
rename to Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
diff --git a/Resources/Prototypes/Entities/Items/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
similarity index 99%
rename from Resources/Prototypes/Entities/Items/tools.yml
rename to Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 3b16a16071..87dd6e570a 100644
--- a/Resources/Prototypes/Entities/Items/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -244,6 +244,7 @@
           state: drill_bolt
           useSound: /Audio/Items/drill_use.ogg
           changeSound: /Audio/Items/change_drill.ogg
+
 - type: entity
   name: RCD
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Toy/boxes.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Toy/cartridges.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Toy/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Toy/speedloaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/Toy/speedloaders.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/sound_collections.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/sound_collections.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml
diff --git a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
diff --git a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
diff --git a/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
diff --git a/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cleaver.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Weapons/kitchen.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Melee/cleaver.yml
diff --git a/Resources/Prototypes/Entities/Items/Weapons/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Weapons/mining.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
diff --git a/Resources/Prototypes/Entities/Items/Weapons/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Weapons/spear.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
diff --git a/Resources/Prototypes/Entities/Items/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/Weapons/security.yml
rename to Resources/Prototypes/Entities/Objects/Weapons/security.yml
diff --git a/Resources/Prototypes/Entities/Items/materials.yml b/Resources/Prototypes/Entities/Objects/materials.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/materials.yml
rename to Resources/Prototypes/Entities/Objects/materials.yml
diff --git a/Resources/Prototypes/Entities/Items/tiles.yml b/Resources/Prototypes/Entities/Objects/tiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/tiles.yml
rename to Resources/Prototypes/Entities/Objects/tiles.yml
diff --git a/Resources/Prototypes/Entities/Items/item_base.yml b/Resources/Prototypes/Entities/item_base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Items/item_base.yml
rename to Resources/Prototypes/Entities/item_base.yml
diff --git a/Resources/Prototypes/Entities/Fluids/puddle.yml b/Resources/Prototypes/Entities/puddle.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Fluids/puddle.yml
rename to Resources/Prototypes/Entities/puddle.yml
diff --git a/Resources/Prototypes/Entities/stressTest.yml b/Resources/Prototypes/Entities/stressTest.yml
deleted file mode 100644
index 9fc7fe98ab..0000000000
--- a/Resources/Prototypes/Entities/stressTest.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: entity
-  id: StressTest
-  name: StressTest
-  components:
-  - type: Sprite
-    texture: Effects/explosion.png
-  - type: StressTestMovement
diff --git a/Resources/Prototypes/Entities/stress_test.yml b/Resources/Prototypes/Entities/stress_test.yml
new file mode 100644
index 0000000000..c21ac2af96
--- /dev/null
+++ b/Resources/Prototypes/Entities/stress_test.yml
@@ -0,0 +1,9 @@
+- type: entity
+  id: StressTest
+  name: stress test
+  components:
+  - type: Icon
+    texture: Effects/explosion.rsi/explosion.png
+  - type: Sprite
+    texture: Effects/explosion.rsi/explosion.png
+  - type: StressTestMovement
diff --git a/Resources/Prototypes/Construction/machines.yml b/Resources/Prototypes/Recipes/Construction/machines.yml
similarity index 100%
rename from Resources/Prototypes/Construction/machines.yml
rename to Resources/Prototypes/Recipes/Construction/machines.yml
diff --git a/Resources/Prototypes/Construction/misc.yml b/Resources/Prototypes/Recipes/Construction/misc.yml
similarity index 100%
rename from Resources/Prototypes/Construction/misc.yml
rename to Resources/Prototypes/Recipes/Construction/misc.yml
diff --git a/Resources/Prototypes/Construction/power.yml b/Resources/Prototypes/Recipes/Construction/power.yml
similarity index 100%
rename from Resources/Prototypes/Construction/power.yml
rename to Resources/Prototypes/Recipes/Construction/power.yml
diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
similarity index 100%
rename from Resources/Prototypes/Construction/structures.yml
rename to Resources/Prototypes/Recipes/Construction/structures.yml
diff --git a/Resources/Prototypes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
similarity index 100%
rename from Resources/Prototypes/Construction/weapons.yml
rename to Resources/Prototypes/Recipes/Construction/weapons.yml
diff --git a/Resources/Prototypes/Kitchen/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
similarity index 99%
rename from Resources/Prototypes/Kitchen/meal_recipes.yml
rename to Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index b3b3dde6bb..12a59cf5ef 100644
--- a/Resources/Prototypes/Kitchen/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1,4 +1,3 @@
-
 #Burgers
 - type: microwaveMealRecipe
   id: RecipeCheeseburger
diff --git a/Resources/Prototypes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
similarity index 100%
rename from Resources/Prototypes/Reactions/chemicals.yml
rename to Resources/Prototypes/Recipes/Reactions/chemicals.yml
diff --git a/Resources/Prototypes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
similarity index 100%
rename from Resources/Prototypes/Reactions/drinks.yml
rename to Resources/Prototypes/Recipes/Reactions/drinks.yml
diff --git a/Resources/Prototypes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
similarity index 100%
rename from Resources/Prototypes/Reactions/medicine.yml
rename to Resources/Prototypes/Recipes/Reactions/medicine.yml
diff --git a/Resources/Prototypes/Roles/Antags/Suspicion/SuspicionInnocent.yml b/Resources/Prototypes/Roles/Antags/Suspicion/suspicion_innocent.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Antags/Suspicion/SuspicionInnocent.yml
rename to Resources/Prototypes/Roles/Antags/Suspicion/suspicion_innocent.yml
diff --git a/Resources/Prototypes/Roles/Antags/Suspicion/SuspicionTraitor.yml b/Resources/Prototypes/Roles/Antags/Suspicion/suspicion_traitor.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Antags/Suspicion/SuspicionTraitor.yml
rename to Resources/Prototypes/Roles/Antags/Suspicion/suspicion_traitor.yml
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/CargoTechnician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Cargo/CargoTechnician.yml
rename to Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/Assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Civilian/Assistant.yml
rename to Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/Bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Civilian/Bartender.yml
rename to Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/Chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Civilian/Chef.yml
rename to Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/Clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Civilian/Clown.yml
rename to Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/Janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
similarity index 100%
rename from Resources/Prototypes/Roles/Jobs/Civilian/Janitor.yml
rename to Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml
index 8370198788..c4e1c951db 100644
--- a/Resources/Prototypes/SoundCollections/footsteps.yml
+++ b/Resources/Prototypes/SoundCollections/footsteps.yml
@@ -81,3 +81,8 @@
   - /Audio/Effects/Footsteps/asteroid3.ogg
   - /Audio/Effects/Footsteps/asteroid4.ogg
   - /Audio/Effects/Footsteps/asteroid5.ogg
+
+- type: soundCollection
+  id: footstep_snow
+  files:
+  - /Audio/Effects/Footsteps/snowstep.ogg
diff --git a/Resources/Prototypes/SoundCollections/toy_squeak.yml b/Resources/Prototypes/SoundCollections/toy_squeak.yml
index 06f7a9412e..fa626f486c 100644
--- a/Resources/Prototypes/SoundCollections/toy_squeak.yml
+++ b/Resources/Prototypes/SoundCollections/toy_squeak.yml
@@ -1,6 +1,6 @@
 - type: soundCollection
   id: ToySqueak
   files:
-  - /Audio/items/toys/toysqueak1.ogg
-  - /Audio/items/toys/toysqueak2.ogg
-  - /Audio/items/toys/toysqueak3.ogg
+  - /Audio/Items/toys/toysqueak1.ogg
+  - /Audio/Items/toys/toysqueak2.ogg
+  - /Audio/Items/toys/toysqueak3.ogg
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 4e06d3d85a..3de2ef26ed 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -267,7 +267,7 @@
   - space
   is_subfloor: false
   can_crowbar: false
-  footstep_sounds: snowstep
+  footstep_sounds: footstep_snow
   friction: 0.35
 
 - type: tile
diff --git a/Resources/Prototypes/Tiles/floors/hull/hull.yml b/Resources/Prototypes/Tiles/hull.yml
similarity index 100%
rename from Resources/Prototypes/Tiles/floors/hull/hull.yml
rename to Resources/Prototypes/Tiles/hull.yml
diff --git a/Resources/Prototypes/BarSigns.yml b/Resources/Prototypes/bar_signs.yml
similarity index 100%
rename from Resources/Prototypes/BarSigns.yml
rename to Resources/Prototypes/bar_signs.yml
diff --git a/Resources/Prototypes/MeleeWeaponAnimations/animations.yml b/Resources/Prototypes/melee_weapon_animations.yml
similarity index 100%
rename from Resources/Prototypes/MeleeWeaponAnimations/animations.yml
rename to Resources/Prototypes/melee_weapon_animations.yml
diff --git a/Resources/Prototypes/Catalog/Technologies/technologies.yml b/Resources/Prototypes/technologies.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/Technologies/technologies.yml
rename to Resources/Prototypes/technologies.yml
diff --git a/RobustToolbox b/RobustToolbox
index 5e448f20c0..bbbaef5da4 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 5e448f20c011a0dd5db78ac2dffe3f166bad52c9
+Subproject commit bbbaef5da4994fa1a23bfad0897dd628d6131ec1