Copyright Pass/Pruning | Part 1 - Clothing (#2539)

* Backpacks/Belts

* Cleans up Headsets

* Glasses and Gloves (Remind me to make an alpha for those stupid gloves)

* This commit has taken too many of my damn tears please appreciate it

* Holy SHIT that was an ordeal

* NECK and MASKS

* Jumpsuits/skirts

* Goodbye old color.rsi

* Outerclothing

* More Outerclothing

* It builds now

* More ID organization :)

* Gloves up to scratch

* My piss burns

* GLasses

* Added some more glasses

* Mission control we are ready for review

* Hotfix

* Cleanup

* Fix not commenting out whole line in contents

* duffelbag => duffel bag

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Fixed Breath Mask

* Scrubs

* New line

* Fixed Build

* Ok

* Update engivend.yml

* Fix meson glasses prototype in boxes

* Fix prototype name for sec glasses in boxes

* Fix InventoryHelpersTest janitor jumpsuit prototype

* Fix outdated stationstation prototypes

* Fix vending machines having invalid starting inventories

* Fix chapel vending machine

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Content.IntegrationTests/Tests/InventoryHelpersTest.cs

@@ -53,11 +53,11 @@ namespace Content.IntegrationTests.Tests
                 Assert.That(inventory.HasSlot(Slots.INNERCLOTHING));
                 Assert.That(inventory.HasSlot(Slots.IDCARD));
 
-                Assert.That(inventory.SpawnItemInSlot(Slots.INNERCLOTHING, "UniformJanitor", true));
+                Assert.That(inventory.SpawnItemInSlot(Slots.INNERCLOTHING, "ClothingUniformJumpsuitJanitor", true));
 
                 // Do we actually have the uniform equipped?
                 Assert.That(inventory.TryGetSlotItem(Slots.INNERCLOTHING, out ItemComponent uniform));
-                Assert.That(uniform.Owner.Prototype != null && uniform.Owner.Prototype.ID == "UniformJanitor");
+                Assert.That(uniform.Owner.Prototype != null && uniform.Owner.Prototype.ID == "ClothingUniformJumpsuitJanitor");
 
                 stun.Stun(1f);
 

Resources/Maps/saltern.yml

@@ -1,7 +1,7 @@
 meta:
   format: 2
-  name: DemoStation
+  name: Saltern
-  author: Space-Wizards
+  author: Buncha sickass mfers
   postmapinit: false
 tilemap:
   0: space
@@ -474,7 +474,7 @@ entities:
     rot: -1.5707963267948966 rad
     type: Transform
 - uid: 52
-  type: ShoesCoder
+  type: ClothingUnderSocksCoder
   components:
   - parent: 855
     pos: 47.437466,-6.6893435
@@ -490,14 +490,14 @@ entities:
   - useSound: /Audio/Items/jaws_pry.ogg
     type: Tool
 - uid: 54
-  type: GlovesLatex
+  type: ClothingHandsGlovesLatex
   components:
   - parent: 855
     pos: 22.086878,-4.4133806
     rot: -1.5707963267948966 rad
     type: Transform
 - uid: 55
-  type: GlovesLatex
+  type: ClothingHandsGlovesLatex
   components:
   - parent: 855
     pos: 21.618128,-4.4133806
@@ -712,14 +712,14 @@ entities:
     rot: -1.5707963267948966 rad
     type: Transform
 - uid: 82
-  type: Bling
+  type: ClothingNeckBling
   components:
   - parent: 855
     pos: -2.861164,18.612366
     rot: -1.5707963267948966 rad
     type: Transform
 - uid: 83
-  type: Bling
+  type: ClothingNeckBling
   components:
   - parent: 855
     pos: -2.564289,18.643616
@@ -971,19 +971,19 @@ entities:
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
 - uid: 117
-  type: HatHardhatYellow
+  type: ClothingHeadHatHardhatYellow
   components:
   - parent: 855
     pos: 31.357727,-4.36431
     type: Transform
 - uid: 118
-  type: HatHardhatWhite
+  type: ClothingHeadHatHardhatWhite
   components:
   - parent: 855
     pos: 31.623352,-4.14556
     type: Transform
 - uid: 119
-  type: HatHardhatRed
+  type: ClothingHeadHatHardhatRed
   components:
   - parent: 855
     pos: 31.201477,-4.05181
@@ -47190,7 +47190,7 @@ entities:
     rot: -1.5707963267948966 rad
     type: Transform
 - uid: 4144
-  type: MaskJoy
+  type: ClothingMaskJoy
   components:
   - parent: 855
     pos: 13.418978,24.555822

Resources/Maps/stationstation.yml

@@ -1977,7 +1977,7 @@ entities:
   - anchored: False
     type: Physics
 - uid: 225
-  type: OuterclothingVest
+  type: ClothingOuterVest
   components:
   - parent: 216
     pos: 1.412994,7.507263
@@ -2973,7 +2973,7 @@ entities:
     rot: -1.5707963267949 rad
     type: Transform
 - uid: 361
-  type: OuterclothingVest
+  type: ClothingOuterVest
   components:
   - parent: 216
     pos: 0.5223687,7.507263
@@ -3874,7 +3874,7 @@ entities:
   - anchored: False
     type: Physics
 - uid: 473
-  type: UniformEngineering
+  type: ClothingUniformJumpsuitEngineering
   components:
   - parent: 216
     pos: -0.6474335,-10.27245
@@ -3883,7 +3883,7 @@ entities:
   - anchored: False
     type: Physics
 - uid: 474
-  type: GasMaskClothing
+  type: ClothingMaskGas
   components:
   - parent: 216
     pos: -0.2880585,-10.69432
@@ -3892,7 +3892,7 @@ entities:
   - anchored: False
     type: Physics
 - uid: 475
-  type: OuterclothingVest
+  type: ClothingOuterVest
   components:
   - parent: 216
     pos: -0.9130585,-10.66307
@@ -3901,7 +3901,7 @@ entities:
   - anchored: False
     type: Physics
 - uid: 476
-  type: UtilityBeltClothingFilled
+  type: ClothingBeltUtilityFilled
   components:
   - parent: 216
     pos: -1.895102,-10.33495
@@ -3914,7 +3914,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - uid: 477
-  type: UtilityBeltClothingFilled
+  type: ClothingBeltUtilityFilled
   components:
   - parent: 216
     pos: -1.770102,-10.63182
@@ -3972,7 +3972,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - uid: 481
-  type: BackpackClothing
+  type: ClothingBackpack
   components:
   - parent: 216
     pos: -5.089887,7.591276
@@ -3985,7 +3985,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - uid: 482
-  type: BackpackClothing
+  type: ClothingBackpack
   components:
   - parent: 216
     pos: -4.683637,7.606901
@@ -3998,7 +3998,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - uid: 483
-  type: GlovesBlack
+  type: ClothingHandsGlovesColorBlack
   components:
   - parent: 216
     pos: -3.386762,7.466276
@@ -4348,7 +4348,7 @@ entities:
     rot: -1.5707963267949 rad
     type: Transform
 - uid: 527
-  type: GlovesLeather
+  type: ClothingHandsGlovesLeather
   components:
   - parent: 216
     pos: -4.332221,4.64238
@@ -4357,7 +4357,7 @@ entities:
   - anchored: False
     type: Physics
 - uid: 528
-  type: GlovesLeather
+  type: ClothingHandsGlovesLeather
   components:
   - parent: 216
     pos: -3.519721,4.64238
@@ -4366,7 +4366,7 @@ entities:
   - anchored: False
     type: Physics
 - uid: 529
-  type: GlovesLeather
+  type: ClothingHandsGlovesLeather
   components:
   - parent: 216
     pos: -2.597846,4.61113

Resources/Prototypes/Catalog/Fills/backpack.yml

@@ -1,7 +1,7 @@
 - type: entity
   abstract: true
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackClothingFilled
+  id: ClothingBackpackFilled
   components:
   - type: StorageFill
     contents:
@@ -9,8 +9,8 @@
 
 - type: entity
   abstract: true
-  parent: ClownPack
+  parent: ClothingBackpackClown
-  id: ClownPackFilled
+  id: ClothingBackpackClownFilled
   components:
   - type: StorageFill
     contents:
@@ -18,8 +18,8 @@
 
 - type: entity
   abstract: true
-  parent: SecPack
+  parent: ClothingBackpackSecurity
-  id: SecPackFilled
+  id: ClothingBackpackSecurityFilled
   components:
   - type: StorageFill
     contents:
@@ -29,8 +29,8 @@
 
 - type: entity
   abstract: true
-  parent: BackpackMedical
+  parent: ClothingBackpackMedical
-  id: BackpackMedicalFilled
+  id: ClothingBackpackMedicalFilled
   components:
   - type: StorageFill
     contents:
@@ -38,8 +38,8 @@
 
 - type: entity
   abstract: true
-  parent: BackpackCaptain
+  parent: ClothingBackpackCaptain
-  id: BackpackCaptainFilled
+  id: ClothingBackpackCaptainFilled
   components:
   - type: StorageFill
     contents:
@@ -49,8 +49,8 @@
 
 - type: entity
   abstract: true
-  parent: BackpackEngineering
+  parent: ClothingBackpackEngineering
-  id: BackpackEngineeringFilled
+  id: ClothingBackpackEngineeringFilled
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Catalog/Fills/belt.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: UtilityBeltClothingFilled #Change to ClothingBeltUtilityFilled
+  id: ClothingBeltUtilityFilled
-  parent: UtilityBeltClothing #Change to ClothingBeltUtility
+  parent: ClothingBeltUtility
   description: "Holds tools."
   suffix: Filled
   components:
@@ -13,17 +13,6 @@
       - name: Welder
       - name: Multitool
 
-- type: entity
-  id: UtilityBeltClothingFilledEvent
-  parent: UtilityBeltClothing
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - name: Crowbar
-      - name: Screwdriver
-      - name: Multitool
-
 - type: entity
   id: ClothingBeltChiefEngineerFilled
   parent: ClothingBeltChiefEngineer
@@ -44,7 +33,6 @@
   components:
   - type: StorageFill
     contents:
-      - name: SecGlasses
       - name: GrenadeFlashBang
       - name: GrenadeFlashBang
       - name: Stunbaton
@@ -60,6 +48,6 @@
     contents:
       - name: Soap #Make a soap group and pick between when i'm not lazy
       - name: SprayBottleSpaceCleaner
-      - name: # GrenadeChem
+      #- name: GrenadeChem
-      - name: # GrenadeChem
+      #- name: GrenadeChem
       - name: FlashlightLantern

Resources/Prototypes/Catalog/Fills/duffel.yml

@@ -0,0 +1,16 @@
+- type: entity
+  parent: ClothingBackpackDuffelMedical
+  id: ClothingBackpackDuffelSurgeryFilled
+  name: surgical duffel bag
+  description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools."
+  components:
+  - type: StorageFill
+    contents:
+      - name: Hemostat
+      - name: BoneSaw
+      - name: Drill
+      - name: Cautery
+      - name: Retractor
+      - name: Scalpel
+  - type: Storage
+    capacity: 30

Resources/Prototypes/Catalog/Fills/lockers.yml

@@ -5,7 +5,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: OuterclothingHazard
+      - name: ClothingOuterVestHazard
         prob: 0.4
       - name: FlashlightLantern
         prob: 0.7
@@ -21,11 +21,11 @@
         prob: 0.7
       - name: Multitool
         prob: 0.2
-      - name: UtilityBeltClothing
+      - name: ClothingBeltUtility
         prob: 0.2
-      - name: GlovesYellow
+      - name: ClothingHandsGlovesColorYellow
         prob: 0.05
-      - name: HatHardhatRed
+      - name: ClothingHeadHatHardhatRed
         prob: 0.4
       - name: ApcExtensionCableStack
         prob: 0.3
@@ -43,9 +43,9 @@
     contents:
       - name: ToolboxEmergencyFilled
         prob: 0.4
-      - name: BreathMaskClothing
+      - name: ClothingMaskBreath
         prob: 0.4
-      - name: BreathMaskClothing
+      - name: ClothingMaskBreath
         prob: 0.25
       - name: EmergencyOxygenTankFilled
         prob: 0.4
@@ -79,9 +79,9 @@
   components:
   - type: StorageFill
     contents:
-      - name: HelmetHardsuitCE
+      - name: ClothingHeadHelmetHardsuitEngineeringWhite
-      - name: HardsuitCE
+      - name: ClothingOuterHardsuitEngineeringWhite
-      - name: BreathMaskClothing
+      - name: ClothingMaskBreath
       - name: OxygenTankFilled
 
 - type: entity
@@ -101,9 +101,9 @@
   components:
   - type: StorageFill
     contents:
-      - name: HelmetHardsuitAtmos
+      - name: ClothingHeadHelmetHardsuitAtmos
-      - name: HardsuitAtmos
+      - name: ClothingOuterHardsuitAtmos
-      - name: BreathMaskClothing
+      - name: ClothingMaskBreath
       - name: OxygenTankFilled
 
 - type: entity
@@ -113,9 +113,9 @@
   components:
   - type: StorageFill
     contents:
-      - name: HelmetHardsuitEngineering
+      - name: ClothingHeadHelmetHardsuitEngineering
-      - name: HardsuitEngineering
+      - name: ClothingOuterHardsuitEngineering
-      - name: BreathMaskClothing
+      - name: ClothingMaskBreath
       - name: OxygenTankFilled
 
 - type: entity
@@ -135,7 +135,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: GlovesLatex
+      - name: ClothingHandsGlovesLatex
         prob: 0.4
 
 - type: entity
@@ -241,7 +241,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: GlovesLatex
+      - name: ClothingHandsGlovesLatex
         prob: 0.4
 
 - type: entity
@@ -328,7 +328,7 @@
       contents:
         - name: RedOxygenTankFilled
           prob: 0.6
-        - name: OuterclothingFiresuit
+        - name: ClothingOuterSuitFire
           prob: 0.75
 
 - type: entity

Resources/Prototypes/Catalog/VendingMachines/chapel.yml

@@ -4,13 +4,10 @@
   description: "A vending machine containing religious supplies and clothing. A label reads: \"A holy vendor for a pious man.\""
   spriteName: chapel
   startingInventory:
-    OuterclothingChaplainhoodie: 1
+    ClothingOuterHoodieChaplain: 1
-    OuterclothingAcolyte: 4
+    ClothingOuterHoodieBlack: 1
-    OuterclothingBedsheet: 4
+    ClothingOuterRobesCult: 1
-    OuterclothingBlackhoodie: 1
+    ClothingOuterArmorCult: 1
-    OuterclothingChurchcoat: 1
+    ClothingHeadHatHoodChaplainHood: 1
-    OuterclothingCultrobes: 1
+    ClothingHeadHatHoodCulthood: 1
-    OuterclothingCultarmour: 1
+    ClothingHeadHelmetCult: 1
-    HatChaplainHood: 1
-    HatCulthood: 1
-    HatCultHelmet: 1

Resources/Prototypes/Catalog/VendingMachines/engivend.yml

@@ -5,6 +5,6 @@
   animationDuration: 2.1
   spriteName: engivend
   startingInventory:
-    MesonGlasses: 4
+    ClothingEyesGlassesMeson: 4
     Multitool: 4
     PowerCellSmallHigh: 5

Resources/Prototypes/Catalog/VendingMachines/hats.yml

@@ -4,22 +4,19 @@
   description: A vending machine containing hats.
   spriteName: hats
   startingInventory:
-    HatBandana: 3
+    HatBandBlack: 3
-    HatBandblack: 3
+    HatBandBlue: 3
-    HatBandblue: 3
+    HatBandBotany: 3
-    HatBandbotany: 3
+    HatBandGreen: 3
-    HatBandcamo: 3
+    HatBandRed: 3
-    HatBandgreen: 3
+    HatBandSkull: 3
-    HatBandred: 3
+    ClothingHeadHatBearpelt: 3
-    HatBandskull: 3
+    ClothingHeadHatBeret: 3
-    HatBearpelt: 3
+    ClothingHeadHatBluesoft: 3
-    HatBeret: 3
+    ClothingHeadHatBluesoftFlipped: 3
-    HatBluesoft: 3
+    ClothingHeadHatBowlerHat: 3
-    HatBluesoftFlipped: 3
+    ClothingHeadHatBunny: 3
-    HatBowler: 3
+    ClothingHeadHatCake: 3
-    HatBunny: 3
+    ClothingHeadHatCargosoft: 3
-    HatCake: 3
+    ClothingHeadHatCentcom: 3
-    HatCargosoft: 3
+    ClothingHeadHatChef: 3
-    HatCentcom: 3
-    HatChefhat: 3
-    HatCowboy: 3

Resources/Prototypes/Catalog/VendingMachines/shoes.yml

@@ -4,7 +4,7 @@
   description: A vending machine containing footwear.
   spriteName: shoes
   startingInventory:
-    ShoesWhite: 3
+    ClothingShoesColorWhite: 3
-    ShoesClown: 3
+    ClothingShoesClown: 3
-    ShoesJackboots: 3
+    ClothingShoesBootsJack: 3
-    ShoesBrown: 3
+    ClothingShoesColorBrown: 3

Resources/Prototypes/Catalog/VendingMachines/suits.yml

@@ -4,12 +4,11 @@
   description: A vending machine containing jumpsuits and dress garments.
   spriteName: suits
   startingInventory:
-    UniformJanitor: 3
+    ClothingUniformJumpsuitJanitor: 3
-    UniformColorGrey: 3
+    ClothingUniformJumpsuitColorGrey: 3
-    UniformEngineering: 3
+    ClothingUniformJumpsuitEngineering: 3
-    UniformAssistant: 3
+    ClothingUniformJumpsuitClown: 3
-    UniformClown: 3
+    ClothingUniformJumpsuitSec: 3
-    UniformSec: 3
+    ClothingUniformJumpsuitChef: 3
-    UniformChef: 3
+    ClothingUniformJumpsuitCaptain: 3
-    UniformCaptain: 3
 

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -1,6 +1,6 @@
 - type: entity
   parent: Clothing
-  id: BackpackClothing
+  id: ClothingBackpack
   name: backpack
   description: You wear this on your back and put items into it.
   components:
@@ -17,106 +17,96 @@
     capacity: 100
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: ClownPack
+  id: ClothingBackpackClown
   name: giggles von honkerton
   description: It's a backpack made by Honk! Co.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/clown.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/clown.rsi
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: SecPack
+  id: ClothingBackpackSecurity
   name: security backpack
   description: It's a very robust backpack.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/security.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/security.rsi
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackEngineering
+  id: ClothingBackpackEngineering
   name: engineering backpack
   description: It's a tough backpack for the daily grind of station life.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/engineering.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/engineering.rsi
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackMedical
+  id: ClothingBackpackMedical
   name: medical backpack
   description: It's a backpack especially designed for use in a sterile environment.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/medical.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/medical.rsi
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackCaptain
+  id: ClothingBackpackCaptain
   name: captain's backpack
   description: It's a special backpack made exclusively for Nanotrasen officers.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/captain.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/captain.rsi
 
-# Inhands/On mob aren't working until I refactor this file -Swept
-
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackMime
+  id: ClothingBackpackMime
   name: mime backpack
   description: A silent backpack made for those silent workers. Silence Co.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/mime.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/mime.rsi
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackChemistry
+  id: ClothingBackpackChemistry
   name: chemistry backpack
   description: A backpack specially designed to repel stains and hazardous liquids.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/chemistry.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/chemistry.rsi
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackBotany
+  id: ClothingBackpackBotany
   name: botany backpack
   description: It's a backpack made of all-natural fibers.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/botany.rsi
-    state: icon
   - type: Clothing
     sprite: Clothing/Back/Backpacks/botany.rsi
 
 - type: entity
-  parent: BackpackClothing
+  parent: ClothingBackpack
-  id: BackpackHolding
+  id: ClothingBackpackHolding
   name: bag of holding
   description: A backpack that opens into a localized pocket of bluespace.
   components:

Resources/Prototypes/Entities/Clothing/Back/duffel.yml

@@ -1,7 +1,7 @@
 - type: entity
   parent: Clothing
-  id: Duffelbag
+  id: ClothingBackpackDuffel
-  name: duffelbag
+  name: duffel bag
   description: "A large duffel bag for holding extra things."
   components:
   - type: Sprite
@@ -17,97 +17,67 @@
     capacity: 100
 
 - type: entity
-  parent: Duffelbag
+  parent: ClothingBackpackDuffel
-  id: DuffelbagEngineering
+  id: ClothingBackpackDuffelEngineering
-  name: engineering duffelbag
+  name: engineering duffel bag
   description:
   components:
   - type: Sprite
-    sprite: Clothing/Back/Duffels/duffel_eng.rsi
+    sprite: Clothing/Back/Duffels/engineering.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Duffels/duffel_eng.rsi
+    sprite: Clothing/Back/Duffels/engineering.rsi
 
 - type: entity
-  parent: Duffelbag
+  parent: ClothingBackpackDuffel
-  id: DuffelbagMedical
+  id: ClothingBackpackDuffelMedical
-  name: medical duffelbag
+  name: medical duffel bag
   description: "A large duffel bag for holding extra medical supplies."
   components:
   - type: Sprite
-    sprite: Clothing/Back/Duffels/duffel_med.rsi
+    sprite: Clothing/Back/Duffels/medical.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Duffels/duffel_med.rsi
+    sprite: Clothing/Back/Duffels/medical.rsi
 
 - type: entity
-  parent: Duffelbag
+  parent: ClothingBackpackDuffel
-  id: DuffelbagCaptain
+  id: ClothingBackpackDuffelCaptain
-  name: captain duffelbag
+  name: captain's duffel bag
   description: "A large duffel bag for holding extra captainly goods."
   components:
   - type: Sprite
-    sprite: Clothing/Back/Duffels/duffel_cap.rsi
+    sprite: Clothing/Back/Duffels/captain.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Duffels/duffel_cap.rsi
+    sprite: Clothing/Back/Duffels/captain.rsi
 
 - type: entity
-  parent: Duffelbag
+  parent: ClothingBackpackDuffel
-  id: DuffelbagClown
+  id: ClothingBackpackDuffelClown
-  name: clown duffelbag
+  name: clown duffel bag
   description: "A large duffel bag for holding extra honk goods."
   components:
   - type: Sprite
-    sprite: Clothing/Back/Duffels/duffel_clown.rsi
+    sprite: Clothing/Back/Duffels/clown.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Duffels/duffel_clown.rsi
+    sprite: Clothing/Back/Duffels/clown.rsi
 
 - type: entity
-  parent: Duffelbag
+  parent: ClothingBackpackDuffel
-  id: DuffelbagSecurity
+  id: ClothingBackpackDuffelSecurity
-  name: security duffelbag
+  name: security duffel bag
   description: "A large duffel bag for holding extra security related goods."
   components:
   - type: Sprite
-    sprite: Clothing/Back/Duffels/duffel_sec.rsi
+    sprite: Clothing/Back/Duffels/security.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Duffels/duffel_sec.rsi
+    sprite: Clothing/Back/Duffels/security.rsi
 
 - type: entity
-  parent: Duffelbag
+  parent: ClothingBackpackDuffel
-  id: DuffelbagSyndicate
+  id: ClothingBackpackDuffelSyndicate
-  name: syndicate duffelbag
+  name: syndicate duffel bag
   description: "A large duffel bag for holding various traitor goods."
   components:
   - type: Sprite
-    sprite: Clothing/Back/Duffels/duffel_syn.rsi
+    sprite: Clothing/Back/Duffels/syndicate.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Duffels/duffel_syn.rsi
+    sprite: Clothing/Back/Duffels/syndicate.rsi
-
-# FILLED
-
-- type: entity
-  parent: Duffelbag
-  id: DuffelbagSurgeryFilled
-  name: surgical duffelbag
-  description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools."
-  components:
-  - type: Sprite
-    sprite: Clothing/Back/Duffels/duffel_med.rsi
-    state: icon
-  - type: Clothing
-    sprite: Clothing/Back/Duffels/duffel_med.rsi
-  - type: StorageFill
-    contents:
-      - name: Hemostat
-      - name: BoneSaw
-      - name: Drill
-      - name: Cautery
-      - name: Retractor
-      - name: Scalpel
-  - type: Storage
-    capacity: 30

Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml

@@ -29,7 +29,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/oxygen.rsi
-      state: icon
     - type: GasTank
       outputPressure: 21.27825
       air:
@@ -65,7 +64,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/yellow.rsi
-      state: icon
     - type: Clothing
       sprite: Objects/Tanks/yellow.rsi
       Slots:
@@ -81,7 +79,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/yellow.rsi
-      state: icon
     - type: Clothing
       sprite: Objects/Tanks/yellow.rsi
       Slots:
@@ -97,7 +94,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/red.rsi
-      state: icon
     - type: Clothing
       sprite: Objects/Tanks/red.rsi
       Slots:
@@ -113,7 +109,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/red.rsi
-      state: icon
     - type: Clothing
       sprite: Objects/Tanks/red.rsi
       Slots:
@@ -129,7 +124,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/emergency.rsi
-      state: icon
     - type: GasTank
       outputPressure: 21.27825
       air:
@@ -166,7 +160,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/emergency_yellow.rsi
-      state: icon
     - type: GasTank
       outputPressure: 21.27825
       air:
@@ -203,7 +196,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/emergency_double.rsi
-      state: icon
     - type: GasTank
       outputPressure: 21.27825
       air:
@@ -240,7 +232,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/generic.rsi
-      state: icon
     - type: GasTank
       outputPressure: 101.325
       air:
@@ -261,7 +252,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/generic.rsi
-      state: icon
     - type: GasTank
       outputPressure: 101.325
       air:
@@ -285,7 +275,6 @@
   components:
     - type: Sprite
       sprite: Objects/Tanks/phoron.rsi
-      state: icon
     - type: GasTank
       outputPressure: 101.325
       air:

Resources/Prototypes/Entities/Clothing/Back/satchel.yml

@@ -1,6 +1,6 @@
 - type: entity
   parent: Clothing
-  id: SatchelBase
+  id: ClothingBackpackSatchel
   name: satchel
   description: A trendy looking satchel.
   components:
@@ -17,85 +17,78 @@
     capacity: 100
 
 - type: entity
-  parent: SatchelBase
+  parent: ClothingBackpackSatchel
-  id: SatchelEngineering
+  id: ClothingBackpackSatchelEngineering
   name: engineering satchel
   description: A tough satchel with extra pockets.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
+    sprite: Clothing/Back/Satchels/engineering.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_engineering.rsi
+    sprite: Clothing/Back/Satchels/engineering.rsi
 
 - type: entity
-  parent: SatchelBase
+  parent: ClothingBackpackSatchel
-  id: SatchelMedical
+  id: ClothingBackpackSatchelMedical
   name: medical satchel
   description: A sterile satchel used in medical departments.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_medical.rsi
+    sprite: Clothing/Back/Satchels/medical.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_medical.rsi
+    sprite: Clothing/Back/Satchels/medical.rsi
 
 - type: entity
-  parent: SatchelBase
+  parent: ClothingBackpackSatchel
-  id: SatchelChemistry
+  id: ClothingBackpackSatchelChemistry
   name: chemistry satchel
   description: A sterile satchel with chemist colours.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
+    sprite: Clothing/Back/Satchels/chemistry.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_chemistry.rsi
+    sprite: Clothing/Back/Satchels/chemistry.rsi
 
 - type: entity
-  parent: SatchelBase
+  parent: ClothingBackpackSatchel
-  id: SatchelScience
+  id: ClothingBackpackSatchelScience
   name: science satchel
   description: Useful for holding research materials.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_science.rsi
+    sprite: Clothing/Back/Satchels/science.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_science.rsi
+    sprite: Clothing/Back/Satchels/science.rsi
 
 - type: entity
-  parent: SatchelBase
+  parent: ClothingBackpackSatchel
-  id: SatchelSecurity
+  id: ClothingBackpackSatchelSecurity
   name: security satchel
   description: A robust satchel for security related needs.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_security.rsi
+    sprite: Clothing/Back/Satchels/security.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_security.rsi
+    sprite: Clothing/Back/Satchels/security.rsi
 
 - type: entity
-  parent: SatchelBase
+  parent: ClothingBackpackSatchel
-  id: SatchelCaptain
+  id: ClothingBackpackSatchelCaptain
   name: captain's satchel
   description: An exclusive satchel for Nanotrasen officers.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_captain.rsi
+    sprite: Clothing/Back/Satchels/captain.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_captain.rsi
+    sprite: Clothing/Back/Satchels/captain.rsi
 
 - type: entity
-  parent: SatchelBase
+  parent: ClothingBackpackSatchel
-  id: SatchelHydroponics
+  id: ClothingBackpackSatchelHydroponics
   name: hydroponics satchel
   description: A satchel made of all natural fibers.
   components:
   - type: Sprite
-    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
+    sprite: Clothing/Back/Satchels/hydroponics.rsi
-    state: icon
   - type: Clothing
-    sprite: Clothing/Back/Satchels/satchel_hydroponics.rsi
+    sprite: Clothing/Back/Satchels/hydroponics.rsi

Resources/Prototypes/Entities/Clothing/Belt/base.yml

@@ -0,0 +1,11 @@
+- type: entity
+  parent: Clothing
+  id: ClothingBeltBase
+  abstract: true
+  components:
+  - type: Sprite
+    state: icon
+  - type: Clothing
+    Slots: [belt]
+    size: 50
+    QuickEquip: false

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -1,17 +1,3 @@
-# BASE
-- type: entity
-  parent: Clothing
-  id: ClothingBeltBase
-  abstract: true
-  components:
-  - type: Sprite
-    state: icon
-  - type: Clothing
-    Slots: [belt]
-    size: 50
-    QuickEquip: false
-
-# CONTENT
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltAssault
@@ -41,7 +27,7 @@
 - type: entity
   parent: ClothingBeltBase
   id: ClothingBeltChiefEngineer
-  name:  the Chief Engineer's toolbelt
+  name:  chief's toolbelt
   description: "Holds tools, looks snazzy."
   components:
   - type: Sprite
@@ -168,7 +154,7 @@
 
 - type: entity
   parent: ClothingBeltBase
-  id: UtilityBeltClothing #Change to ClothingBeltUtility
+  id: ClothingBeltUtility
   name: utility belt
   description: "Can hold various things."
   components:

Resources/Prototypes/Entities/Clothing/Ears/headsets.yml

@@ -1,123 +1,113 @@
 - type: entity
   parent: Clothing
-  id: HeadsetBase
+  id: ClothingHeadset
   name: headset
   abstract: true
   description: An updated, modular intercom that fits over the head. Takes encryption keys.
   components:
   - type: Headset
+  - type: Sprite
+    state: icon
   - type: Clothing
     Slots:
     - ears
     sprite: Clothing/Ears/Headsets/base.rsi
 
-
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetCargo
+  id: ClothingHeadsetCargo
   name: cargo headset
   description: A headset used by the quartermaster and his slaves.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/cargo.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetCentCom
+  id: ClothingHeadsetCentCom
   name: centcomm headset
   description: A headset used by the upper echelons of Nanotrasen.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/centcom.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetCommand
+  id: ClothingHeadsetCommand
   name: command headset
   description: A headset with a commanding channel.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/command.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetEngineering
+  id: ClothingHeadsetEngineering
   name: engineering headset
   description: When the engineers wish to chat like girls.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/engineering.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetMedical
+  id: ClothingHeadsetMedical
   name: medical headset
   description: A headset for the trained staff of the medbay.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/medical.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetMedicalScience
+  id: ClothingHeadsetMedicalScience
   name: medical research headset
   description: A headset that is a result of the mating between medical and science.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/medicalscience.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetMining
+  id: ClothingHeadsetMining
   name: mining headset
   description: Headset used by shaft miners.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/mining.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetRobotics
+  id: ClothingHeadsetRobotics
   name: robotics headset
   description: Made specifically for the roboticists, who cannot decide between departments.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/robotics.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetScience
+  id: ClothingHeadsetScience
   name: science headset
   description: A sciency headset. Like usual.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/science.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetSecurity
+  id: ClothingHeadsetSecurity
   name: security headset
   description: This is used by your elite security force.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/security.rsi
-    state: icon
 
 - type: entity
-  parent: HeadsetBase
+  parent: ClothingHeadset
-  id: HeadsetService
+  id: ClothingHeadsetService
   name: service headset
   description: Headset used by the service staff, tasked with keeping the station full, happy and clean.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/service.rsi
-    state: icon

Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml

@@ -1,61 +1,54 @@
 - type: entity
   parent: Clothing
-  id: HeadsetBaseAlt
+  id: ClothingHeadsetAlt
   name: headset
   abstract: true
   description: An updated, modular intercom that fits over the head. Takes encryption keys.
   components:
   - type: Headset
+  - type: Sprite
+    state: icon_alt
+  - type: Clothing
+    Slots:
+    - ears
 
 - type: entity
-  parent: HeadsetBaseAlt
+  parent: ClothingHeadsetAlt
-  id: HeadsetCommandAlt
+  id: ClothingHeadsetAltCommand
   name: command overear-headset
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/command.rsi
-    state: icon_alt
   - type: Clothing
-    Slots:
-    - ears
     sprite: Clothing/Ears/Headsets/command.rsi
 
 - type: entity
-  parent: HeadsetBaseAlt
+  parent: ClothingHeadsetAlt
-  id: HeadsetMedicalAlt
+  id: ClothingHeadsetAltMedical
   name: medical overear-headset
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/medical.rsi
-    state: icon_alt
   - type: Clothing
-    Slots:
-    - ears
     sprite: Clothing/Ears/Headsets/medical.rsi
 
 - type: entity
-  parent: HeadsetBaseAlt
+  parent: ClothingHeadsetAlt
-  id: HeadsetSecurityAlt
+  id: ClothingHeadsetAltSecurity
   name: security overear-headset
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/security.rsi
-    state: icon_alt
   - type: Clothing
-    Slots:
-    - ears
     sprite: Clothing/Ears/Headsets/security.rsi
 
 - type: entity
-  parent: HeadsetBaseAlt
+  parent: ClothingHeadsetAlt
-  id: HeadsetSyndicateAlt
+  id: ClothingHeadsetAltSyndicate
   name: syndicate overear-headset
   description: A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs.
   components:
   - type: Sprite
     sprite: Clothing/Ears/Headsets/syndicate.rsi
-    state: icon_alt
   - type: Clothing
-    Slots:
-    - ears
     sprite: Clothing/Ears/Headsets/syndicate.rsi

Resources/Prototypes/Entities/Clothing/Eyes/base.yml

@@ -0,0 +1,9 @@
+- type: entity
+  parent: Clothing
+  id: ClothingEyesBase
+  abstract: true
+  components:
+  - type: Sprite
+    state: icon
+  - type: Clothing
+    Slots: [eyes]

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -0,0 +1,103 @@
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesBeer
+  name: beer goggles
+  description: A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/beergoggles.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/beergoggles.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesGar
+  name: gar glasses
+  description: Go beyond impossible and kick reason to the curb!
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesGarOrange
+  name: orange gar glasses
+  description: Just who the hell do you think I am?!
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    state: icon-alt
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    HeldPrefix: alt
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesGarGiga
+  name: giga gar glasses
+  description: We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works!
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    state: icon-super
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    HeldPrefix: super
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesMeson
+  name: optical meson scanners
+  description: The pinnacle of modern science, wallhacks in real life
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/meson.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/meson.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlasses
+  name: glasses
+  description: You want to wear glasses in a game? Imagine rping as physically disabled.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/glasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/glasses.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesSunglasses
+  name: sun glasses
+  description: Useful both for security and cargonia
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/sunglasses.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesSecurity
+  name: security sunglasses
+  description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Often worn by budget security officers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+
+#Make a scanner category when these actually function and we get the trayson
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesThermal
+  name: optical thermal scanner
+  description: Thermals in the shape of glasses.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/thermal.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/thermal.rsi

Resources/Prototypes/Entities/Clothing/Eyes/hud.yml

@@ -0,0 +1,32 @@
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesHudDiagnostic
+  name: diagnostic hud
+  description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/diag.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/diag.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesHudMedical
+  name: medical hud
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/med.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/med.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesHudSecurity
+  name: security hud
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/sec.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/sec.rsi

Resources/Prototypes/Entities/Clothing/Eyes/misc.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesEyepatch
+  name: eyepatch
+  description: Yarr.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Misc/eyepatch.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Misc/eyepatch.rsi

Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml

@@ -1,46 +0,0 @@
-- type: entity
-  parent: Clothing
-  id: GlassesBase
-  abstract: true
-  components:
-  - type: Clothing
-    Slots: [eyes]
-
-- type: entity
-  parent: GlassesBase
-  id: MesonGlasses
-  name: optical meson scanners
-  description: The pinnacle of modern science, wallhacks in real life
-  components:
-  - type: Sprite
-    sprite: Clothing/Glasses/meson_scanners.rsi
-    state: meson
-
-  - type: Clothing
-    sprite: Clothing/Glasses/meson_scanners.rsi
-
-- type: entity
-  parent: GlassesBase
-  id: SunGlasses
-  name: sun glasses
-  description: Useful both for security and cargonia
-  components:
-  - type: Sprite
-    sprite: Clothing/Glasses/sunglasses.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Glasses/sunglasses.rsi
-
-- type: entity
-  parent: GlassesBase
-  id: SecGlasses
-  name: security sunglasses
-  description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Often worn by budget security officers.
-  components:
-  - type: Sprite
-    sprite: Clothing/Glasses/sunglasses_sec.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Glasses/sunglasses_sec.rsi

Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml

@@ -1,312 +0,0 @@
-- type: entity
-  parent: Clothing
-  id: GlovesBase
-  abstract: true
-  components:
-  - type: Sprite
-    state: icon
-
-  - type: Clothing
-    Slots:
-    - gloves
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesBlack
-  name: black gloves
-  description: Regular black gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/black.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/black.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesBlue
-  name: blue gloves
-  description: Regular blue gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/blue.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/blue.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesBoxingRed
-  name: boxing gloves (red)
-  description: Red gloves for competitive boxing.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/boxing.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/boxing.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesBoxingBlue
-  name: boxing gloves (blue)
-  description: Blue gloves for competitive boxing.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/boxingblue.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/boxingblue.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesBoxingGreen
-  name: boxing gloves (green)
-  description: Green gloves for competitive boxing.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/boxinggreen.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/boxinggreen.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesBoxingYellow
-  name: boxing gloves (yellow)
-  description: Yellow gloves for competitive boxing.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/boxingyellow.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/boxingyellow.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesBrown
-  name: brown gloves
-  description: Regular brown gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/brown.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/brown.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesCaptain
-  name: captain gloves
-  description: Regal blue gloves, with a nice gold trim. Swanky.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/captain.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/captain.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesGray
-  name: grey gloves
-  description: Regular grey gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/gray.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/gray.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesGreen
-  name: green gloves
-  description: Regular green gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/green.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/green.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesIhscombat
-  name: IHS combat gloves
-  description: These tactical gloves are somewhat fire and impact resistant.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ihscombat.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/ihscombat.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesLatex
-  name: latex gloves
-  description: Thin sterile latex gloves.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/latex.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/latex.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesLeather
-  name: "botanist's leather gloves"
-  description: "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm."
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/leather.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/leather.rsi
-    HeatResistance: 1400
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesLightBrown
-  name: light brown gloves
-  description: Regular light brown gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/lightbrown.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/lightbrown.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesOrange
-  name: orange gloves
-  description: Regular orange gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/orange.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/orange.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesPowerglove
-  name: power gloves
-  description: Now I'm playin' with power! Wait, they are turned off.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/powerglove.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/powerglove.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesPowergloveActive
-  name: powergloves (active)
-  description: Now I'm playin' with power! BAM!
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/powerglove_active.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/powerglove_active.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesPurple
-  name: purple gloves
-  description: Regular purple gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/purple.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/purple.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesRed
-  name: red gloves
-  description: Regular red gloves that do not keep you from frying.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/red.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/red.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesRobohands
-  name: robohands gloves
-  description: Beep boop borp!
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/robohands.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/robohands.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesSNinja
-  name: S ninja gloves
-  description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/s_ninja.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/s_ninja.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesSNinjak
-  name: S ninjak gloves
-  description: These black and red nano-enhanced gloves insulate from electricity and provide fire resistance.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/s_ninjak.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/s_ninjak.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesSNinjan
-  name: S ninjan gloves
-  description: These black and green nano-enhanced gloves insulate from electricity and provide fire resistance.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/s_ninjan.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/s_ninjan.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesWhite
-  name: white gloves
-  description: Those gloves look fancy.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/white.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/white.rsi
-
-- type: entity
-  parent: GlovesBase
-  id: GlovesYellow
-  name: insulated gloves
-  description: These gloves will protect the wearer from electric shocks.
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/yellow.rsi
-
-  - type: Clothing
-    sprite: Clothing/Gloves/yellow.rsi

Resources/Prototypes/Entities/Clothing/Hands/base.yml

@@ -0,0 +1,9 @@
+- type: entity
+  parent: Clothing
+  id: ClothingHandsBase
+  abstract: true
+  components:
+  - type: Sprite
+    state: icon
+  - type: Clothing
+    Slots: [gloves]

Resources/Prototypes/Entities/Clothing/Hands/colored.yml

@@ -0,0 +1,120 @@
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorPurple
+  name: purple gloves
+  description: Regular purple gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/purple.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/purple.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorRed
+  name: red gloves
+  description: Regular red gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/red.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/red.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorBlack
+  name: black gloves
+  description: Regular black gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/black.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/black.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorBlue
+  name: blue gloves
+  description: Regular blue gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/blue.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorBrown
+  name: brown gloves
+  description: Regular brown gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/brown.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/brown.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorGray
+  name: grey gloves
+  description: Regular grey gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/gray.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/gray.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorGreen
+  name: green gloves
+  description: Regular green gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/green.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/green.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorLightBrown
+  name: light brown gloves
+  description: Regular light brown gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/lightbrown.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/lightbrown.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorOrange
+  name: orange gloves
+  description: Regular orange gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/orange.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/orange.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorWhite
+  name: white gloves
+  description: Those gloves look fancy.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/white.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/white.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesColorYellow
+  name: insulated gloves
+  description: These gloves will protect the wearer from electric shocks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/yellow.rsi

Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

@@ -0,0 +1,127 @@
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesBoxingRed
+  name: boxing gloves
+  description: Red gloves for competitive boxing.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesBoxingBlue
+  name: blue boxing gloves
+  description: Blue gloves for competitive boxing.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+    state: icon-blue
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+    HeldPrefix: blue
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesBoxingGreen
+  name: green boxing gloves
+  description: Green gloves for competitive boxing.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+    state: icon-green
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+    HeldPrefix: green
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesBoxingYellow
+  name: yellow boxing gloves
+  description: Yellow gloves for competitive boxing.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+    state: icon-yellow
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/boxing.rsi
+    HeldPrefix: yellow
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesCaptain
+  name: captain gloves
+  description: Regal blue gloves, with a nice gold trim. Swanky.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/captain.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/captain.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesIhscombat
+  name: IHS combat gloves
+  description: These tactical gloves are somewhat fire and impact resistant.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/ihscombat.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/ihscombat.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesLatex
+  name: latex gloves
+  description: Thin sterile latex gloves.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/latex.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/latex.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesLeather
+  name: "botanist's leather gloves"
+  description: "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm."
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/leather.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/leather.rsi
+    HeatResistance: 1400
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesPowerglove
+  name: power gloves
+  description: Now I'm playin' with power! Wait, they are turned off. # Use "Now I'm playin' with power! BAM!" for when they're turned on
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/powerglove.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/powerglove.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesRobohands
+  name: robohands gloves
+  description: Beep boop borp!
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/robohands.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/robohands.rsi
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesSpaceNinja
+  name: space ninja gloves
+  description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/spaceninja.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/spaceninja.rsi

Resources/Prototypes/Entities/Clothing/Head/animals.yml

@@ -1,131 +1,87 @@
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatMonkey
+  id: ClothingHeadHatAnimalCat
-  name: monkey
-  description: That's a monkey head. It has a hole on a mouth to eat bananas.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/monkey.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/monkey.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatMouseBrown
-  name: mouse brown
-  description: This is a head of a brown mouse. Squeak!
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/mouse_brown.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/mouse_brown.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatMouseGray
-  name: mouse gray
-  description: This is a head of a grey mouse. Squeak!
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/mouse_gray.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/mouse_gray.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatMouseWhite
-  name: mouse white
-  description: This is a head of a white mouse. Squeak!
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/mouse_white.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/mouse_white.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatNymph
-  name: nymph
-  description: It's a nymph. You can put it on your head.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/nymph.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/nymph.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatPai-cat
-  name: pai-cat
-  description: Personal AI in a cat form.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/pai-cat.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/pai-cat.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatPai-monkey
-  name: pai-monkey
-  description: Personal AI in a monkey form.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/pai-monkey.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/pai-monkey.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatPai-mouse
-  name: pai-mouse
-  description: Personal AI in a mouse form.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/pai-mouse.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/pai-mouse.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatCatGrey
   name: grey cat
   description: A cute and fluffy head of a grey cat.
   components:
   - type: Sprite
-    sprite: Clothing/Head/cat.rsi
+    sprite: Clothing/Head/Animals/cat.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/cat.rsi
+    sprite: Clothing/Head/Animals/cat.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatCatBrown
+  id: ClothingHeadHatAnimalCatBrown
   name: brown cat
   description: A cute and fluffy head of a brown cat.
   components:
   - type: Sprite
-    sprite: Clothing/Head/cat2.rsi
+    sprite: Clothing/Head/Animals/cat2.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/cat2.rsi
+    sprite: Clothing/Head/Animals/cat2.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatCatBlack
+  id: ClothingHeadHatAnimalCatBlack
   name: black cat
   description: A cute and fluffy head of a black cat.
   components:
   - type: Sprite
-    sprite: Clothing/Head/cat3.rsi
+    sprite: Clothing/Head/Animals/cat3.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/cat3.rsi
+    sprite: Clothing/Head/Animals/cat3.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatAnimalHeadslime
+  name: headslime
+  description: A green, sticky headslime, you put it on your head.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Animals/headslime.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Animals/headslime.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatAnimalMonkey
+  name: monkey
+  description: That's a monkey head. It has a hole on a mouth to eat bananas.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Animals/monkey.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Animals/monkey.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatAnimalMouseBrown
+  name: mouse brown
+  description: This is a head of a brown mouse. Squeak!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Animals/mouse_brown.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Animals/mouse_brown.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatAnimalMouseGray
+  name: mouse gray
+  description: This is a head of a grey mouse. Squeak!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Animals/mouse_gray.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Animals/mouse_gray.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatAnimalMouseWhite
+  name: mouse white
+  description: This is a head of a white mouse. Squeak!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Animals/mouse_white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Animals/mouse_white.rsi

Resources/Prototypes/Entities/Clothing/Head/bandanas.yml

@@ -0,0 +1,87 @@
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandBlack
+  name: black bandana
+  description: A black bandana to make you look cool.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/black.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/black.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandBlue
+  name: blue bandana
+  description: A blue bandana to make you look cool.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/blue.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandBotany
+  name: botany bandana
+  description: A botany bandana to make you look cool, made from natural fibers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/botany.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/botany.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandGold
+  name: gold bandana
+  description: A gold bandana to make you look cool.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/gold.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/gold.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandGreen
+  name: green bandana
+  description: A green bandana to make you look cool.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/green.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/green.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandGrey
+  name: grey bandana
+  description: A grey bandana to make you look cool.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/grey.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/grey.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandRed
+  name: red bandana
+  description: A red bandana to make you look cool.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/red.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: HatBandSkull
+  name: skull bandana
+  description: A bandana with a skull to make you look even cooler.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/skull.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/skull.rsi

Resources/Prototypes/Entities/Clothing/Head/base.yml

@@ -0,0 +1,31 @@
+- type: entity
+  parent: Clothing
+  id: ClothingHeadBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots:
+    - Helmet
+  - type: Sprite
+    state: icon
+
+- type: entity
+  parent: Clothing
+  id: HatBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots:
+    - Helmet
+  - type: Sprite
+    state: icon
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHardsuitBase
+  name: base hardsuit helmet
+  abstract: true
+  components:
+    - type: PressureProtection
+      highPressureMultiplier: 0.5
+      lowPressureMultiplier: 100

Resources/Prototypes/Entities/Clothing/Head/hardhats.yml

@@ -0,0 +1,54 @@
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHardhatBlue
+  name: blue hard hat
+  description: A hard hat, painted in blue, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardhats/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardhats/blue.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHardhatOrange
+  name: orange hard hat
+  description: A hard hat, painted in orange, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardhats/orange.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardhats/orange.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHardhatRed
+  name: red hard hat
+  description: A hard hat, painted in red, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardhats/red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardhats/red.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHardhatWhite
+  name: white hard hat
+  description: A hard hat, painted in white, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardhats/white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardhats/white.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHardhatYellow
+  name: yellow hard hat
+  description: A hard hat, painted in yellow, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardhats/yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardhats/yellow.rsi

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -1,158 +1,163 @@
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadHardsuitBase
-  id: HelmetHardsuitBase
+  id: ClothingHeadHelmetHardsuitAtmos
-  name: base hardsuit helmet
-  abstract: true
-  components:
-    - type: PressureProtection
-      highPressureMultiplier: 0.75
-      lowPressureMultiplier: 100
-
-- type: entity
-  parent: HelmetHardsuitBase
-  id: HatHardsuitOld
-  name: old hardsuit helmet
-  description: An old helmet from a hardsuit. Still functional, for now.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/hardsuit-old.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/hardsuit-old.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.85
-    lowPressureMultiplier: 45
-
-
-- type: entity
-  parent: HelmetHardsuitBase
-  id: HelmetHardsuitAtmos
   name: atmos hardsuit helmet
   description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-atmos.rsi
+    sprite: Clothing/Head/Hardsuits/atmospherics.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-atmos.rsi
+    sprite: Clothing/Head/Hardsuits/atmospherics.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.5
-    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HelmetHardsuitBase
+  parent: ClothingHeadHardsuitBase
-  id: HelmetHardsuitEngineering
+  id: ClothingHeadHelmetHardsuitCap
+  name: captain's hardsuit helmet
+  description: Special hardsuit helmet, made for the captain of the station.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/capspace.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/capspace.rsi
+
+- type: entity
+  parent: HatBase
+  id: ClothingHeadHelmetHardsuitDeathsquad
+  name: deathsquad
+  description: A robust helmet for special operations.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
+
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitEngineering
   name: engineering hardsuit helmet
   description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-engineering.rsi
+    sprite: Clothing/Head/Hardsuits/engineering.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-engineering.rsi
+    sprite: Clothing/Head/Hardsuits/engineering.rsi
   - type: PressureProtection
-    highPressureMultiplier: 0.65
+    highPressureMultiplier: 0.40
     lowPressureMultiplier: 100
 
 - type: entity
-  parent: HelmetHardsuitBase
+  parent: ClothingHeadHardsuitBase
-  id: HelmetHardsuitHazard
+  id: ClothingHeadHelmetHardsuitEngineeringWhite
-  name: hazard hardsuit helmet
+  name: CE hardsuit helmet
-  description: Robust hardsuit helmet made for dangerous and hazardous situations.
+  description: Special hardsuit helmet, made for the chief engineer of the station.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
+    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
+    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
 
 - type: entity
-  parent: HelmetHardsuitBase
+  parent: HatBase
-  id: HelmetHardsuitMedical
+  id: ClothingHeadHelmetIHSVoidHelm
+  name: IHS voidhelm
+  description: A robust, tactical IHS helmet.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ihsvoid.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ihsvoid.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.60
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitMedical
   name: medical hardsuit helmet
   description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-medical.rsi
+    sprite: Clothing/Head/Hardsuits/medical.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-medical.rsi
+    sprite: Clothing/Head/Hardsuits/medical.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.80
     lowPressureMultiplier: 55
 
 - type: entity
-  parent: HelmetHardsuitBase
+  parent: ClothingHeadHardsuitBase
-  id: HelmetHardsuitMining
+  id: ClothingHeadHelmetHardsuitRd
-  name: mining hardsuit helmet
+  name: rd hardsuit helmet
+  description: Lightweight hardsuit helmet that doesn't restrict your head movements.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/rd.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/rd.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.80
+    lowPressureMultiplier: 55
+
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitSalvage
+  name: salvage hardsuit helmet
   description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-mining.rsi
+    sprite: Clothing/Head/Hardsuits/salvage.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-mining.rsi
+    sprite: Clothing/Head/Hardsuits/salvage.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.70
     lowPressureMultiplier: 100
 
 - type: entity
-  parent: HelmetHardsuitBase
+  parent: ClothingHeadHardsuitBase
-  id: HelmetHardsuitSecurity
+  id: ClothingHeadHelmetHardsuitSecurity
   name: security hardsuit helmet
   description: Armored hardsuit helmet for security needs.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-sectg.rsi
+    sprite: Clothing/Head/Hardsuits/security.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-sectg.rsi
+    sprite: Clothing/Head/Hardsuits/security.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.70
     lowPressureMultiplier: 100
 
 - type: entity
-  parent: HelmetHardsuitBase
+  parent: ClothingHeadHardsuitBase
-  id: HelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitSecurityRed
+  name: hos hardsuit helmet
+  description: Red armored hardsuit helmet for security needs. Belongs to the HoS.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/security-red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/security-red.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.60
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitSyndie
   name: blood red hardsuit helmet
   description: An advanced red hardsuit helmet designed for work in special operations.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-syndie.rsi
+    sprite: Clothing/Head/Hardsuits/syndicate.rsi
-    state: icon
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-syndie.rsi
+    sprite: Clothing/Head/Hardsuits/syndicate.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.45
-    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HelmetHardsuitBase
+  parent: ClothingHeadHardsuitBase
-  id: HelmetHardsuitCE
+  id: ClothingHeadHelmetHardsuitWizard
-  name: CE hardsuit helmet
-  description: Special hardsuit helmet, made for the chief engineer of the station.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/hardsuit-white.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/hardsuit-white.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.5
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HelmetHardsuitBase
-  id: HelmetHardsuitWizard
   name: wizard hardsuit helmet
   description: A bizarre gem-encrusted helmet that radiates magical energies.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardsuit-wiz.rsi
+    sprite: Clothing/Head/Hardsuits/wizard.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardsuit-wiz.rsi
+    sprite: Clothing/Head/Hardsuits/wizard.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.45
-    lowPressureMultiplier: 100

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -1,119 +1,131 @@
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatAtmosHelm
+  id: ClothingHeadHelmetBombSuit
-  name: atmos helm
+  name: bombsuit helmet
-  description: A helmet, designed for work in low-pressure enviroments.
+  description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
   components:
   - type: Sprite
-    sprite: Clothing/Head/atmos_helm.rsi
+    sprite: Clothing/Head/Helmets/bombsuit.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/atmos_helm.rsi
+    sprite: Clothing/Head/Helmets/bombsuit.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatCultHelmet
+  id: ClothingHeadHelmetCosmonaut
+  name: cosmonaut
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/cosmonaut.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/cosmonaut.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetCult
   name: cult helmet
   description: A robust, evil-looking cult helmet.
   components:
   - type: Sprite
-    sprite: Clothing/Head/cult_helmet.rsi
+    sprite: Clothing/Head/Helmets/cult.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/cult_helmet.rsi
+    sprite: Clothing/Head/Helmets/cult.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatHardhatBlue
+  id: ClothingHeadHelmetHelmet
-  name: blue hard hat
+  name: helmet
-  description: A hard hat, painted in blue, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  description: A usual helmet.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardhat_blue.rsi
+    sprite: Clothing/Head/Helmets/security.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardhat_blue.rsi
+    sprite: Clothing/Head/Helmets/security.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatHardhatOrange
+  id: ClothingHeadHelmetHelmetOld
-  name: orange hard hat
+  name: helmet
-  description: A hard hat, painted in orange, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  description: An old usual helmet.
   components:
   - type: Sprite
-    sprite: Clothing/Head/hardhat_orange.rsi
+    sprite: Clothing/Head/Helmets/securityold.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/hardhat_orange.rsi
+    sprite: Clothing/Head/Helmets/securityold.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatHardhatRed
+  id: ClothingHeadHelmetRiot
-  name: red hard hat
-  description: A hard hat, painted in red, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/hardhat_red.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/hardhat_red.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatHardhatWhite
-  name: white hard hat
-  description: A hard hat, painted in white, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/hardhat_white.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/hardhat_white.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatHardhatYellow
-  name: yellow hard hat
-  description: A hard hat, painted in yellow, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/hardhat_yellow.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/hardhat_yellow.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatLightRiot
   name: light riot helmet
   description: It's a helmet specifically designed to protect against close range attacks.
   components:
   - type: Sprite
-    sprite: Clothing/Head/light_riot.rsi
+    sprite: Clothing/Head/Helmets/light_riot.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/light_riot.rsi
+    sprite: Clothing/Head/Helmets/light_riot.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatScaf
+  id: ClothingHeadHelmetScaf
   name: scaf
   description: A robust, strong helmet.
   components:
   - type: Sprite
-    sprite: Clothing/Head/scaf.rsi
+    sprite: Clothing/Head/Helmets/scaf.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/scaf.rsi
+    sprite: Clothing/Head/Helmets/scaf.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatSecurity
+  id: ClothingHeadHelmetSpaceNinja
-  name: security
+  name: space ninja helmet
-  description: Standard issue security helmet.
+  description:
   components:
   - type: Sprite
-    sprite: Clothing/Head/security.rsi
+    sprite: Clothing/Head/Helmets/spaceninja.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/security.rsi
+    sprite: Clothing/Head/Helmets/spaceninja.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetSyndicate
+  name: syndicate
+  description: A stylish, robust syndicate helmet
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/syndicate.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetTemplar
+  name: templar helmet
+  description: DEUS VULT
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/templar.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/templar.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetThunderdome
+  name: thunderdome
+  description: Let the battle commence!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/thunderdome.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/thunderdome.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetWizardHelm
+  name: wizard helm
+  description: Strange-looking helmet that most certainly belongs to a real magic user.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/wizardhelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/wizardhelm.rsi

Resources/Prototypes/Entities/Clothing/Head/hoods.yml

@@ -1,155 +1,115 @@
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatBioCmo
+  id: ClothingHeadHatHoodBioGeneral
-  name: bio - cmo
+  name: bio hood
+  suffix: Generic
+  description: A hood that protects the head and face from biological contaminants.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/Bio/general.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/Bio/general.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHoodBioCmo
+  name: bio hood
+  suffix: CMO
   description: An advanced hood for chief medical officer that protects the head and face from biological contaminants.
   components:
   - type: Sprite
-    sprite: Clothing/Head/bio_cmo.rsi
+    sprite: Clothing/Head/Hoods/Bio/cmo.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/bio_cmo.rsi
+    sprite: Clothing/Head/Hoods/Bio/cmo.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatBioGeneral
+  id: ClothingHeadHatHoodBioJanitor
-  name: bio - general
+  name: bio hood
+  suffix: Janitor
   description: A hood that protects the head and face from biological contaminants.
   components:
   - type: Sprite
-    sprite: Clothing/Head/bio_general.rsi
+    sprite: Clothing/Head/Hoods/Bio/janitor.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/bio_general.rsi
+    sprite: Clothing/Head/Hoods/Bio/janitor.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatBioJanitor
+  id: ClothingHeadHatHoodBioScientist
-  name: bio - janitor
+  name: bio hood
+  suffix: Science
   description: A hood that protects the head and face from biological contaminants.
   components:
   - type: Sprite
-    sprite: Clothing/Head/bio_janitor.rsi
+    sprite: Clothing/Head/Hoods/Bio/scientist.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/bio_janitor.rsi
+    sprite: Clothing/Head/Hoods/Bio/scientist.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatBioScientist
+  id: ClothingHeadHatHoodBioSecurity
-  name: bio - scientist
+  name: bio hood
+  suffix: Security
   description: A hood that protects the head and face from biological contaminants.
   components:
   - type: Sprite
-    sprite: Clothing/Head/bio_scientist.rsi
+    sprite: Clothing/Head/Hoods/Bio/security.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/bio_scientist.rsi
+    sprite: Clothing/Head/Hoods/Bio/security.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatBioSecurity
+  id: ClothingHeadHatHoodBioVirology
-  name: bio - security
+  name: bio hood
+  suffix: Virology
   description: A hood that protects the head and face from biological contaminants.
   components:
   - type: Sprite
-    sprite: Clothing/Head/bio_security.rsi
+    sprite: Clothing/Head/Hoods/Bio/virology.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/bio_security.rsi
+    sprite: Clothing/Head/Hoods/Bio/virology.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatBioVirology
+  id: ClothingHeadHatHoodChaplainHood
-  name: bio - virology
-  description: A hood that protects the head and face from biological contaminants.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/bio_virology.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/bio_virology.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatBombsuit
-  name: bombsuit
-  description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/bombsuit.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/bombsuit.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatBombsuitsec
-  name: bombsuit sec
-  description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/bombsuitsec.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/bombsuitsec.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatBombsuitWhite
-  name: bombsuit white
-  description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/bombsuit_white.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/bombsuit_white.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatChaplainHood
   name: chaplain hood
   description: Maximum piety in this star system.
   components:
   - type: Sprite
-    sprite: Clothing/Head/chaplain_hood.rsi
+    sprite: Clothing/Head/Hoods/chaplain.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/chaplain_hood.rsi
+    sprite: Clothing/Head/Hoods/chaplain.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatCulthood
+  id: ClothingHeadHatHoodCulthood
   name: cult hood
   description: There's no cult without cult hoods.
   components:
   - type: Sprite
-    sprite: Clothing/Head/culthood.rsi
+    sprite: Clothing/Head/Hoods/cult.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/culthood.rsi
+    sprite: Clothing/Head/Hoods/cult.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatNunHood
+  id: ClothingHeadHatHoodNunHood
   name: nun hood
   description: Maximum piety in this star system.
   components:
   - type: Sprite
-    sprite: Clothing/Head/nun_hood.rsi
+    sprite: Clothing/Head/Hoods/nun.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/nun_hood.rsi
+    sprite: Clothing/Head/Hoods/nun.rsi
 
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatRad
+  id: ClothingHeadHatHoodRad
   name: rad
   description: A hood of the hazmat suit, designed for protection from high radioactivity.
   components:
   - type: Sprite
-    sprite: Clothing/Head/rad.rsi
+    sprite: Clothing/Head/Hoods/rad.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/rad.rsi
+    sprite: Clothing/Head/Hoods/rad.rsi

Resources/Prototypes/Entities/Clothing/Head/misc.yml

@@ -1,11 +1,120 @@
 - type: entity
-  parent: HatBase
+  parent: ClothingHeadBase
-  id: HatSkub
+  id: ClothingHeadHatBearpelt
+  name: bear pelt
+  description: It's a cute bear pelt.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/bearpelt.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/bearpelt.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBunny
+  name: bunny
+  description: Cute bunny ears.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/bunny.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/bunny.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCake
+  name: cake hat
+  description: You put the cake on your head. Brilliant.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/cake.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/cake.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatChickenhead
+  name: chicken head
+  description: "It's a chicken head. Bok bok bok!"
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/chickenhead.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/chickenhead.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHairflower
+  name: hairflower
+  description: A red rose for beautiful ladies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/hairflower.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/hairflower.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatPumpkin
+  name: pumpkin hat
+  description: A jack o' lantern! Believed to ward off evil spirits.
+  components:
+    - type: Sprite
+      sprite: Clothing/Head/Misc/pumpkin.rsi
+    - type: Clothing
+      sprite: Clothing/Head/Misc/pumpkin.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatPwig
+  name: pwig
+  description: To be honest, those look ridiculous.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/pwig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/pwig.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatRichard
+  name: richard
+  description: 'Do you like hurting people?'
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/richard.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/richard.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSkub
   name: Skub Hat
   description: 'Best paired with the Skub Suit.'
   components:
   - type: Sprite
-    sprite: Clothing/Head/skubhead.rsi
+    sprite: Clothing/Head/Misc/skubhead.rsi
-
   - type: Clothing
-    sprite: Clothing/Head/skubhead.rsi
+    sprite: Clothing/Head/Misc/skubhead.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatXenoMom
+  name: xeno matriarch
+  description: Hiss hiss hiss!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/xenom.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/xenom.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatXeno
+  name: xenos
+  description: Hiss hiss hiss!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/xenos.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/xenos.rsi

Resources/Prototypes/Entities/Clothing/Head/soft.yml

@@ -0,0 +1,241 @@
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBluesoft
+  name: bluesoft
+  description: "It's a baseball hat in a tasteless blue colour."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/bluesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/bluesoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBluesoftFlipped
+  name: bluesoft flipped
+  description: "It's a baseball hat in a tasteless blue colour. Flipped."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCargosoft
+  name: cargosoft
+  description: "It's a baseball hat painted in Cargo colours."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/cargosoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/cargosoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCargosoftFlipped
+  name: cargosoft flipped
+  description: "It's a baseball hat painted in Cargo colours. Flipped."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCorpsoft
+  name: corpsoft
+  description: A baseball bat in corporation colors.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/corpsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/corpsoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCorpsoftFlipped
+  name: corpsoft flipped
+  description: A baseball bat in corporation colors. Flipped.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGreensoft
+  name: greensoft
+  description: "It's a baseball hat in a tasteless green colour."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/greensoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/greensoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGreensoftFlipped
+  name: greensoft flipped
+  description: "It's a baseball hat in a tasteless green colour. Flipped."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/greensoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/greensoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGreysoft
+  name: greysoft
+  description: "It's a baseball hat in a tasteless grey colour."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/greysoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/greysoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGreysoftFlipped
+  name: greysoft flipped
+  description: "It's a baseball hat in a tasteless grey colour. Flipped."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/greysoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/greysoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatMimesoft
+  name: mimesoft
+  description: "It's a baseball hat in a tasteless white colour."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/mimesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/mimesoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatMimesoftFlipped
+  name: mimesoft flipped
+  description: It's a baseball hat in a tasteless white colour. Flipped.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatOrangesoft
+  name: orangesoft
+  description: It's a baseball hat in a good-looking orange colour.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/orangesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/orangesoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatOrangesoftFlipped
+  name: orangesoft flipped
+  description: It's a baseball hat in a good-looking orange colour. Flipped.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatPurplesoft
+  name: purple soft
+  description: It's a baseball hat in a tasteless purple colour.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/purplesoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/purplesoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatPurplesoftFlipped
+  name: purplesoft flipped
+  description: It's a baseball hat in a tasteless purple colour. Flipped.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatRedsoft
+  name: redsoft
+  description: It's a baseball hat in a tasteless red colour.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/redsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/redsoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatRedsoftFlipped
+  name: redsoft flipped
+  description: It's a baseball hat in a tasteless purple colour. Flipped.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/redsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/redsoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSecsoft
+  name: secsoft
+  description: It's a robust baseball hat in tasteful red colour.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/secsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/secsoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSecsoftFlipped
+  name: secsoft flipped
+  description: It's a robust baseball hat in tasteful red colour. Flipped.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/secsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/secsoft_flipped.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatYellowsoft
+  name: yellowsoft
+  description: A yellow baseball hat.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/yellowsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/yellowsoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatYellowsoftFlipped
+  name: yellowsoft flipped
+  description: A yellow flipped baseball hat.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi

Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml

@@ -1,95 +0,0 @@
-- type: entity
-  parent: HatBase
-  id: HatWelding
-  name: welding mask
-  description: A head-mounted face cover designed to protect the wearer completely from space-arc eye.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/welding.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/welding.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatWeldingup
-  name: welding mask (up)
-  description: A head-mounted face cover designed to protect the wearer completely from space-arc eye.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/weldingup.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/weldingup.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatFireWeldingMask
-  name: fire welding mask
-  description: A painted welding helmet, this one has flames on it.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/fire_welding_mask_1.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/fire_welding_mask_1.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatFireWeldingMaskup
-  name: fire welding mask (up)
-  description: A painted welding helmet, this one has flames on it.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/fire_welding_mask_1up.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/fire_welding_mask_1up.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatBlueFlameWeldingMask
-  name: blue flame welding mask
-  description: A painted welding helmet, this one has blue flames on it.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatBlueFlameWeldingMaskup
-  name: blue flame welding mask (up)
-  description: A painted welding helmet, this one has blue flames on it.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatPaintedwelding
-  name: painted welding mask
-  description: A welding helmet, painted in crimson.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/paintedwelding.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/paintedwelding.rsi
-
-- type: entity
-  parent: HatBase
-  id: HatPaintedweldingup
-  name: painted welding mask (up)
-  description: A welding helmet, painted in crimson.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/paintedweldingup.rsi
-
-  - type: Clothing
-    sprite: Clothing/Head/paintedweldingup.rsi

Resources/Prototypes/Entities/Clothing/Head/welding.yml

@@ -0,0 +1,43 @@
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatWelding
+  name: welding mask
+  description: A head-mounted face cover designed to protect the wearer completely from space-arc eye.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Welding/welding.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Welding/welding.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatWeldingMaskFlame
+  name: flame welding mask
+  description: A painted welding helmet, this one has flames on it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Welding/flame_welding_mask.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Welding/flame_welding_mask.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatWeldingMaskFlameBlue
+  name: blue-flame welding mask
+  description: A painted welding helmet, this one has blue flames on it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatWeldingMaskPainted
+  name: painted welding mask
+  description: A welding helmet, painted in crimson.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Welding/paintedwelding.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Welding/paintedwelding.rsi

Resources/Prototypes/Entities/Clothing/Masks/base.yml

@@ -0,0 +1,9 @@
+- type: entity
+  parent: Clothing
+  id: ClothingMaskBase
+  abstract: true
+  components:
+  - type: Sprite
+    state: icon
+  - type: Clothing
+    Slots: [mask]

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -1,98 +1,71 @@
 - type: entity
-  parent: Clothing
+  parent: ClothingMaskBase
-  id: MasksBase
+  id: ClothingMaskGas
-  abstract: true
-  components:
-  - type: Clothing
-    Slots: [mask]
-
-- type: entity
-  parent: MasksBase
-  id: OldGasMaskClothing
   name: old gas mask
   description: An old, dusty mask. Yet still dutifully functional.
   components:
   - type: Sprite
-    sprite: Clothing/Masks/mask_gasalt.rsi
+    sprite: Clothing/Mask/gas.rsi
-    state: icon
-  - type: BreathMask
   - type: Clothing
-    sprite: Clothing/Masks/mask_gasalt.rsi
+    sprite: Clothing/Mask/gas.rsi
+  - type: BreathMask
 
 - type: entity
-  parent: MasksBase
+  parent: ClothingMaskBase
-  id: GasMaskClothing
+  id: ClothingMaskBreath
-  name: gas mask
-  description: Regulations require these to be stocked after the fourth coolant leak.
-  components:
-  - type: Sprite
-    sprite: Clothing/Masks/mask_gas.rsi
-    state: icon
-  - type: BreathMask
-  - type: Clothing
-    sprite: Clothing/Masks/mask_gas.rsi
-
-- type: entity
-  parent: MasksBase
-  id: BreathMaskClothing
   name: breath mask
   description: Might as well keep this on 24/7.
   components:
   - type: Sprite
-    sprite: Clothing/Masks/mask_breath.rsi
+    sprite: Clothing/Mask/breath.rsi
-    state: icon
-  - type: BreathMask
   - type: Clothing
-    sprite: Clothing/Masks/mask_breath.rsi
+    sprite: Clothing/Mask/breath.rsi
+  - type: BreathMask
 
 - type: entity
-  parent: MasksBase
+  parent: ClothingMaskBase
-  id: MaskClown
+  id: ClothingMaskClown
   name: clown wig and mask
   description: A true prankster's facial attire. A clown is incomplete without his wig and mask.
   components:
   - type: Sprite
-    sprite: Clothing/Masks/mask_clown.rsi
+    sprite: Clothing/Mask/clown.rsi
-    state: icon
-  - type: BreathMask
   - type: Clothing
-    sprite: Clothing/Masks/mask_clown.rsi
+    sprite: Clothing/Mask/clown.rsi
+  - type: BreathMask
 
 - type: entity
-  parent: MasksBase
+  parent: ClothingMaskBase
-  id: MaskJoy
+  id: ClothingMaskJoy
   name: joy mask
   description: Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout.
   components:
   - type: Sprite
-    sprite: Clothing/Masks/mask_joy.rsi
+    sprite: Clothing/Mask/joy.rsi
-    state: icon
-  - type: BreathMask
   - type: Clothing
-    sprite: Clothing/Masks/mask_joy.rsi
+    sprite: Clothing/Mask/joy.rsi
+  - type: BreathMask
 
 - type: entity
-  parent: MasksBase
+  parent: ClothingMaskBase
-  id: MaskMime
+  id: ClothingMaskMime
   name: mime mask
   description: The traditional mime's mask. It has an eerie facial posture.
   components:
   - type: Sprite
-    sprite: Clothing/Masks/mask_mime.rsi
+    sprite: Clothing/Mask/mime.rsi
-    state: icon
-  - type: BreathMask
   - type: Clothing
-    sprite: Clothing/Masks/mask_mime.rsi
+    sprite: Clothing/Mask/mime.rsi
+  - type: BreathMask
 
 - type: entity
-  parent: MasksBase
+  parent: ClothingMaskBase
-  id: MaskSterile
+  id: ClothingMaskSterile
   name: sterile mask
   description: A sterile mask designed to help prevent the spread of diseases.
   components:
   - type: Sprite
-    sprite: Clothing/Masks/mask_sterile.rsi
+    sprite: Clothing/Mask/sterile.rsi
-    state: icon
-  - type: BreathMask
   - type: Clothing
-    sprite: Clothing/Masks/mask_sterile.rsi
+    sprite: Clothing/Mask/sterile.rsi
+  - type: BreathMask

Resources/Prototypes/Entities/Clothing/Neck/base.yml

@@ -0,0 +1,14 @@
+- type: entity
+  parent: Clothing
+  id: ClothingNeckBase
+  abstract: true
+  name: neck
+  description:
+  components:
+  - type: Clothing
+    size: 10
+    QuickEquip: true
+    Slots:
+    - neck
+  - type: Sprite
+    state: icon

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -1,124 +1,88 @@
 - type: entity
-  parent: Clothing
+  parent: ClothingNeckBase
-  id: CloakClothing
+  id: ClothingNeckCloakCap
-  name: cloak
-  abstract: true
-  description:
-  components:
-  - type: Clothing
-    size: 10
-    QuickEquip: true
-    Slots:
-    - neck
-
-- type: entity
-  parent: CloakClothing
-  id: CapCloak
   name: captain's cloak
   description: A pompous and comfy blue cloak with a nice gold trim.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/cap_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/cap.rsi
-    state: capcloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/cap_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/cap.rsi
-    HeldPrefix: capcloak
 
 - type: entity
-  parent: CloakClothing
+  parent: ClothingNeckBase
-  id: HosCloak
+  id: ClothingNeckCloakHos
   name: HoS's cloak
   description: An exquisite dark and red cloak of a Head of Security.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/hos_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/hos.rsi
-    state: hoscloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/hos_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/hos.rsi
-    HeldPrefix: hoscloak
 
 - type: entity
-  parent: CloakClothing
+  parent: ClothingNeckBase
-  id: CeCloak
+  id: ClothingNeckCloakCe
   name: CE's cloak
   description: A dark green cloak with light blue ornaments.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/ce_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/ce.rsi
-    state: cecloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/ce_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/ce.rsi
-    HeldPrefix: cecloak
+
 
 - type: entity
-  parent: CloakClothing
+  parent: ClothingNeckBase
-  id: CmoCloak
+  id: CloathingCloakCmo
   name: CMO's cloak
   description: A sterile blue cloak with a green cross.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/cmo.rsi
-    state: cmocloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/cmo_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/cmo.rsi
-    HeldPrefix: cmocloak
 
 - type: entity
-  parent: CloakClothing
+  parent: ClothingNeckBase
-  id: RdCloak
+  id: ClothingNeckCloakRd
   name: RD's cloak
   description: A white cloak with violet stripes.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/rd_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/rd.rsi
-    state: rdcloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/rd_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/rd.rsi
-    HeldPrefix: rdcloak
 
 - type: entity
-  parent: CloakClothing
+  parent: ClothingNeckBase
-  id: QmCloak
+  id: ClothingNeckCloakQm
   name: QM's cloak
   description: A strong brown cloak with a reflective stripe.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/qm_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/qm.rsi
-    state: qmcloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/qm_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/qm.rsi
-    HeldPrefix: qmcloak
 
 - type: entity
-  parent: CloakClothing
+  parent: ClothingNeckBase
-  id: HopCloak
+  id: ClothingNeckCloakHop
   name: HoP's cloak
   description: A blue cloak with red shoudlers and gold buttons.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/hop_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/hop.rsi
-    state: hopcloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/hop_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/hop.rsi
-    HeldPrefix: hopcloak
 
 - type: entity
-  parent: CloakClothing
+  parent: ClothingNeckBase
-  id: HeraldCloak
+  id: ClothingNeckCloakHerald
   name: Herald's cloak
   description: An evil-looking red cloak with spikes on its shoulders.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Cloaks/herald_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/herald.rsi
-    state: heraldcloak
-
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/herald_cloak.rsi
+    sprite: Clothing/Neck/Cloaks/herald.rsi
-    HeldPrefix: heraldcloak

Resources/Prototypes/Entities/Clothing/Neck/misc.yml

@@ -0,0 +1,32 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckHeadphones
+  name: headphones
+  description: Quality headphones from Drunk Masters, with good sound insulation.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/headphones.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/headphones.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckStethoscope
+  name: stethoscope
+  description: An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/stethoscope.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/stethoscope.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckBling
+  name: bling
+  description: Damn, it feels good to be a gangster.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/bling.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/bling.rsi

Resources/Prototypes/Entities/Clothing/Neck/neck.yml

@@ -1,138 +0,0 @@
-- type: entity
-  parent: Clothing
-  id: NeckClothing
-  abstract: true
-  name: neck
-  description:
-  components:
-  - type: Clothing
-    size: 10
-    QuickEquip: true
-    Slots:
-    - neck
-
-- type: entity
-  parent: NeckClothing
-  id: HeadPhonesOn
-  name: headphones
-  description: Quality headphones from Drunk Masters, with good sound insulation.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/headphones.rsi
-    state: headphones_on
-
-  - type: Clothing
-    sprite: Clothing/Neck/headphones.rsi
-    HeldPrefix: headphones_on
-
-- type: entity
-  parent: NeckClothing
-  id: RedTie
-  name: red-tie
-  description: A neosilk clip-on red tie.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/redtie.rsi
-    state: redtie
-
-  - type: Clothing
-    sprite: Clothing/Neck/redtie.rsi
-    HeldPrefix: redtie
-
-- type: entity
-  parent: NeckClothing
-  id: DetTie
-  name: detective's tie
-  description: A loosely tied necktie, a perfect accessory for the over-worked detective.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/dettie.rsi
-    state: dettie
-
-  - type: Clothing
-    sprite: Clothing/Neck/dettie.rsi
-    HeldPrefix: dettie
-
-- type: entity
-  parent: NeckClothing
-  id: Stethoscope
-  name: stethoscope
-  description: An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/stethoscope.rsi
-    state: stethoscope
-
-  - type: Clothing
-    sprite: Clothing/Neck/stethoscope.rsi
-    HeldPrefix: stethoscope
-
-- type: entity
-  parent: NeckClothing
-  id: StripedRedScarf
-  name: striped red scarf
-  description: A stylish striped red scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Scarfs/red_scarf.rsi
-    state: stripedredscarf
-
-  - type: Clothing
-    sprite: Clothing/Neck/Scarfs/red_scarf.rsi
-    HeldPrefix: stripedredscarf
-
-- type: entity
-  parent: NeckClothing
-  id: StripedBlueScarf
-  name: striped blue scarf
-  description: A stylish striped blue scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Scarfs/blue_scarf.rsi
-    state: stripedbluescarf
-
-  - type: Clothing
-    sprite: Clothing/Neck/Scarfs/blue_scarf.rsi
-    HeldPrefix: stripedbluescarf
-
-- type: entity
-  parent: NeckClothing
-  id: StripedGreenScarf
-  name: striped green scarf
-  description: A stylish striped green scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Scarfs/green_scarf.rsi
-    state: stripedgreenscarf
-
-  - type: Clothing
-    sprite: Clothing/Neck/Scarfs/green_scarf.rsi
-    HeldPrefix: stripedgreenscarf
-
-- type: entity
-  parent: NeckClothing
-  id: ZebraScarf
-  name: zebra scarf
-  description: A striped scarf, a mandatory accessory for artists.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi
-    state: zebrascarf
-
-  - type: Clothing
-    sprite: Clothing/Neck/Scarfs/zebra_scarf.rsi
-    HeldPrefix: zebrascarf
-
-- type: entity
-  parent: NeckClothing
-  id: Bling
-  name: bling
-  description: Damn, it feels good to be a gangster.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/bling.rsi
-    state: bling
-
-  - type: Clothing
-    sprite: Clothing/Neck/bling.rsi
-    HeldPrefix: bling

Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml

@@ -0,0 +1,43 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckScarfStripedRed
+  name: striped red scarf
+  description: A stylish striped red scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/red.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/red.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckScarfStripedBlue
+  name: striped blue scarf
+  description: A stylish striped blue scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/blue.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckScarfStripedGreen
+  name: striped green scarf
+  description: A stylish striped green scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/green.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/green.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckScarfStripedZebra
+  name: zebra scarf
+  description: A striped scarf, a mandatory accessory for artists.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/zebra.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/zebra.rsi

Resources/Prototypes/Entities/Clothing/Neck/ties.yml

@@ -0,0 +1,21 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckTieRed
+  name: red-tie
+  description: A neosilk clip-on red tie.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Ties/redtie.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Ties/redtie.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckTieDet
+  name: detective's tie
+  description: A loosely tied necktie, a perfect accessory for the over-worked detective.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Ties/dettie.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Ties/dettie.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -1,265 +1,109 @@
 - type: entity
-  parent: Clothing
+  parent: ClothingOuterBase
-  id: OuterclothingBase
+  id: ClothingOuterArmorReflective
-  abstract: true
-  components:
-  - type: Clothing
-    Slots:
-    - outerclothing
-  - type: Sprite
-    state: icon
-
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingArmorVest
-  name: armor vest
-  description: "A slim Type I armored vest that provides decent protection against most types of damage."
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/armor.rsi
-    state: armor
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/armor.rsi
-    ClothingPrefix: armor
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingArmorreflec
   name: armor (reflective)
   description: An armored vest with advanced shielding to protect against energy weapons.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/armor_reflec.rsi
+    sprite: Clothing/OuterClothing/Armor/armor_reflec.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/armor_reflec.rsi
+    sprite: Clothing/OuterClothing/Armor/armor_reflec.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingBulletproof
+  id: ClothingOuterArmorBulletproof
   name: bulletproof
   description: An armored vest with heavy plates to protect against ballistic projectiles.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/bulletproof.rsi
+    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/bulletproof.rsi
+    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingCaparmor
+  id: ClothingOuterArmorCult
-  name: captain's armor
-  description: A suit of protective formal armor made for the station's captain.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/caparmor.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/caparmor.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingAcolyte
-  name: acolyte
-  description: An armored suit for acolytes of the cult.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/acolyte.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/acolyte.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingCultarmour
   name: cult armor
   description: An evil-looking cult armor, made of bones.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/cult_armour.rsi
+    sprite: Clothing/OuterClothing/Armor/cult_armour.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/cult_armour.rsi
+    sprite: Clothing/OuterClothing/Armor/cult_armour.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingCustodian
+  id: ClothingOuterArmorHeavy
-  name: custodian
-  description: A special armormed custodian suit for cleaning trash in very dangerous places.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/custodian.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/custodian.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingHeavy
   name: heavy
   description: A heavily armored suit that protects against excessive damage.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/heavy.rsi
+    sprite: Clothing/OuterClothing/Armor/heavy.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/heavy.rsi
+    sprite: Clothing/OuterClothing/Armor/heavy.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingHmarmorvest
+  id: ClothingOuterArmorHeavyGreen
-  name: HM armor vest
+  name: heavy
-  description: A handmade armor vest with a big and thick steel plate.
+  description: A heavily armored suit with green accents that protects against excessive damage.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/hm_armorvest.rsi
+    sprite: Clothing/OuterClothing/Armor/heavygreen.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/hm_armorvest.rsi
+    sprite: Clothing/OuterClothing/Armor/heavygreen.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingHos
+  id: ClothingOuterArmorHeavyRed
-  name: HoS armor vest
+  name: heavy
-  description: A synthetic armor vest with COMMANDER printed in gold lettering on the chest. This one has added webbing and ballistic plates.
+  description: A heavily armored suit with red accents that protects against excessive damage.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/hos.rsi
+    sprite: Clothing/OuterClothing/Armor/heavyred.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/hos.rsi
+    sprite: Clothing/OuterClothing/Armor/heavyred.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingKvest
+  id: ClothingOuterArmorMagusblue
-  name: kvest
-  description: An armor vest made of synthetic fibers.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/kvest.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/kvest.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingMagusblue
   name: magus blue
   description: An blue armored suit that provides good protection.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/magusblue.rsi
+    sprite: Clothing/OuterClothing/Armor/magusblue.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/magusblue.rsi
+    sprite: Clothing/OuterClothing/Armor/magusblue.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingMagusred
+  id: ClothingOuterArmorMagusred
   name: magus red
   description: A red armored suit that provides good protection.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/magusred.rsi
+    sprite: Clothing/OuterClothing/Armor/magusred.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/magusred.rsi
+    sprite: Clothing/OuterClothing/Armor/magusred.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingMercwebvest
+  id: ClothingOuterArmorRiot
-  name: merc web vest
-  description: A high-quality armored vest made from a hard synthetic material. It is surprisingly flexible and light, despite formidable armor plating.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/mercwebvest.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/mercwebvest.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingReactive
-  name: reactive
-  description: An experimental suit with a reactive armor that stops very fast projectiles. Currently on.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/reactive.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/reactive.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingReactiveoff
-  name: reactive (off)
-  description: An experimental suit with a reactive armor that stops very fast projectiles. Currently off.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/reactiveoff.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/reactiveoff.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingRiot
   name: riot
   description: An armored vest with heavy padding to protect against melee attacks.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/riot.rsi
+    sprite: Clothing/OuterClothing/Armor/riot.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/riot.rsi
+    sprite: Clothing/OuterClothing/Armor/riot.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingScaf
+  id: ClothingOuterArmorScaf
   name: scaf
   description: A green and brown tactical suit for combat situations.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/scaf.rsi
+    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/scaf.rsi
+    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingSwat
-  name: swat
-  description: Very durable vest that provides excellent protection from ranged and melee weapons.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/swat.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/swat.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingSninja
-  name: S ninja
-  description: This black technologically advanced, cybernetically-enhanced suit provides good protection and many abilities like invisibility or teleportation.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/s_ninja.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/s_ninja.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingWebvest
-  name: web vest
-  description: A synthetic armor vest. This one has added webbing and ballistic plates.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/webvest.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/webvest.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml

@@ -0,0 +1,20 @@
+- type: entity
+  parent: Clothing
+  id: ClothingOuterBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots:
+    - outerclothing
+  - type: Sprite
+    state: icon
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterHardsuitBase
+  name: base hardsuit
+  abstract: true
+  components:
+    - type: PressureProtection
+      highPressureMultiplier: 0.75
+      lowPressureMultiplier: 100

Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml

@@ -0,0 +1,71 @@
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterBioGeneral
+  name: bio suit
+  suffix: Generic
+  description: A suit that protects against biological contamination.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Bio/general.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Bio/general.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterBioCmo
+  name: bio suit
+  suffix: CMO
+  description: An advanced suit that protects against biological contamination, in CMO colors.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Bio/cmo.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Bio/cmo.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterBioJanitor
+  name: bio suit
+  suffix: Janitor
+  description: A suit that protects against biological contamination, in Janitor colors.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Bio/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Bio/janitor.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterBioScientist
+  name: bio suit
+  suffix: Science
+  description: A suit that protects against biological contamination, in Scientist colors.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Bio/scientist.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Bio/scientist.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterBioSecurity
+  name: bio suit
+  suffix: Security
+  description: A suit that protects against biological contamination, in Security colors.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Bio/security.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Bio/security.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterBioVirology
+  name: bio suit
+  suffix: Virology
+  description: A suit that protects against biological contamination, in Virology colors.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Bio/virology.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Bio/virology.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -1,276 +1,109 @@
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingBomber
+  id: ClothingOuterCoatBomber
   name: bomber
   description: A thick, well-worn WW2 leather bomber jacket.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/bomber.rsi
+    sprite: Clothing/OuterClothing/Coats/bomber.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/bomber.rsi
+    sprite: Clothing/OuterClothing/Coats/bomber.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingBomberopen
+  id: ClothingOuterCoatDetective
-  name: bomber (open)
-  description: A thick, well-worn WW2 leather bomber jacket.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bomber_open.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bomber_open.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingCargojacket
-  name: cargo jacket
-  description: A cargo jacket.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/cargo_jacket.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/cargo_jacket.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingChurchcoat
-  name: church coat
-  description: A piety, blessed church coat.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/church_coat.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/church_coat.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingDetective
   name: detective
   description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/detective.rsi
+    sprite: Clothing/OuterClothing/Coats/detective.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/detective.rsi
+    sprite: Clothing/OuterClothing/Coats/detective.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingGentlecoat
+  id: ClothingOuterCoatGentle
   name: gentle coat
   description: A gentle coat for a gentle man, or woman.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/gentlecoat.rsi
+    sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/gentlecoat.rsi
+    sprite: Clothing/OuterClothing/Coats/gentlecoat.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingGreyhoodie
+  id: ClothingOuterCoatHoSTrench
-  name: grey hoodie
-  description: A grey hoodie.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/grey_hoodie.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/grey_hoodie.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingGreyhoodieopen
-  name: grey hoodie (open)
-  description: A grey hoodie.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingInspcoat
-  name: inspector coat
-  description: A strict inspector coat for being intimidating during inspections.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/insp_coat.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/insp_coat.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingJensencoat
-  name: jensen coat
-  description: A jensen coat.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/jensencoat.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/jensencoat.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoat
-  name: lab coat
-  description: A suit that protects against minor chemical spills.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoatopen
-  name: lab coat (open)
-  description: A suit that protects against minor chemical spills.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat_open.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat_open.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoatchem
-  name: lab coat (chem)
-  description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat_chem.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat_chem.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoatchemopen
-  name: lab coat (chem open)
-  description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoatcmo
-  name: lab coat (CMO)
-  description: Bluer than the standard model.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat_cmo.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat_cmo.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoatcmoopen
-  name: lab coat (CMO open)
-  description: Bluer than the standard model.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoatmedspec
-  name: lab coat (medical)
-  description: A snow-white, sterilised coat that protects against minor chemical spills.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat_medspec.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat_medspec.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLabcoatmedspecopen
-  name: lab coat (medical open)
-  description: A snow-white, sterilised coat that protects against minor chemical spills.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingLeatherjacket
-  name: leather jacket
-  description: A badass leather jacket.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/leather_jacket.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/leather_jacket.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingPirate
-  name: pirate
-  description: Yarr.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/pirate.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/pirate.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingQmcoat
-  name: QM coat
-  description: A robust and comfy coat for quartermasters.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/qm_coat.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/qm_coat.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingRedwizard
-  name: red wizard
-  description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/redwizard.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/redwizard.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingHoSTrenchcoat
   name: head of security trenchcoat
   description: This trenchcoat was specifically designed for asserting superior authority.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
-    state: hos_trenchcoat
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterCoatInspector
+  name: inspector coat
+  description: A strict inspector coat for being intimidating during inspections.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterCoatJensen
+  name: jensen coat
+  description: A jensen coat.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/jensencoat.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterCoatLab
+  name: lab coat
+  description: A suit that protects against minor chemical spills.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/labcoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/labcoat.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterCoatLabChem
+  name: lab coat (chem)
+  description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterCoatLabCmo
+  name: lab coat (CMO)
+  description: Bluer than the standard model.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterCoatPirate
+  name: pirate
+  description: Yarr.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/pirate.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/pirate.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -1,206 +1,180 @@
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterHardsuitBase
-  id: HardsuitBase
+  id: ClothingOuterHardsuitAtmos
-  name: base hardsuit
-  abstract: true
-  components:
-    - type: PressureProtection
-      highPressureMultiplier: 0.75
-      lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitDeathsquad
-  name: deathsquad hardsuit
-  description: An advanced hardsuit favored by commandos for use in special operations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/deathsquad.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/deathsquad.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.45
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: IHVoidsuit
-  name: IH voidsuit
-  description: A special void suit that protects against hazardous, low pressure environments.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/ihvoidsuit.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/ihvoidsuit.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 1
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitAtmos
   name: atmos hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has thermal shielding.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.5
     lowPressureMultiplier: 100
 
 - type: entity
-  parent: HardsuitBase
+  parent: ClothingOuterHardsuitBase
-  id: HardsuitEngineering
+  id: ClothingOuterHardsuitCap
+  name: captain's armor
+  description: A suit of protective formal armor made for the station's captain.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitDeathsquad
+  name: deathsquad hardsuit
+  description: An advanced hardsuit favored by commandos for use in special operations.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitEngineering
   name: engineering hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has radiation shielding.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.65
     lowPressureMultiplier: 100
 
 - type: entity
-  parent: HardsuitBase
+  parent: ClothingOuterHardsuitBase
-  id: HardsuitHazard
+  id: ClothingOuterHardsuitEngineeringWhite
-  name: hazard hardsuit
-  description: A robust hardsuit made for dangerous and hazardous situations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.75
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitMedical
-  name: medical hardsuit
-  description: A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_medical.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_medical.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.75
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitMining
-  name: mining hardsuit
-  description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_mining.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_mining.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.75
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitSecurity
-  name: security hardsuit
-  description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.75
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitSyndie
-  name: blood red hardsuit
-  description: A dual-mode advanced hardsuit designed for work in special operations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.45
-    lowPressureMultiplier: 100
-
-# Some massive smoothbrain had this named "hardsuit white" yeah thanks fuckhead really useful.
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitCE
   name: CE hardsuit
   description: A special hardsuit that protects against hazardous, low pressure environments, made for the chief engineer of the station.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/engineering-white.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/engineering-white.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
 
 - type: entity
-  parent: HardsuitBase
+  parent: ClothingOuterHardsuitBase
-  id: HardsuitWizard
+  id: IHSVoidsuit
+  name: IHS voidsuit
+  description: A special void suit that protects against hazardous, low pressure environments.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 1
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitMedical
+  name: medical hardsuit
+  description: A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/medical.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/medical.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitRd
+  name: research director's hardsuit
+  description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/rd.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/rd.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitSalvage
+  name: salvage hardsuit
+  description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitSecurity
+  name: security hardsuit
+  description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/security.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/security.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitSecurityRed
+  name: head of security's hardsuit
+  description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitSyndie
+  name: blood-red hardsuit
+  description: A dual-mode advanced hardsuit designed for work in special operations.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitWizard
   name: wizard hardsuit
   description: A bizarre gem-encrusted suit that radiates magical energies.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/wizard.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+    sprite: Clothing/OuterClothing/Hardsuits/wizard.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
-
-# I don't know what the hell "td" is but whatever i'll dump it here.
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitTDGreen
-  name: green TD hardsuit
-  description: Heavily armored black and green suit for long combat situations, also provides protection from low-pressure/vacuum damage.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/tdgreen.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/tdgreen.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 1
-    lowPressureMultiplier: 100
-
-- type: entity
-  parent: HardsuitBase
-  id: HardsuitTDRed
-  name: red TD hardsuit
-  description: Heavily armored black and red suit for long combat situations, also provides protection from low-pressure/vacuum damage.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/tdred.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/tdred.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 1
-    lowPressureMultiplier: 100

Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml

@@ -1,289 +1,199 @@
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingApron
+  id: ClothingOuterApron
   name: apron
-  description: A fancy purple apron for a stylish person.
+  description: A fancy apron for a stylish person.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/apron.rsi
+    sprite: Clothing/OuterClothing/Misc/apron.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/apron.rsi
+    sprite: Clothing/OuterClothing/Misc/apron.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingApronchef
+  id: ClothingOuterApronChef
-  name: apron (chef)
+  name: apron
+  suffix: Chef
   description: An apron-jacket used by a high class chef.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/apronchef.rsi
+    sprite: Clothing/OuterClothing/Misc/apronchef.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/apronchef.rsi
+    sprite: Clothing/OuterClothing/Misc/apronchef.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingAssjacket
+  id: ClothingOuterJacketChef
-  name: ass jacket
-  description: Very damaged orange jacket. Don't be silly, do not wear it.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/ass_jacket.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/ass_jacket.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBedsheet
-  name: ghost costume
-  description: This is obviously just a bedsheet, but maybe try it on?
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bedsheet.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bedsheet.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBlackhoodie
-  name: black hoodie
-  description: Oh my God, it's a black hoodie!
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/black_hoodie.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/black_hoodie.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBlackhoodieopen
-  name: black hoodie (open)
-  description: Oh my God, it's a black hoodie!
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/black_hoodie_open.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/black_hoodie_open.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingCardborg
-  name: cardborg
-  description: An ordinary cardboard box with holes cut in the sides.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/cardborg.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/cardborg.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingChaplainhoodie
-  name: chaplain hoodie
-  description: Black and strict chaplain hoodie.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingChef
   name: chef
   description: An apron-jacket used by a high class chef.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/chef.rsi
+    sprite: Clothing/OuterClothing/Misc/chef.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/chef.rsi
+    sprite: Clothing/OuterClothing/Misc/chef.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingChickensuit
+  id: ClothingOuterHoodieBlack
-  name: chicken suit
+  name: black hoodie
-  description: Bok bok bok!
+  description: Oh my God, it's a black hoodie!
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/chickensuit.rsi
+    sprite: Clothing/OuterClothing/Misc/black_hoodie.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/chickensuit.rsi
+    sprite: Clothing/OuterClothing/Misc/black_hoodie.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingClassicponcho
+  id: ClothingOuterHoodieGrey
+  name: grey hoodie
+  description: A grey hoodie.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/grey_hoodie.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/grey_hoodie.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterCardborg
+  name: cardborg
+  description: An ordinary cardboard box with holes cut in the sides.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/cardborg.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/cardborg.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterHoodieChaplain
+  name: chaplain hoodie
+  description: Black and strict chaplain hoodie.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/chaplain_hoodie.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/chaplain_hoodie.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterPonchoClassic
   name: classic poncho
   description: A warm and comfy classic poncho.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/classicponcho.rsi
+    sprite: Clothing/OuterClothing/Misc/classicponcho.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/classicponcho.rsi
+    sprite: Clothing/OuterClothing/Misc/classicponcho.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingCultrobes
+  id: ClothingOuterRobesCult
   name: cult robes
   description: There's no cult without classic red/crimson cult robes.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/cultrobes.rsi
+    sprite: Clothing/OuterClothing/Misc/cultrobes.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/cultrobes.rsi
+    sprite: Clothing/OuterClothing/Misc/cultrobes.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingDetvest
+  id: ClothingOuterRobesJudge
-  name: detective's vest
-  description: A hard-boiled private investigator's grey trenchcoat.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/detvest.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/detvest.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingHazard
-  name: hazard
-  description: A high-visibility vest used in work zones.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/hazard.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/hazard.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingJudge
   name: judge
   description: This robe commands authority.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/judge.rsi
+    sprite: Clothing/OuterClothing/Misc/judge.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/judge.rsi
+    sprite: Clothing/OuterClothing/Misc/judge.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingMonkeysuit
+  id: ClothingOuterPoncho
-  name: monkey suit
-  description: A suit that looks like a primate.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/monkeysuit.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/monkeysuit.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingPoncho
   name: poncho
   description: A warm and comfy poncho.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/poncho.rsi
+    sprite: Clothing/OuterClothing/Misc/poncho.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/poncho.rsi
+    sprite: Clothing/OuterClothing/Misc/poncho.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingSanta
+  id: ClothingOuterSanta
   name: santa
   description: Ho ho ho!
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/santa.rsi
+    sprite: Clothing/OuterClothing/Misc/santa.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/santa.rsi
+    sprite: Clothing/OuterClothing/Misc/santa.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingStraightjacket
+  id: ClothingOuterStraightjacket
   name: straight jacket
   description: A straight jacket.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/straight_jacket.rsi
+    sprite: Clothing/OuterClothing/Misc/straight_jacket.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/straight_jacket.rsi
+    sprite: Clothing/OuterClothing/Misc/straight_jacket.rsi
-
-# This sprite looks like shit too but whatever...
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingSurgeon
-  name: surgeon
-  description: A sterile blue surgical apron.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/surgeon.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/surgeon.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingVest
-  name: vest
-  description: A thick vest with a rubbery, water-resistant shell.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/vest.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/vest.rsi
 
 # Is this wizard wearing a fanny pack???
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingVioletwizard
+  id: ClothingOuterWizardViolet
   name: violet wizard
   description: A bizarre gem-encrusted violet robe that radiates magical energies.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/violetwizard.rsi
+    sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/violetwizard.rsi
+    sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingWizard
+  id: ClothingOuterWizard
   name: wizard
   description: A bizarre gem-encrusted blue robe that radiates magical energies.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/wizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/wizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingXenos
+  id: ClothingOuterXenos
   name: xenos
   description: A suit made out of chitinous alien hide.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/xenos.rsi
+    sprite: Clothing/OuterClothing/Misc/xenos.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/xenos.rsi
+    sprite: Clothing/OuterClothing/Misc/xenos.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterWizardRed
+  name: red wizard
+  description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/redwizard.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/redwizard.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterSkub
+  name: Skub Suit
+  description: 'Skub is crudely written on the outside of this cylindrical suit.'
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/skubbody.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/skubbody.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

@@ -1,206 +1,91 @@
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingBio
+  id: ClothingOuterSuitBomb
-  name: bio
-  description: A suit that protects against biological contamination.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bio.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bio.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBiocmo
-  name: bio suit (CMO)
-  description: An advanced suit that protects against biological contamination, in CMO colors.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bio_cmo.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bio_cmo.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBiogeneral
-  name: bio suit
-  description: A suit that protects against biological contamination.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bio_general.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bio_general.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBiojanitor
-  name: bio suit (janitor)
-  description: A suit that protects against biological contamination, in Janitor colors.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bio_janitor.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bio_janitor.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBioscientist
-  name: bio suit (scientist)
-  description: A suit that protects against biological contamination, in Scientist colors.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bio_scientist.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bio_scientist.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBiosecurity
-  name: bio suit (security)
-  description: A suit that protects against biological contamination, in Security colors.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bio_security.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bio_security.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBiovirology
-  name: bio suit (virology)
-  description: A suit that protects against biological contamination, in Virology colors.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bio_virology.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bio_virology.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBombsuit
   name: bombsuit
   description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/bombsuit.rsi
+    sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/bombsuit.rsi
+    sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingBombsuitsec
+  id: ClothingOuterSuitEmergency
-  name: bombsuit (security)
-  description: A heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce, in Security colors.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bombsuitsec.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bombsuitsec.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingBombsuitwhite
-  name: bombsuit (white)
-  description: A white heavy helmet designed to withstand the pressure generated by a bomb and any fragments the bomb may produce.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/bombsuit_white.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/bombsuit_white.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingAnomalysuit
-  name: anomaly suit
-  description: A special suit designed for safe examining of anomalies.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/anomaly_suit.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/anomaly_suit.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingEmergencysuit
   name: emergency suit
   description: An emergency suit in cases of... emergencies.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/emergency_suit.rsi
+    sprite: Clothing/OuterClothing/Suits/emergency.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/emergency_suit.rsi
+    sprite: Clothing/OuterClothing/Suits/emergency.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingFiresuit
+  id: ClothingOuterSuitFire
   name: fire suit
   description: A suit that helps protect against fire and heat.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/firesuit.rsi
+    sprite: Clothing/OuterClothing/Suits/fire.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.85
     lowPressureMultiplier: 25
   - type: Clothing
-    sprite: Clothing/OuterClothing/firesuit.rsi
+    sprite: Clothing/OuterClothing/Suits/fire.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingRadSuit
+  id: ClothingOuterSuitRad
   name: rad suit
   description: "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'"
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/radsuit.rsi
+    sprite: Clothing/OuterClothing/Suits/rad.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/radsuit.rsi
+    sprite: Clothing/OuterClothing/Suits/rad.rsi
-
-- type: entity
-  parent: OuterclothingBase
-  id: OuterclothingSkub
-  name: Skub Suit
-  description: 'Skub is crudely written on the outside of this cylindrical suit.'
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/skubbody.rsi
-
-  - type: Clothing
-    sprite: Clothing/OuterClothing/skubbody.rsi
 
 # I think this is a suit? Looks baggy enough
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingSyndicate
+  id: ClothingOuterSuitSyndicate
   name: syndicate
   description: "Has a tag on it 'Totally not property of an enemy corporation, honest!'"
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/syndicate.rsi
+    sprite: Clothing/OuterClothing/Suits/syndicate.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/syndicate.rsi
+    sprite: Clothing/OuterClothing/Suits/syndicate.rsi
 
 - type: entity
-  parent: OuterclothingBase
+  parent: ClothingOuterBase
-  id: OuterclothingVoid
+  id: ClothingOuterSuitSpaceninja
-  name: void
+  name: S ninja
-  description: A special suit for space walking.
+  description: This black technologically advanced, cybernetically-enhanced suit provides good protection and many abilities like invisibility or teleportation.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/void.rsi
+    sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
-
   - type: Clothing
-    sprite: Clothing/OuterClothing/void.rsi
+    sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterSuitChicken
+  name: chicken suit
+  description: Bok bok bok!
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/chicken.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/chicken.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterSuitMonkey
+  name: monkey suit
+  description: A suit that looks like a primate.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/monkey.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/monkey.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

@@ -0,0 +1,65 @@
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestWebMerc
+  name: merc web vest
+  description: A high-quality armored vest made from a hard synthetic material. It is surprisingly flexible and light, despite formidable armor plating.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestWeb
+  name: web vest
+  description: A synthetic armor vest. This one has added webbing and ballistic plates.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/webvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/webvest.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestKevlar
+  name: kevlar vest
+  description: An armor vest made of synthetic fibers.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/kevlar.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/kevlar.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestDetective
+  name: detective's vest
+  description: A hard-boiled private investigator's grey trenchcoat.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/detvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/detvest.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVestHazard
+  name: hazard
+  description: A high-visibility vest used in work zones.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/hazard.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/hazard.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterVest
+  name: vest
+  description: A thick vest with a rubbery, water-resistant shell.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/vest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/vest.rsi

Resources/Prototypes/Entities/Clothing/Shoes/base.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: Clothing
+  id: ClothingShoesBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots:
+    - shoes
+  - type: Sprite
+    state: icon

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -0,0 +1,33 @@
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsMag
+  name: magboots
+  description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/magboots.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/magboots.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsWork
+  name: workboots shoes
+  description: Engineering lace-up work boots for the especially blue-collar.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/workboots.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/workboots.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsJack
+  name: jackboots
+  description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/jackboots.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/jackboots.rsi

Resources/Prototypes/Entities/Clothing/Shoes/clown.yml

@@ -1,14 +0,0 @@
-- type: entity
-  parent: ShoesBase
-  id: ShoesClown
-  name: clown shoes
-  description: "The prankster's standard-issue clowning shoes. Damn they're huge!"
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/clown.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/clown.rsi
-  - type: LoopingSound
-  - type: FootstepModifier
-    footstepSoundCollection: footstep_clown

Resources/Prototypes/Entities/Clothing/Shoes/color.yml

@@ -0,0 +1,98 @@
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorBlack
+  name: black shoes
+  description: Stylish black shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/black.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/black.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorBlue
+  name: blue shoes
+  description: Stylish blue shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/blue.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorBrown
+  name: brown shoes
+  description: A pair of brown shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/brown.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/brown.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorGreen
+  name: green shoes
+  description: Stylish green shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/green.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/green.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorOrange
+  name: orange shoes
+  description: Stylish orange shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/orange.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/orange.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorPurple
+  name: purple shoes
+  description: Stylish purple shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/purple.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/purple.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorRed
+  name: red shoes
+  description: Stylish red shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/red.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/red.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorWhite
+  name: white shoes
+  description: Don't take them off at your office Christmas party.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/white.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/white.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesColorYellow
+  name: yellow shoes
+  description: Stylish yellow shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Color/yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Color/yellow.rsi

Resources/Prototypes/Entities/Clothing/Shoes/misc.yml

@@ -0,0 +1,43 @@
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesFlippers
+  name: flippers
+  description: A pair of rubber flippers that improves swimming ability when worn.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Misc/flippers.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Misc/flippers.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesLeather
+  name: leather shoes
+  description: Very stylish pair of boots, made from fine leather.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Misc/leather.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Misc/leather.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesSlippers
+  name: slippers
+  description: Fluffy!
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Misc/slippers.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Misc/slippers.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesTourist
+  name: tourist shoes
+  description: These cheap sandals don't look very comfortable.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Misc/tourist.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Misc/tourist.rsi

Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml

@@ -1,358 +0,0 @@
-- type: entity
-  parent: Clothing
-  id: ShoesBase
-  abstract: true
-  components:
-  - type: Clothing
-    Slots:
-    - shoes
-  - type: Sprite
-    state: icon
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesBlack
-  name: black shoes
-  description: Stylish black shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/black.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/black.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesBlue
-  name: blue shoes
-  description: Stylish blue shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/blue.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/blue.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesBoots
-  name: boots
-  description: Comfortable-looking boots.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/boots.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/boots.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesBrown
-  name: brown shoes
-  description: A pair of brown shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/brown.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/brown.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesChef
-  name: chef shoes
-  description: Sturdy shoes that minimize injury from falling objects or knives.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/chef.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/chef.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesCowboy
-  name: cowboy shoes
-  description: A small sticker lets you know they've been inspected for snakes, It is unclear how long ago the inspection took place...
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/cowboy.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/cowboy.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesCult
-  name: cult shoes
-  description: A pair of boots worn by the followers of Nar'Sie.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/cult.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/cult.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesDetective
-  name: detective shoes
-  description: This pair of leather boots has seen better days.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/detective.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/detective.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesFlippers
-  name: flippers
-  description: A pair of rubber flippers that improves swimming ability when worn.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/flippers.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/flippers.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesGaloshes
-  name: galoshes shoes
-  description: Rubber boots.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/galoshes.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/galoshes.rsi
-  - type: NoSlip
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesGreen
-  name: green shoes
-  description: Stylish green shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/green.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/green.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesLeather
-  name: leather shoes
-  description: Very stylish pair of boots, made from fine leather.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/leather.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/leather.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesMagboots
-  name: magboots
-  description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/magboots.rsi
-    state: icon
-  - type: Clothing
-    sprite: Clothing/Shoes/magboots.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesMime
-  name: mime shoes
-  description: ...
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/mime.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/mime.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesOrange
-  name: orange shoes
-  description: Stylish orange shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/orange.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/orange.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesPurple
-  name: purple shoes
-  description: Stylish purple shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/purple.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/purple.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesRed
-  name: red shoes
-  description: Stylish red shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/red.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/red.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesSlippers
-  name: slippers
-  description: Fluffy!
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/slippers.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/slippers.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesSpringjacks
-  name: springjacks
-  description: Uh... Those are spring jacks.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/springjacks.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/springjacks.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesSwat
-  name: swat shoes
-  description: When you want to turn up the heat.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/swat.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/swat.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesSNinja
-  name: S ninja shoes
-  description: A pair of nano-enhanced oots with built-in magnetic suction cups.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/s_ninja.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/s_ninja.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesTourist
-  name: tourist shoes
-  description: These cheap sandals don't look very comfortable.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/tourist.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/tourist.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesWhite
-  name: white shoes
-  description: Don't take them off at your office Christmas party.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/white.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/white.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesWizard
-  name: wizard shoes
-  description: A pair of magic shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/wizard.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/wizard.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesWorkboots
-  name: workboots shoes
-  description: Engineering lace-up work boots for the especially blue-collar.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/workboots.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/workboots.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesYellow
-  name: yellow shoes
-  description: Stylish yellow shoes.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/yellow.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/yellow.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesBee
-  name: bee socks
-  description: Make them loins buzz!
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/beesocks.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/beesocks.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesCoder
-  name: coder socks
-  description: It's time to code sisters!!11!
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/codersocks.rsi
-
-  - type: Clothing
-    sprite: Clothing/Shoes/codersocks.rsi
-
-- type: entity
-  parent: ShoesBase
-  id: ShoesJackboots
-  name: jackboots
-  description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time.
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/jackboots.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/jackboots.rsi

Resources/Prototypes/Entities/Clothing/Shoes/specific.yml

@@ -0,0 +1,81 @@
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesChef
+  name: chef shoes
+  description: Sturdy shoes that minimize injury from falling objects or knives.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/chef.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/chef.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesClown
+  name: clown shoes
+  description: "The prankster's standard-issue clowning shoes. Damn they're huge!"
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/clown.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/clown.rsi
+  - type: LoopingSound
+  - type: FootstepModifier
+    footstepSoundCollection: footstep_clown
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesCult
+  name: cult shoes
+  description: A pair of boots worn by the followers of Nar'Sie.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/cult.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/cult.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesGaloshes
+  name: galoshes shoes
+  description: Rubber boots.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/galoshes.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/galoshes.rsi
+  - type: NoSlip
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesSNinja
+  name: S ninja shoes
+  description: A pair of nano-enhanced oots with built-in magnetic suction cups.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/spaceninja.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/spaceninja.rsi
+  - type: NoSlip
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesSwat
+  name: swat shoes
+  description: When you want to turn up the heat.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/swat.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/swat.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesWizard
+  name: wizard shoes
+  description: A pair of magic shoes.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/wizard.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/wizard.rsi

Resources/Prototypes/Entities/Clothing/Under/under.yml

@@ -0,0 +1,24 @@
+# These are technically shoes for now, as we don't actually have underwear. But
+# I would cry if we didn't have them. -swept
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingUnderSocksBee
+  name: bee socks
+  description: Make them loins buzz!
+  components:
+  - type: Sprite
+    sprite: Clothing/Under/Socks/bee.rsi
+  - type: Clothing
+    sprite: Clothing/Under/Socks/bee.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingUnderSocksCoder
+  name: coder socks
+  description: It's time to code sisters!!11!
+  components:
+  - type: Sprite
+    sprite: Clothing/Under/Socks/coder.rsi
+  - type: Clothing
+    sprite: Clothing/Under/Socks/coder.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/base.yml

@@ -0,0 +1,20 @@
+- type: entity
+  parent: Clothing
+  id: ClothingUniformBase
+  abstract: true
+  components:
+  - type: Sprite
+    state: icon
+  - type: Clothing
+    Slots: [innerclothing]
+
+- type: entity
+  parent: Clothing
+  id: ClothingUniformSkirtBase
+  abstract: true
+  components:
+  - type: Sprite
+    state: icon
+  - type: Clothing
+    Slots: [innerclothing]
+    femaleMask: UniformTop

Resources/Prototypes/Entities/Clothing/Uniforms/color.yml

@@ -1,475 +0,0 @@
-- type: entity
-  parent: UniformBase
-  id: UniformColorBase
-  abstract: true
-  description: A standard issue colored jumpsuit. Variety is the spice of life!
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/color.rsi
-
-
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/color.rsi
-
-# worldwide
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorGrey
-  description: A tasteful grey jumpsuit that reminds you of the good old days.
-  name: grey jumpsuit
-  components:
-  - type: Sprite
-    state: grey
-
-  - type: Clothing
-    HeldPrefix: grey
-
-- type: entity
-  parent: UniformColorGrey
-  id: UniformColorGreySkirt
-  description: A tasteful grey jumpskirt that reminds you of the good old days.
-  name: grey jumpskirt
-  components:
-  - type: Sprite
-    state: grey_skirt
-
-  - type: Clothing
-    ClothingPrefix: grey_skirt
-    femaleMask: UniformTop
-    HeldPrefix: grey
-
-# Black
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorBlack
-  name: black jumpsuit
-  description: A generic black jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: black
-
-  - type: Clothing
-    HeldPrefix: black
-
-- type: entity
-  parent: UniformColorBlack
-  id: UniformColorBlackSkirt
-  name: black jumpskirt
-  description: A generic black jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: black_skirt
-
-  - type: Clothing
-    ClothingPrefix: black_skirt
-    femaleMask: UniformTop
-    HeldPrefix: black
-
-# Blue
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorBlue
-  name: blue jumpsuit
-  description: A generic blue jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: blue
-
-  - type: Clothing
-    HeldPrefix: blue
-
-- type: entity
-  parent: UniformColorBlue
-  id: UniformColorBlueSkirt
-  name: blue jumpskirt
-  description: A generic blue jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: blue_skirt
-
-  - type: Clothing
-    ClothingPrefix: blue_skirt
-    femaleMask: UniformTop
-    HeldPrefix: blue
-
-# Green
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorGreen
-  name: green jumpsuit
-  description: A generic green jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: green
-
-  - type: Clothing
-    HeldPrefix: green
-
-- type: entity
-  parent: UniformColorGreen
-  id: UniformColorGreenSkirt
-  name: green jumpskirt
-  description: A generic green jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: green_skirt
-
-  - type: Clothing
-    ClothingPrefix: green_skirt
-    femaleMask: UniformTop
-    HeldPrefix: green
-
-# Orange
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorOrange
-  name: orange jumpsuit
-  description: "Don't wear this near paranoid security officers."
-  components:
-  - type: Sprite
-    state: orange
-
-  - type: Clothing
-    HeldPrefix: orange
-
-- type: entity
-  parent: UniformColorOrange
-  id: UniformColorOrangeSkirt
-  name: orange jumpskirt
-  description: "Don't wear this near paranoid security officers."
-  components:
-  - type: Sprite
-    state: orange_skirt
-
-  - type: Clothing
-    ClothingPrefix: orange_skirt
-    femaleMask: UniformTop
-    HeldPrefix: orange
-
-# Pink
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorPink
-  name: pink jumpsuit
-  description: "Just looking at this makes you feel fabulous."
-  components:
-  - type: Sprite
-    state: pink
-
-  - type: Clothing
-    ClothingPrefix: pink
-    HeldPrefix: pink
-
-- type: entity
-  parent: UniformColorPink
-  id: UniformColorPinkSkirt
-  name: pink jumpskirt
-  description: "Just looking at this makes you feel fabulous."
-  components:
-  - type: Sprite
-    state: pink_skirt
-
-  - type: Clothing
-    ClothingPrefix: pink_skirt
-    femaleMask: UniformTop
-    HeldPrefix: pink
-
-- type: entity
-  parent: UniformColorBase
-  id: S
-  name: s
-  components:
-  - type: Sprite
-    state: s
-
-  - type: Clothing
-    HeldPrefix: s
-
-# Red
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorRed
-  name: red jumpsuit
-  description: A generic red jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: red
-
-  - type: Clothing
-    HeldPrefix: red
-
-- type: entity
-  parent: UniformColorRed
-  id: UniformColorRedSkirt
-  name: red jumpskirt
-  description: A generic red jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: red_skirt
-
-  - type: Clothing
-    ClothingPrefix: red_skirt
-    femaleMask: UniformTop
-    HeldPrefix: red
-
-# White
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorWhite
-  name: white jumpsuit
-  description: A generic white jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: white
-
-  - type: Clothing
-    HeldPrefix: white
-
-- type: entity
-  parent: UniformColorWhite
-  id: UniformColorWhiteSkirt
-  name: white jumpskirt
-  description: A generic white jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: white_skirt
-
-  - type: Clothing
-    ClothingPrefix: white_skirt
-    femaleMask: UniformTop
-    HeldPrefix: white
-
-# Yellow
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorYellow
-  name: yellow jumpsuit
-  description: A generic yellow jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: yellow
-
-  - type: Clothing
-    HeldPrefix: yellow
-
-- type: entity
-  parent: UniformColorYellow
-  id: UniformColorYellowSkirt
-  name: yellow jumpskirt
-  description: A generic yellow jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: yellow_skirt
-
-  - type: Clothing
-    ClothingPrefix: yellow_skirt
-    femaleMask: UniformTop
-    HeldPrefix: yellow
-
-# Dark blue
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorDarkBlue
-  name: dark blue jumpsuit
-  description: A generic dark blue jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: darkblue
-
-  - type: Clothing
-    ClothingPrefix: darkblue
-    HeldPrefix: darkblue
-
-- type: entity
-  parent: UniformColorDarkBlue
-  id: UniformColorDarkBlueSkirt
-  name: dark blue jumpskirt
-  description: A generic dark blue jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: darkblue_skirt
-
-  - type: Clothing
-    ClothingPrefix: darkblue_skirt
-    femaleMask: UniformTop
-    HeldPrefix: darkblue
-
-# Teal
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorTeal
-  name: teal jumpsuit
-  description: A generic teal jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: teal
-
-  - type: Clothing
-    ClothingPrefix: teal
-    HeldPrefix: teal
-
-- type: entity
-  parent: UniformColorTeal
-  id: UniformColorTealSkirt
-  name: teal jumpskirt
-  description: A generic teal jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: teal_skirt
-
-  - type: Clothing
-    ClothingPrefix: teal_skirt
-    femaleMask: UniformTop
-    HeldPrefix: teal
-
-# Purple
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorPurple
-  name: purple jumpsuit
-  description: A generic purple jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: lightpurple
-
-  - type: Clothing
-    ClothingPrefix: lightpurple
-    HeldPrefix: lightpurple
-
-- type: entity
-  parent: UniformColorPurple
-  id: UniformColorPurpleSkirt
-  name: purple jumpskirt
-  description: A generic purple jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: lightpurple_skirt
-
-  - type: Clothing
-    ClothingPrefix: lightpurple_skirt
-    femaleMask: UniformTop
-    HeldPrefix: lightpurple
-
-# Dark Green
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorDarkGreen
-  name: dark green jumpsuit
-  description: A generic dark green jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: darkgreen
-
-  - type: Clothing
-    ClothingPrefix: darkgreen
-    HeldPrefix: green
-
-- type: entity
-  parent: UniformColorDarkGreen
-  id: UniformColorDarkGreenSkirt
-  name: dark green jumpskirt
-  description: A generic dark green jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: darkgreen_skirt
-
-  - type: Clothing
-    ClothingPrefix: darkgreen_skirt
-    femaleMask: UniformTop
-    HeldPrefix: green
-
-# Light Brown
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorLightBrown
-  name: light brown jumpsuit
-  description: A generic light brown jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: lightbrown
-
-  - type: Clothing
-    HeldPrefix: lightbrown
-
-- type: entity
-  parent: UniformColorLightBrown
-  id: UniformColorLightBrownSkirt
-  name: light brown jumpskirt
-  description: A generic light brown jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: lightbrown_skirt
-
-  - type: Clothing
-    ClothingPrefix: lightbrown_skirt
-    femaleMask: UniformTop
-    HeldPrefix: lightbrown
-
-# Brown
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorBrown
-  name: brown jumpsuit
-  description: A generic brown jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: brown
-
-  - type: Clothing
-    ClothingPrefix: brown
-    HeldPrefix: lightbrown
-
-- type: entity
-  parent: UniformColorBrown
-  id: UniformColorBrownSkirt
-  name: brown jumpskirt
-  description: A generic brown jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: brown_skirt
-
-  - type: Clothing
-    ClothingPrefix: brown_skirt
-    femaleMask: UniformTop
-
-# Maroon
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorMaroon
-  name: maroon jumpsuit
-  description: A generic maroon jumpsuit with no rank markings.
-  components:
-  - type: Sprite
-    state: maroon
-
-  - type: Clothing
-    ClothingPrefix: maroon
-    HeldPrefix: maroon
-
-- type: entity
-  parent: UniformColorMaroon
-  id: UniformColorMaroonSkirt
-  name: maroon jumpskirt
-  description: A generic maroon jumpskirt with no rank markings.
-  components:
-  - type: Sprite
-    state: maroon_skirt
-
-  - type: Clothing
-    ClothingPrefix: maroon_skirt
-    femaleMask: UniformTop
-    HeldPrefix: maroon
-
-# Rainbow
-- type: entity
-  parent: UniformColorBase
-  id: UniformColorRainbow
-  name: rainbow jumpsuit
-  description: A multi-colored jumpsuit!
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/rainbow.rsi
-    state: icon
-  - type: Clothing
-    sprite: Clothing/Uniforms/rainbow.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -0,0 +1,452 @@
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtBartender
+  name: bartender's uniform
+  description: A nice and tidy uniform. Shame about the bar though.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCargo
+  name: cargo tech jumpskirt
+  description: A sturdy jumpskirt, issued to members of the Cargo department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtChiefEngineer
+  name: ce jumpskirt
+  description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtChaplain
+  name: chaplain's jumpskirt
+  description: It's a black jumpskirt, often worn by religious folk.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/chaplain.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/chaplain.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtChef
+  name: chef uniform
+  description: Can't cook without this.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/chef.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/chef.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtChemistry
+  name: chemistry jumpskirt
+  description: There's some odd stains on this jumpskirt. Hm.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCMO
+  name: cmo jumpskirt
+  description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtDetective
+  name: hard-worn suit
+  description: Someone who wears this means business.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/detective.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/detective.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtDetectiveGrey
+  name: noir suit
+  description: A hard-boiled private investigator's grey suit, complete with tie clip.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/detective_grey.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/detective_grey.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtEngineering
+  name: engineering jumpskirt
+  description: If this suit was non-conductive, maybe engineers would actually do their damn job.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHoP
+  name: hop jumpskirt
+  description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHoS
+  name: head of security jumpskirt
+  description: It's bright red and rather crisp, much like security's victims tend to be.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHoSAlt
+  name: head of security turtleneck
+  description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHoSParadeMale
+  name: head of security's parade uniform
+  description: A male head of security's luxury-wear, for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHydroponics
+  name: hydroponics jumpskirt
+  description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtJanitor
+  name: janitor jumpskirt
+  description: The jumpskirt for the poor sop with a mop.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtMedicalDoctor
+  name: medical doctor jumpskirt
+  description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/medical.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtMime
+  name: mime suit
+  description: ...
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/mime.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/mime.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtParamedic
+  name: paramedic jumpskirt
+  description: It's got a plus on it, that's a good thing right?
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtPrisoner
+  name: prisoner jumpskirt
+  description: Busted.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtQM
+  name: quartermaster's jumpskirt
+  description: 'What can brown do for you?'
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/qm.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/qm.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtResearchDirector
+  name: research director's turtleneck
+  description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtScientist
+  name: scientist jumpskirt
+  description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtSec
+  name: security jumpskirt
+  description: A jumpskirt made of strong material, providing robust protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtWarden
+  name: warden's uniform
+  description: A formal security suit for officers complete with Nanotrasen belt buckle.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+
+# COLORS
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorGrey
+  description: A tasteful grey jumpskirt that reminds you of the good old days.
+  name: grey jumpskirt
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorBlack
+  name: black jumpskirt
+  description: A generic black jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/black.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/black.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorBlue
+  name: blue jumpskirt
+  description: A generic blue jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/blue.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorGreen
+  name: green jumpskirt
+  description: A generic green jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/green.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/green.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorOrange
+  name: orange jumpskirt
+  description: "Don't wear this near paranoid security officers."
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/orange.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/orange.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorPink
+  name: pink jumpskirt
+  description: "Just looking at this makes you feel fabulous."
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/pink.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/pink.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorRed
+  name: red jumpskirt
+  description: A generic red jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/red.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/red.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorWhite
+  name: white jumpskirt
+  description: A generic white jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/white.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/white.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorYellow
+  name: yellow jumpskirt
+  description: A generic yellow jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/yellow.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorDarkBlue
+  name: dark blue jumpskirt
+  description: A generic dark blue jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/darkblue.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorTeal
+  name: teal jumpskirt
+  description: A generic teal jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/teal.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/teal.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorPurple
+  name: purple jumpskirt
+  description: A generic purple jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/lightpurple.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorDarkGreen
+  name: dark green jumpskirt
+  description: A generic dark green jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/darkgreen.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorLightBrown
+  name: light brown jumpskirt
+  description: A generic light brown jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorBrown
+  name: brown jumpskirt
+  description: A generic brown jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/brown.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/brown.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorMaroon
+  name: maroon jumpskirt
+  description: A generic maroon jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -0,0 +1,550 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitBartender
+  name: bartender's uniform
+  description: A nice and tidy uniform. Shame about the bar though.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitBartenderPurple
+  name: purple bartender's uniform
+  description: A special purple outfit to serve drinks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCaptain
+  name: captain's jumpsuit
+  description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/captain.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/captain.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCargo
+  name: cargo tech jumpsuit
+  description: A sturdy jumpsuit, issued to members of the Cargo department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChiefEngineer
+  name: ce jumpsuit
+  description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
+
+- type: entity
+  parent: ClothingUniformJumpsuitChiefEngineer
+  id: S
+  name: s
+  components:
+  - type: Sprite
+    state: s
+  - type: Clothing
+    HeldPrefix: s
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChaplain
+  name: chaplain's jumpsuit
+  description: It's a black jumpsuit, often worn by religious folk.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChef
+  name: chef uniform
+  description: Can't cook without this.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/chef.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/chef.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChemistry
+  name: chemistry jumpsuit
+  description: There's some odd stains on this jumpsuit. Hm.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitClown
+  name: clown suit
+  description: HONK!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCMO
+  name: cmo jumpsuit
+  description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitDetective
+  name: hard-worn suit
+  description: Someone who wears this means business.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpsuit/detective.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpsuit/detective.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitDetectiveGrey
+  name: noir suit
+  description: A hard-boiled private investigator's grey suit, complete with tie clip.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitEngineering
+  name: engineering jumpsuit
+  description: If this suit was non-conductive, maybe engineers would actually do their damn job.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHoP
+  name: hop jumpsuit
+  description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHoS
+  name: head of security jumpsuit
+  description: It's bright red and rather crisp, much like security's victims tend to be.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHoSAlt
+  name: head of security turtleneck
+  description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHoSBlue
+  name: head of security's blue jumpsuit
+  description: A blue jumpsuit of Head of Security.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHoSGrey
+  name: head of security's grey jumpsuit
+  description: A grey jumpsuit of Head of Security, which make him look somewhat like an assistant.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHoSParadeMale
+  name: head of security's parade uniform
+  description: A male head of security's luxury-wear, for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHydroponics
+  name: hydroponics jumpsuit
+  description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitJanitor
+  name: janitor jumpsuit
+  description: The jumpsuit for the poor sop with a mop.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitMedicalDoctor
+  name: medical doctor jumpsuit
+  description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/medical.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitMime
+  name: mime suit
+  description: ...
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/mime.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/mime.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitParamedic
+  name: paramedic jumpsuit
+  description: It's got a plus on it, that's a good thing right?
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitPrisoner
+  name: prisoner jumpsuit
+  description: Busted.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitQM
+  name: quartermaster's jumpsuit
+  description: 'What can brown do for you?'
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/qm.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/qm.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitResearchDirector
+  name: research director's turtleneck
+  description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitScientist
+  name: scientist jumpsuit
+  description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitSec
+  name: security jumpsuit
+  description: A jumpsuit made of strong material, providing robust protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitSecBlue
+  name: blue shirt and tie
+  description: I'm a little busy right now, Calhoun.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitSecGrey
+  name: grey security jumpsuit
+  description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWarden
+  name: warden's uniform
+  description: A formal security suit for officers complete with Nanotrasen belt buckle.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+
+# COLORS
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorGrey
+  description: A tasteful grey jumpsuit that reminds you of the good old days.
+  name: grey jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorBlack
+  name: black jumpsuit
+  description: A generic black jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorBlue
+  name: blue jumpsuit
+  description: A generic blue jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/blue.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorGreen
+  name: green jumpsuit
+  description: A generic green jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/green.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/green.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorOrange
+  name: orange jumpsuit
+  description: "Don't wear this near paranoid security officers."
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/orange.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/orange.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorPink
+  name: pink jumpsuit
+  description: "Just looking at this makes you feel fabulous."
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/pink.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/pink.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorRed
+  name: red jumpsuit
+  description: A generic red jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/red.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/red.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorWhite
+  name: white jumpsuit
+  description: A generic white jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/white.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/white.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorYellow
+  name: yellow jumpsuit
+  description: A generic yellow jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/yellow.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorDarkBlue
+  name: dark blue jumpsuit
+  description: A generic dark blue jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorTeal
+  name: teal jumpsuit
+  description: A generic teal jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/teal.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/teal.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorPurple
+  name: purple jumpsuit
+  description: A generic purple jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorDarkGreen
+  name: dark green jumpsuit
+  description: A generic dark green jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorLightBrown
+  name: light brown jumpsuit
+  description: A generic light brown jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorBrown
+  name: brown jumpsuit
+  description: A generic brown jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/brown.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/brown.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorMaroon
+  name: maroon jumpsuit
+  description: A generic maroon jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/Color/maroon.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/Color/maroon.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformColorRainbow
+  name: rainbow jumpsuit
+  description: A multi-colored jumpsuit!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml

@@ -0,0 +1,32 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorPurple
+  name: purple scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Scrubs/purple.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Scrubs/purple.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorGreen
+  name: green scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Scrubs/green.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Scrubs/green.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformScrubsColorBlue
+  name: blue scrubs
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Scrubs/blue.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Scrubs/blue.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml

@@ -1,918 +0,0 @@
-- type: entity
-  parent: Clothing
-  id: UniformBase
-  abstract: true
-  components:
-  - type: Clothing
-    Slots: [innerclothing]
-
-- type: entity
-  parent: UniformBase
-  id: UniformJanitor
-  name: janitor jumpsuit
-  description: The jumpsuit for the poor sop with a mop.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_janitor.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_janitor.rsi
-
-- type: entity
-  parent: UniformJanitor
-  id: UniformJanitorSkirt
-  name: janitor jumpskirt
-  description: The jumpskirt for the poor sop with a mop.
-  components:
-  - type: Sprite
-    state: jan_skirt
-
-  - type: Clothing
-    ClothingPrefix: jan_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformEngineering
-  name: engineering jumpsuit
-  description: If this suit was non-conductive, maybe engineers would actually do their damn job.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_engineering.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_engineering.rsi
-
-- type: entity
-  parent: UniformEngineering
-  id: UniformEngineeringSkirt
-  name: engineering jumpskirt
-  description: If this skirt was non-conductive, maybe engineers would actually do their damn job.
-  components:
-  - type: Sprite
-    state: engine_skirt
-
-  - type: Clothing
-    ClothingPrefix: engine_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformAssistant
-  name: assistant jumpsuit
-  description: It's a generic grey jumpsuit. That's about what assistants are worth, anyway.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_assistant.rsi
-    state: assistant
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_assistant.rsi
-
-- type: entity
-  parent: UniformBase
-  id: UniformChemistry
-  name: chemistry jumpsuit
-  description: There's some odd stains on this jumpsuit. Hm.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: chemistry
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    ClothingPrefix: chemistry
-
-- type: entity
-  parent: UniformChemistry
-  id: UniformChemistrySkirt
-  name: chemistry jumpskirt
-  description: A sterile jumpskirt in Chemistry colors.
-  components:
-  - type: Sprite
-    state: chemistry_skirt
-
-  - type: Clothing
-    ClothingPrefix: chemistry_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformParamedic
-  name: paramedic jumpsuit
-  description: It's got a red plus on it, that's a good thing right?
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: paramedic
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    ClothingPrefix: paramedic
-
-- type: entity
-  parent: UniformParamedic
-  id: UniformParamedicSkirt
-  name: paramedic jumpskirt
-  description: A sterile jumpskirt in Paramedic colors.
-  components:
-  - type: Sprite
-    state: paramedic_skirt
-
-  - type: Clothing
-    ClothingPrefix: paramedic_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformScrubsPurple
-  name: purple scrubs
-  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: scrubspurple
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    ClothingPrefix: scrubspurple
-
-- type: entity
-  parent: UniformBase
-  id: UniformScrubsGreen
-  name: green scrubs
-  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: scrubsgreen
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    ClothingPrefix: scrubsgreen
-
-- type: entity
-  parent: UniformBase
-  id: UniformScrubsBlue
-  name: blue scrubs
-  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: scrubsblue
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    ClothingPrefix: scrubsblue
-
-- type: entity
-  parent: UniformBase
-  id: UniformClown
-  name: clown suit
-  description: HONK!
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_clown.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_clown.rsi
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformSec
-  name: security jumpsuit
-  description: A jumpsuit made of strong material, providing robust protection.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_sec.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_sec.rsi
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecSkirt
-  name: security jumpskirt
-  description: A jumpskirt made of strong material, providing robust protection.
-  components:
-  - type: Sprite
-    state: sec_skirt
-
-  - type: Clothing
-    ClothingPrefix: sec_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecBlueShirt
-  name: blue shirt and tie
-  description: I'm a little busy right now, Calhoun.
-  components:
-    - type: Sprite
-      state: blueshift
-
-    - type: Clothing
-      ClothingPrefix: blueshift
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecConstable
-  name: constable outfit
-  description: A british looking outfit.
-  components:
-    - type: Sprite
-      state: constable
-
-    - type: Clothing
-      ClothingPrefix: constable
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecFormal
-  name: security officer's formal uniform
-  description: The latest in fashionable security outfits.
-  components:
-    - type: Sprite
-      state: officerblueclothes
-
-    - type: Clothing
-      ClothingPrefix: officerblueclothes
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecFormalTan
-  name: security officer's formal uniform (tan)
-  description: The latest in fashionable security outfits.
-  components:
-    - type: Sprite
-      state: officertanclothes
-
-    - type: Clothing
-      ClothingPrefix: officertanclothes
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecGrey
-  name: grey security jumpsuit
-  description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
-  components:
-    - type: Sprite
-      state: security_grey
-
-    - type: Clothing
-      ClothingPrefix: security_grey
-      HeldPrefix: gy_suit
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecSpacePol
-  name: police uniform
-  description: Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol.
-  components:
-    - type: Sprite
-      state: spacepol
-
-    - type: Clothing
-      ClothingPrefix: spacepol
-
-- type: entity
-  parent: UniformSec
-  id: UniformSecSpacePolFamilies
-  name: space police uniform
-  description: A police uniform often found in the lines at donut shops.
-  components:
-    - type: Sprite
-      state: spacepolice_families
-
-    - type: Clothing
-      ClothingPrefix: spacepolice_families
-
-- type: entity
-  parent: UniformBase
-  id: UniformDetective
-  name: hard-worn suit
-  description: Someone who wears this means business.
-  components:
-    - type: Sprite
-      sprite: Clothing/Uniforms/uniform_detective.rsi
-      state: detective
-
-    - type: Clothing
-      sprite: Clothing/Uniforms/uniform_detective.rsi
-      ClothingPrefix: detective
-      HeldPrefix: detective
-
-- type: entity
-  parent: UniformDetective
-  id: UniformDetectiveSkirt
-  name: detective's suitskirt
-  description: Someone who wears this means business.
-  components:
-    - type: Sprite
-      state: detective_skirt
-
-    - type: Clothing
-      ClothingPrefix: detective_skirt
-      femaleMask: UniformTop
-
-- type: entity
-  parent: UniformDetective
-  id: UniformDetectiveGrey
-  name: noir suit
-  description: A hard-boiled private investigator's grey suit, complete with tie clip.
-  components:
-    - type: Sprite
-      state: greydetective
-
-    - type: Clothing
-      ClothingPrefix: greydetective
-
-- type: entity
-  parent: UniformDetectiveGrey
-  id: UniformDetectiveGreySkirt
-  name: noir suitskirt
-  description: A hard-boiled private investigator's grey suitskirt, complete with tie clip.
-  components:
-    - type: Sprite
-      state: greydetective_skirt
-
-    - type: Clothing
-      ClothingPrefix: greydetective_skirt
-      femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformCargoTech
-  name: cargo tech jumpsuit
-  description: A sturdy jumpsuit, issued to members of the Cargo department.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_cargotech.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_cargotech.rsi
-
-- type: entity
-  parent: UniformCargoTech
-  id: UniformCargoTechSkirt
-  name: cargo tech jumpskirt
-  description: A sturdy jumpskirt, issued to members of the Cargo department.
-  components:
-  - type: Sprite
-    state: cargo_skirt
-
-  - type: Clothing
-    ClothingPrefix: cargo_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformQM
-  name: quartermaster's jumpsuit
-  description: 'What can brown do for you?'
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_cargotech.rsi
-    state: qm
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_cargotech.rsi
-
-- type: entity
-  parent: UniformQM
-  id: UniformQMSkirt
-  name: quartermaster's jumpskirt
-  description: 'What can brown do for you?'
-  components:
-  - type: Sprite
-    state: qm_skirt
-
-  - type: Clothing
-    ClothingPrefix: qm_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformChef
-  name: chef uniform
-  description: Can't cook without this.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_chef.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_chef.rsi
-
-- type: entity
-  parent: UniformChef
-  id: UniformChefSkirt
-  name: chef skirt
-  description: Can't cook without this.
-  components:
-  - type: Sprite
-    state: chef_skirt
-
-  - type: Clothing
-    ClothingPrefix: chef_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformCaptain
-  name: captain's jumpsuit
-  description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_captain.rsi
-    state: captain
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_captain.rsi
-
-- type: entity
-  parent: UniformBase
-  id: UniformChiefEngineer
-  name: ce jumpsuit
-  description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_ce.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_ce.rsi
-
-- type: entity
-  parent: UniformChiefEngineer
-  id: UniformChiefEngineerSkirt
-  name: ce jumpskirt
-  description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
-  components:
-  - type: Sprite
-    state: chief_skirt
-
-  - type: Clothing
-    ClothingPrefix: chief_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformCMO
-  name: cmo jumpsuit
-  description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_cmo.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_cmo.rsi
-
-- type: entity
-  parent: UniformCMO
-  id: UniformCMOSkirt
-  name: cmo jumpskirt
-  description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
-  components:
-  - type: Sprite
-    state: cmo_skirt
-
-  - type: Clothing
-    ClothingPrefix: cmo_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformMedicalDoctor
-  name: medical doctor jumpsuit
-  description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_medical.rsi
-
-- type: entity
-  parent: UniformMedicalDoctor
-  id: UniformMedicalDoctorSkirt
-  name: medical doctor jumpskirt
-  description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
-  components:
-  - type: Sprite
-    state: medical_skirt
-
-  - type: Clothing
-    ClothingPrefix: medical_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformScientist
-  name: scientist jumpsuit
-  description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_scientist.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_scientist.rsi
-
-- type: entity
-  parent: UniformScientist
-  id: UniformScientistSkirt
-  name: scientist jumpskirt
-  description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
-  components:
-  - type: Sprite
-    state: sci_skirt
-
-  - type: Clothing
-    ClothingPrefix: sci_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformResearchDirector
-  name: research director's turtleneck
-  description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_rnd.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_rnd.rsi
-
-- type: entity
-  parent: UniformResearchDirector
-  id: UniformResearchDirectorSkirt
-  name: research director's skirtleneck
-  description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
-  components:
-  - type: Sprite
-    state: rnd_skirt
-
-  - type: Clothing
-    ClothingPrefix: rnd_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformMime
-  name: mime suit
-  description: ...
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_mime.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_mime.rsi
-
-- type: entity
-  parent: UniformMime
-  id: UniformMimeSkirt
-  name: mime skirt
-  description: ...
-  components:
-  - type: Sprite
-    state: mime_skirt
-
-  - type: Clothing
-    ClothingPrefix: mime_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformChaplain
-  name: chaplain's jumpsuit
-  description: It's a black jumpsuit, often worn by religious folk.
-  components:
-    - type: Sprite
-      sprite: Clothing/Uniforms/uniform_chaplain.rsi
-      state: icon
-
-    - type: Clothing
-      sprite: Clothing/Uniforms/uniform_chaplain.rsi
-
-- type: entity
-  parent: UniformChaplain
-  id: UniformChaplainSkirt
-  name: chaplain's jumpskirt
-  description: It's a black jumpskirt. If you wear this, you probably need religious help more than you will be providing it.
-  components:
-    - type: Sprite
-      state: chaplain_skirt
-
-    - type: Clothing
-      ClothingPrefix: chaplain_skirt
-      femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformHoSAlt
-  name: head of security turtleneck
-  description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-    state: hosalt
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-    HeldPrefix: hosalt
-
-- type: entity
-  parent: UniformHoSAlt
-  id: UniformHoSAltSkirt
-  name: head of security skirtleneck
-  description: It's a skirtleneck worn by those who were strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
-  components:
-  - type: Sprite
-    state: hosalt_skirt
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-    ClothingPrefix: hosalt_skirt
-    femaleMask: UniformTop
-    HeldPrefix: hosalt
-
-- type: entity
-  parent: UniformBase
-  id: UniformHoS
-  name: head of security jumpsuit
-  description: It's bright red and rather crisp, much like security's victims tend to be.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-
-- type: entity
-  parent: UniformHoS
-  id: UniformHoSSkirt
-  name: head of security jumpskirt
-  description: It's bright red and rather crisp, much like security's victims tend to be.
-  components:
-  - type: Sprite
-    state: hos_skirt
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_hos.rsi
-    ClothingPrefix: hos_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformHoS
-  id: UniformHoSGrey
-  name: head of security's grey jumpsuit
-  description: A grey jumpsuit of Head of Security, which make him look somewhat like an assistant.
-  components:
-    - type: Sprite
-      state: hos_grey
-
-    - type: Clothing
-      ClothingPrefix: hos_grey
-      HeldPrefix: gy_suit
-
-- type: entity
-  parent: UniformHoS
-  id: UniformHoSParadeMale
-  name: head of security's parade uniform
-  description: A male head of security's luxury-wear, for special occasions.
-  components:
-    - type: Sprite
-      state: hos_parade_male
-
-    - type: Clothing
-      ClothingPrefix: hos_parade_male
-
-- type: entity
-  parent: UniformHoSParadeMale
-  id: UniformHoSParadeFem
-  name: head of security's parade uniform
-  description: A female head of security's luxury-wear, for special occasions.
-  components:
-    - type: Sprite
-      state: hos_parade_fem
-
-    - type: Clothing
-      ClothingPrefix: hos_parade_fem
-      femaleMask: UniformTop
-
-- type: entity
-  parent: UniformHoS
-  id: UniformHoSFormal
-  name: head of security's formal uniform
-  description: The insignia on this uniform tells you that this uniform belongs to the Head of Security.
-  components:
-    - type: Sprite
-      state: hosblueclothes
-
-    - type: Clothing
-      ClothingPrefix: hosblueclothes
-
-- type: entity
-  parent: UniformHoS
-  id: UniformHoSFormalTan
-  name: head of security's formal uniform (tan)
-  description: The insignia on this uniform tells you that this uniform belongs to the Head of Security.
-  components:
-    - type: Sprite
-      state: hostanclothes
-
-    - type: Clothing
-      ClothingPrefix: hostanclothes
-
-- type: entity
-  parent: UniformBase
-  id: UniformWarden
-  name: warden's uniform
-  description: A formal security suit for officers complete with Nanotrasen belt buckle.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_warden.rsi
-    state: rwarden
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_warden.rsi
-    ClothingPrefix: rwarden
-    HeldPrefix: rwarden
-
-- type: entity
-  parent: UniformWarden
-  id: UniformWardenSkirt
-  name: warden's suitskirt
-  description: A formal security suitskirt for officers complete with Nanotrasen belt buckle.
-  components:
-    - type: Sprite
-      state: rwarden_skirt
-
-    - type: Clothing
-      femaleMask: UniformTop
-      ClothingPrefix: rwarden_skirt
-
-- type: entity
-  parent: UniformWarden
-  id: UniformWardenGrey
-  name: grey security suit
-  description: A formal relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood.
-  components:
-    - type: Sprite
-      state: warden
-
-    - type: Clothing
-      ClothingPrefix: warden
-      HeldPrefix: gy_suit
-
-- type: entity
-  parent: UniformWarden
-  id: UniformWardenFormal
-  name: warden's formal uniform
-  description: The insignia on this uniform tells you that this uniform belongs to the Warden.
-  components:
-    - type: Sprite
-      state: wardenblueclothes
-
-    - type: Clothing
-      ClothingPrefix: wardenblueclothes
-
-- type: entity
-  parent: UniformWarden
-  id: UniformWardenFormalTan
-  name: warden's formal uniform (tan)
-  description: The insignia on this uniform tells you that this uniform belongs to the Warden.
-  components:
-    - type: Sprite
-      state: wardentanclothes
-
-    - type: Clothing
-      ClothingPrefix: wardentanclothes
-
-- type: entity
-  parent: UniformBase
-  id: UniformPrisoner
-  name: prisoner jumpsuit
-  description: Busted.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_prisoner.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_prisoner.rsi
-
-- type: entity
-  parent: UniformPrisoner
-  id: UniformPrisonerSkirt
-  name: prisoner jumpskirt
-  description: Busted.
-  components:
-  - type: Sprite
-    state: prisoner_skirt
-
-  - type: Clothing
-    ClothingPrefix: prisoner_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformHoP
-  name: hop jumpsuit
-  description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_hop.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_hop.rsi
-
-- type: entity
-  parent: UniformHoP
-  id: UniformHoPSkirt
-  name: hop jumpskirt
-  description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
-  components:
-  - type: Sprite
-    state: hop_skirt
-
-  - type: Clothing
-    ClothingPrefix: hop_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformHydroponics
-  name: hydroponics jumpsuit
-  description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/uniform_hydro.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/uniform_hydro.rsi
-
-- type: entity
-  parent: UniformHydroponics
-  id: UniformHydroponicsSkirt
-  name: hydroponics jumpskirt
-  description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
-  components:
-  - type: Sprite
-    state: hydro_skirt
-
-  - type: Clothing
-    ClothingPrefix: hydro_skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBase
-  id: UniformBartender
-  name: bartender's uniform
-  description: A nice and tidy uniform. Shame about the bar though.
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/bartender.rsi
-    state: icon
-
-  - type: Clothing
-    sprite: Clothing/Uniforms/bartender.rsi
-
-- type: entity
-  parent: UniformBartender
-  id: UniformBartenderSkirt
-  name: bartender's skirt
-  description: A nice and tidy skirt. Shame about the bar though.
-  components:
-  - type: Sprite
-    state: skirt
-
-  - type: Clothing
-    ClothingPrefix: skirt
-    femaleMask: UniformTop
-
-- type: entity
-  parent: UniformBartender
-  id: UniformBartenderPurple
-  name: purple bartender's uniform
-  description: A special purple outfit to serve drinks.
-  components:
-  - type: Sprite
-    state: purple
-
-  - type: Clothing
-    ClothingPrefix: purple

Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml

@@ -72,7 +72,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: MesonGlasses
+      - name: ClothingEyesGlassesMeson
         amount: 4
   - type: Sprite
     layers:
@@ -90,7 +90,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: BreathMaskClothing
+      - name: ClothingMaskBreath
       - name: EmergencyOxygenTankFilled
       #- name: Injector
   - type: Sprite

Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml

@@ -25,7 +25,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: MaskSterile
+      - name: ClothingMaskSterile
         amount: 4
   - type: Sprite
     layers:
@@ -44,7 +44,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: GlovesLatex
+      - name: ClothingHandsGlovesLatex
         amount: 4
   - type: Sprite
     layers:

Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml

@@ -44,7 +44,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: SecGlasses
+      - name: ClothingEyesGlassesSecurity
         amount: 4
   - type: Sprite
     layers:

Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml

@@ -11,7 +11,6 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/bedsheets.rsi
-
   - type: Clothing
     size: 10
     QuickEquip: true
@@ -27,14 +26,12 @@
   components:
   - type: Sprite
     state: sheetblack
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_black.rsi
+    sprite: Clothing/Neck/Bedsheets/black.rsi
-    HeldPrefix: sheetblack
 
 - type: entity
   id: BedsheetBlue
@@ -43,14 +40,12 @@
   components:
   - type: Sprite
     state: sheetblue
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_blue.rsi
+    sprite: Clothing/Neck/Bedsheets/blue.rsi
-    HeldPrefix: sheetblue
 
 - type: entity
   id: BedsheetBrown
@@ -59,14 +54,12 @@
   components:
   - type: Sprite
     state: sheetbrown
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_brown.rsi
+    sprite: Clothing/Neck/Bedsheets/brown.rsi
-    HeldPrefix: sheetbrown
 
 - type: entity
   id: BedsheetCaptain
@@ -76,14 +69,12 @@
   components:
   - type: Sprite
     state: sheetcaptain
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_captain.rsi
+    sprite: Clothing/Neck/Bedsheets/captain.rsi
-    HeldPrefix: sheetcaptain
 
 - type: entity
   id: BedsheetCE
@@ -92,14 +83,12 @@
   components:
   - type: Sprite
     state: sheetce
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_ce.rsi
+    sprite: Clothing/Neck/Bedsheets/ce.rsi
-    HeldPrefix: sheetce
 
 - type: entity
   id: BedsheetCentcom
@@ -108,14 +97,12 @@
   components:
   - type: Sprite
     state: sheetcentcom
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_centcom.rsi
+    sprite: Clothing/Neck/Bedsheets/centcom.rsi
-    HeldPrefix: sheetcentcom
 
 - type: entity
   id: BedsheetClown
@@ -124,14 +111,12 @@
   components:
   - type: Sprite
     state: sheetclown
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_rainbow.rsi
+    sprite: Clothing/Neck/Bedsheets/rainbow.rsi
-    HeldPrefix: sheetrainbow
 
 - type: entity
   id: BedsheetCMO
@@ -140,14 +125,12 @@
   components:
   - type: Sprite
     state: sheetcmo
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_cmo.rsi
+    sprite: Clothing/Neck/Bedsheets/cmo.rsi
-    HeldPrefix: sheetcmo
 
 - type: entity
   id: BedsheetCosmos
@@ -156,14 +139,12 @@
   components:
   - type: Sprite
     state: sheetcosmos
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_cosmos.rsi
+    sprite: Clothing/Neck/Bedsheets/cosmos.rsi
-    HeldPrefix: sheetcosmos
 
 - type: entity
   id: BedsheetCult
@@ -172,14 +153,12 @@
   components:
   - type: Sprite
     state: sheetcult
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_cult.rsi
+    sprite: Clothing/Neck/Bedsheets/cult.rsi
-    HeldPrefix: sheetcult
 
 - type: entity
   id: BedsheetGreen
@@ -188,14 +167,12 @@
   components:
   - type: Sprite
     state: sheetgreen
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_green.rsi
+    sprite: Clothing/Neck/Bedsheets/green.rsi
-    HeldPrefix: sheetgreen
 
 - type: entity
   id: BedsheetGrey
@@ -204,14 +181,12 @@
   components:
   - type: Sprite
     state: sheetgrey
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_grey.rsi
+    sprite: Clothing/Neck/Bedsheets/grey.rsi
-    HeldPrefix: sheetgrey
 
 - type: entity
   id: BedsheetHOP
@@ -220,14 +195,12 @@
   components:
   - type: Sprite
     state: sheethop
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_hop.rsi
+    sprite: Clothing/Neck/Bedsheets/hop.rsi
-    HeldPrefix: sheethop
 
 - type: entity
   id: BedsheetHOS
@@ -236,14 +209,12 @@
   components:
   - type: Sprite
     state: sheethos
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_hos.rsi
+    sprite: Clothing/Neck/Bedsheets/hos.rsi
-    HeldPrefix: sheethos
 
 - type: entity
   id: BedsheetIan
@@ -252,14 +223,12 @@
   components:
   - type: Sprite
     state: sheetian
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_ian.rsi
+    sprite: Clothing/Neck/Bedsheets/ian.rsi
-    HeldPrefix: sheetian
 
 - type: entity
   id: BedsheetMedical
@@ -268,14 +237,12 @@
   components:
   - type: Sprite
     state: sheetmedical
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_medical.rsi
+    sprite: Clothing/Neck/Bedsheets/medical.rsi
-    HeldPrefix: sheetmedical
 
 - type: entity
   id: BedsheetMime
@@ -284,14 +251,12 @@
   components:
   - type: Sprite
     state: sheetmime
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_mime.rsi
+    sprite: Clothing/Neck/Bedsheets/mime.rsi
-    HeldPrefix: sheetmime
 
 - type: entity
   id: BedsheetNT
@@ -300,14 +265,12 @@
   components:
   - type: Sprite
     state: sheetNT
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_NT.rsi
+    sprite: Clothing/Neck/Bedsheets/NT.rsi
-    HeldPrefix: sheetNT
 
 - type: entity
   id: BedsheetOrange
@@ -316,14 +279,12 @@
   components:
   - type: Sprite
     state: sheetorange
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_orange.rsi
+    sprite: Clothing/Neck/Bedsheets/orange.rsi
-    HeldPrefix: sheetorange
 
 - type: entity
   id: BedsheetPurple
@@ -332,14 +293,12 @@
   components:
   - type: Sprite
     state: sheetpurple
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_purple.rsi
+    sprite: Clothing/Neck/Bedsheets/purple.rsi
-    HeldPrefix: sheetpurple
 
 - type: entity
   id: BedsheetQM
@@ -348,14 +307,12 @@
   components:
   - type: Sprite
     state: sheetqm
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_qm.rsi
+    sprite: Clothing/Neck/Bedsheets/qm.rsi
-    HeldPrefix: sheetqm
 
 - type: entity
   id: BedsheetRainbow
@@ -364,14 +321,12 @@
   components:
   - type: Sprite
     state: sheetrainbow
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_rainbow.rsi
+    sprite: Clothing/Neck/Bedsheets/rainbow.rsi
-    HeldPrefix: sheetrainbow
 
 - type: entity
   id: BedsheetRD
@@ -380,14 +335,12 @@
   components:
   - type: Sprite
     state: sheetrd
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_rd.rsi
+    sprite: Clothing/Neck/Bedsheets/rd.rsi
-    HeldPrefix: sheetrd
 
 - type: entity
   id: BedsheetRed
@@ -396,14 +349,12 @@
   components:
   - type: Sprite
     state: sheetred
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_red.rsi
+    sprite: Clothing/Neck/Bedsheets/red.rsi
-    HeldPrefix: sheetred
 
 - type: entity
   id: BedsheetSyndie
@@ -412,14 +363,12 @@
   components:
   - type: Sprite
     state: sheetsyndie
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_syndie.rsi
+    sprite: Clothing/Neck/Bedsheets/syndie.rsi
-    HeldPrefix: sheetsyndie
 
 - type: entity
   id: BedsheetUSA
@@ -428,14 +377,12 @@
   components:
   - type: Sprite
     state: sheetUSA
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_USA.rsi
+    sprite: Clothing/Neck/Bedsheets/USA.rsi
-    HeldPrefix: sheetUSA
 
 - type: entity
   id: BedsheetWhite
@@ -444,14 +391,12 @@
   components:
   - type: Sprite
     state: sheetwhite
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_white.rsi
+    sprite: Clothing/Neck/Bedsheets/white.rsi
-    HeldPrefix: sheetwhite
 
 - type: entity
   id: BedsheetWiz
@@ -460,14 +405,12 @@
   components:
   - type: Sprite
     state: sheetwiz
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_wiz.rsi
+    sprite: Clothing/Neck/Bedsheets/wiz.rsi
-    HeldPrefix: sheetwiz
 
 - type: entity
   id: BedsheetYellow
@@ -476,11 +419,9 @@
   components:
   - type: Sprite
     state: sheetyellow
-
   - type: Clothing
     size: 10
     QuickEquip: true
     Slots:
     - neck
-    sprite: Clothing/Neck/Bedsheets/sheet_yellow.rsi
+    sprite: Clothing/Neck/Bedsheets/yellow.rsi
-    HeldPrefix: sheetyellow

Resources/Prototypes/Entities/Objects/Tools/toolbox.yml

@@ -31,7 +31,7 @@
   components:
   - type: StorageFill
     contents:
-      - name: BreathMaskClothing
+      - name: ClothingMaskBreath
         amount: 2
       - name: FoodChocolateBar
       - name: FlashlightLantern
@@ -79,7 +79,7 @@
       - name: Wirecutter
       - name: ApcExtensionCableStack
       - name: MVWireStack
-      - name: GlovesYellow
+      - name: ClothingHandsGlovesColorYellow
         prob: 0.05
         orGroup: GlovesOrWires
       - name: HVWireStack

Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml

@@ -14,8 +14,9 @@
 - type: startingGear
   id: CargoTechGear
   equipment:
-    innerclothing: UniformCargoTech
+    head: ClothingHeadHatCargosoft
-    backpack: BackpackClothingFilled
+    innerclothing: ClothingUniformJumpsuitCargo
-    shoes: ShoesBlack
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
     idcard: CargoPDA
-    ears: HeadsetCargo
+    ears: ClothingHeadsetCargo

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -15,8 +15,9 @@
 - type: startingGear
   id: QuartermasterGear
   equipment:
-    innerclothing: UniformQM
+    head: ClothingHeadHatCargosoft
-    backpack: BackpackClothingFilled
+    innerclothing: ClothingUniformJumpsuitQM
-    shoes: ShoesBrown
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBrown
     idcard: QuartermasterPDA
-    ears: HeadsetCargo
+    ears: ClothingHeadsetCargo

Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml

@@ -12,8 +12,8 @@
 - type: startingGear
   id: AssistantGear
   equipment:
-    innerclothing: UniformColorGrey
+    innerclothing: ClothingUniformJumpsuitColorGrey
-    backpack: BackpackClothingFilled
+    backpack: ClothingBackpackFilled
-    shoes: ShoesBlack
+    shoes: ClothingShoesColorBlack
     idcard: AssistantPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService

Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml

@@ -14,9 +14,10 @@
 - type: startingGear
   id: BartenderGear
   equipment:
-    innerclothing: UniformBartender
+    head: ClothingHeadHatTophat
-    outerclothing: OuterclothingArmorVest
+    innerclothing: ClothingUniformJumpsuitBartender
-    backpack: BackpackClothingFilled
+    outerclothing: ClothingOuterVestKevlar
-    shoes: ShoesBlack
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
     idcard: BartenderPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService

Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml

@@ -15,8 +15,8 @@
 - type: startingGear
   id: BotanistGear
   equipment:
-    innerclothing: UniformHydroponics
+    innerclothing: ClothingUniformJumpsuitHydroponics
-    backpack: BackpackClothingFilled
+    backpack: ClothingBackpackFilled
-    shoes: ShoesBrown
+    shoes: ClothingShoesColorBrown
     idcard: BotanistPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService

Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml

@@ -13,8 +13,8 @@
 - type: startingGear
   id: ChaplainGear
   equipment:
-    innerclothing: UniformChaplain
+    innerclothing: ClothingUniformJumpsuitChaplain
-    backpack: BackpackClothing
+    backpack: ClothingBackpack
-    shoes: ShoesBlack
+    shoes: ClothingShoesColorBlack
     idcard: ChaplainPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService

Resources/Prototypes/Roles/Jobs/Civilian/chef.yml

@@ -14,8 +14,9 @@
 - type: startingGear
   id: ChefGear
   equipment:
-    innerclothing: UniformChef
+    innerclothing: ClothingUniformJumpsuitChef
-    backpack: BackpackClothingFilled
+    head: ClothingHeadHatChef
-    shoes: ShoesBlack
+    backpack: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
     idcard: ChefPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService

Resources/Prototypes/Roles/Jobs/Civilian/clown.yml

@@ -14,10 +14,10 @@
 - type: startingGear
   id: ClownGear
   equipment:
-    innerclothing: UniformClown
+    innerclothing: ClothingUniformJumpsuitClown
-    backpack: ClownPackFilled
+    backpack: ClothingBackpackClownFilled
-    shoes: ShoesClown
+    shoes: ClothingShoesClown
-    mask: MaskClown
+    mask: ClothingMaskClown
     pocket1: BikeHorn
     idcard: ClownPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService

Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml

@@ -13,10 +13,10 @@
 - type: startingGear
   id: JanitorGear
   equipment:
-    innerclothing: UniformJanitor
+    innerclothing: ClothingUniformJumpsuitJanitor
-    backpack: BackpackClothingFilled
+    backpack: ClothingBackpackFilled
-    shoes: ShoesGaloshes
+    shoes: ClothingShoesGaloshes
-    head: HatPurplesoft
+    head: ClothingHeadHatPurplesoft
     idcard: JanitorPDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled

Resources/Prototypes/Roles/Jobs/Civilian/mime.yml

@@ -13,14 +13,14 @@
 - type: startingGear
   id: MimeGear
   equipment:
-    innerclothing: UniformMime
+    innerclothing: ClothingUniformJumpsuitMime
-    backpack: BackpackClothing
+    backpack: ClothingBackpackFilled
-    head: HatBeret
+    head: ClothingHeadHatBeret
-    belt: SuspendersClothing
+    belt: ClothingBeltSuspenders
-    gloves: GlovesWhite
+    gloves: ClothingHandsGlovesLatex
-    shoes: ShoesMime
+    shoes: ClothingShoesColorWhite
     pocket1: Pen
     pocket2: Paper
-    mask: MaskMime
+    mask: ClothingMaskMime
     idcard: MimePDA
-    ears: HeadsetService
+    ears: ClothingHeadsetService

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -11,6 +11,7 @@
   # All of em.
   # Could probably do with some kind of wildcard or whatever to automate this.
   # HELL FUCKING YEAH WE COULD
+  # Guys please don't fight
   - Captain
   - HeadOfPersonnel
   - Command
@@ -38,12 +39,12 @@
 - type: startingGear
   id: CaptainGear
   equipment:
-    innerclothing: UniformCaptain
+    innerclothing: ClothingUniformJumpsuitCaptain
-    backpack: BackpackCaptainFilled
+    backpack: ClothingBackpackCaptainFilled
-    shoes: ShoesBlack
+    shoes: ClothingShoesColorBlack
-    head: HatCaptain
+    head: ClothingHeadHatCaptain
-    eyes: SunGlasses
+    eyes: ClothingEyesGlassesSunglasses
-    gloves: GlovesCaptain
+    gloves: ClothingHandsGlovesCaptain
-    outerclothing: OuterclothingCaparmor
+    outerclothing: ClothingOuterHardsuitCap
     idcard: CaptainPDA
-    ears: HeadsetCommand
+    ears: ClothingHeadsetAltCommand

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -22,9 +22,9 @@
 - type: startingGear
   id: HoPGear
   equipment:
-    innerclothing: UniformHoP
+    innerclothing: ClothingUniformJumpsuitHoP
-    backpack: BackpackClothingFilled
+    backpack: ClothingBackpackFilled
-    shoes: ShoesBrown
+    shoes: ClothingShoesColorBrown
-    head: HatHopcap
+    head: ClothingHeadHatHopcap
     idcard: HoPPDA
-    ears: HeadsetCommand
+    ears: ClothingHeadsetAltCommand

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -18,10 +18,10 @@
 - type: startingGear
   id: ChiefEngineerGear
   equipment:
-    head: HatHardhatWhite
+    head: ClothingHeadHatHardhatWhite
-    innerclothing: UniformChiefEngineer
+    innerclothing: ClothingUniformJumpsuitChiefEngineer
-    backpack: BackpackEngineeringFilled
+    backpack: ClothingBackpackEngineeringFilled
-    shoes: ShoesBrown
+    shoes: ClothingShoesColorBrown
     idcard: CEPDA
-    ears: HeadsetEngineering
+    ears: ClothingHeadsetEngineering
     belt: ClothingBeltChiefEngineerFilled

Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml

@@ -15,10 +15,11 @@
 - type: startingGear
   id: StationEngineerGear
   equipment:
-    innerclothing: UniformEngineering
+    head: ClothingHeadHatHardhatYellow
-    backpack: BackpackEngineeringFilled
+    innerclothing: ClothingUniformJumpsuitEngineering
-    shoes: ShoesWorkboots
+    backpack: ClothingBackpackEngineeringFilled
-    outerclothing: OuterclothingHazard
+    shoes: ClothingShoesBootsWork
+    outerclothing: ClothingOuterVestHazard
     idcard: EngineerPDA
-    belt: UtilityBeltClothingFilled
+    belt: ClothingBeltUtilityFilled
-    ears: HeadsetEngineering
+    ears: ClothingHeadsetEngineering

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -19,10 +19,10 @@
 - type: startingGear
   id: CMOGear
   equipment:
-    innerclothing: UniformCMO
+    innerclothing: ClothingUniformJumpsuitCMO
-    backpack: BackpackMedicalFilled
+    backpack: ClothingBackpackMedicalFilled
-    shoes: ShoesBrown
+    shoes: ClothingShoesColorBrown
-    outerclothing: OuterclothingLabcoatcmo
+    outerclothing: ClothingOuterCoatLabCmo
     idcard: CMOPDA
-    ears: HeadsetMedicalAlt
+    ears: ClothingHeadsetAltMedical
     belt: ClothingBeltMedical

Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml

@@ -14,10 +14,10 @@
 - type: startingGear
   id: DoctorGear
   equipment:
-    innerclothing: UniformMedicalDoctor
+    innerclothing: ClothingUniformJumpsuitMedicalDoctor
-    backpack: BackpackMedicalFilled
+    backpack: ClothingBackpackMedicalFilled
-    shoes: ShoesWhite
+    shoes: ClothingShoesColorWhite
-    outerclothing: OuterclothingLabcoatmedspecopen
+    outerclothing: ClothingOuterCoatLab
     idcard: MedicalPDA
-    ears: HeadsetMedical
+    ears: ClothingHeadsetMedical
     belt: ClothingBeltMedical

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -17,10 +17,9 @@
 - type: startingGear
   id: ResearchDirectorGear
   equipment:
-    innerclothing: UniformResearchDirector
+    innerclothing: ClothingUniformJumpsuitResearchDirector
     # Note to Swept add science backpacks
-    backpack: BackpackClothingFilled
+    backpack: ClothingBackpackFilled
-    shoes: ShoesBrown
+    shoes: ClothingShoesColorBrown
-    outerclothing: OuterclothingLabcoatopen
     idcard: RnDPDA
-    ears: HeadsetScience
+    ears: ClothingHeadsetScience

Resources/Prototypes/Roles/Jobs/Science/scientist.yml

@@ -14,9 +14,9 @@
 - type: startingGear
   id: ScientistGear
   equipment:
-    innerclothing: UniformScientist
+    innerclothing: ClothingUniformJumpsuitScientist
-    backpack: BackpackClothingFilled
+    backpack: ClothingBackpackFilled
-    shoes: ShoesWhite
+    shoes: ClothingShoesColorWhite
-    outerclothing: OuterclothingLabcoat
+    outerclothing: ClothingOuterCoatLab
     idcard: SciencePDA
-    ears: HeadsetScience
+    ears: ClothingHeadsetScience

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -20,12 +20,12 @@
 - type: startingGear
   id: HoSGear
   equipment:
-    innerclothing: UniformHoS
+    innerclothing: ClothingUniformJumpsuitHoS
-    backpack: SecPackFilled
+    backpack: ClothingBackpackSecurityFilled
-    shoes: ShoesJackboots
+    shoes: ClothingShoesJackboots
-    outerclothing: OuterclothingHoSTrenchcoat
+    outerclothing: ClothingOuterCoatHoSTrench
-    eyes: SecGlasses
+    eyes: ClothingEyesGlassesSecurity
-    head: HatBeretHoS
+    head: ClothingHeadHatBeretHoS
     idcard: HoSPDA
-    ears: HeadsetSecurityAlt
+    ears: ClothingHeadsetAltSecurity
     belt: ClothingBeltSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -15,11 +15,12 @@
 - type: startingGear
   id: SecurityOfficerGear
   equipment:
-    innerclothing: UniformSec
+    innerclothing: ClothingUniformJumpsuitSec
-    backpack: SecPackFilled
+    backpack: ClothingBackpackSecurityFilled
-    shoes: ShoesJackboots
+    shoes: ClothingShoesBootsJack
-    eyes: SecGlasses
+    eyes: ClothingEyesGlassesSecurity
-    outerclothing: OuterclothingArmorVest
+    head: ClothingHeadHelmetHelmetOld
+    outerclothing: ClothingOuterVestKevlar
     idcard: SecurityPDA
-    ears: HeadsetSecurity
+    ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -16,11 +16,12 @@
 - type: startingGear
   id: WardenGear
   equipment:
-    innerclothing: UniformWarden
+    head: ClothingHeadHatWarden
-    backpack: SecPackFilled
+    innerclothing: ClothingUniformJumpsuitWarden
-    shoes: ShoesJackboots
+    backpack: ClothingBackpackSecurityFilled
-    eyes: SecGlasses
+    shoes: ClothingShoesBootsJack
-    outerclothing: OuterclothingArmorVest
+    eyes: ClothingEyesGlassesSecurity
+    outerclothing: ClothingOuterVestKevlar
     idcard: WardenPDA
-    ears: HeadsetSecurity
+    ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled

Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json

@@ -1,27 +1,27 @@
 {
-    "version": 1,
+  "version": 1,
-    "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-    "size": {
+  "size": {
-        "x": 32,
+    "x": 32,
-        "y": 32
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1
     },
-    "states": [
+    {
-        {
+      "name": "equipped-BACKPACK",
-            "name": "icon",
+      "directions": 4
-            "directions": 1
+    },
-        },
+    {
-        {
+      "name": "inhand-left",
-            "name": "equipped-BACKPACK",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "inhand-right",
-            "name": "inhand-left",
+      "directions": 4
-            "directions": 4
+    }
-        },
+  ]
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
 }

Resources/Textures/Clothing/Back/Backpacks/botany.rsi/meta.json

@@ -1,27 +1,27 @@
 {
-    "version": 1,
+  "version": 1,
-    "license": "CC-BY-SA-3.0",
+  "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-    "size": {
+  "size": {
-        "x": 32,
+    "x": 32,
-        "y": 32
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "directions": 1
     },
-    "states": [
+    {
-        {
+      "name": "equipped-BACKPACK",
-            "name": "icon",
+      "directions": 4
-            "directions": 1
+    },
-        },
+    {
-        {
+      "name": "inhand-left",
-            "name": "equipped-BACKPACK",
+      "directions": 4
-            "directions": 4
+    },
-        },
+    {
-        {
+      "name": "inhand-right",
-            "name": "inhand-left",
+      "directions": 4
-            "directions": 4
+    }
-        },
+  ]
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
 }