Clothing Cleanup | Phase 1 (#1459)

2020-07-26 15:33:43 +00:00
parent 8767a80c41
commit 60a2a400e0
1247 changed files with 2603 additions and 4907 deletions
--- a/Resources/Prototypes/Catalog/VendingMachines/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/chapel.yml
@@ -10,12 +10,7 @@
    OuterclothingBlackhoodie: 1
    OuterclothingChurchcoat: 1
    OuterclothingCultrobes: 1
-    OuterclothingCultrobesalt: 1
    OuterclothingCultarmour: 1
-    OuterclothingNun: 2
    HatChaplainHood: 1
    HatCulthood: 1
    HatCultHelmet: 1
-    HatCultHoodalt: 1
-    HatHasturhood: 1
-    HatMagus: 1
--- a/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Glasses/eyes.yml
@@ -29,10 +29,10 @@
  components:
  - type: Sprite
    sprite: Clothing/Glasses/sunglasses.rsi
-    state: sunglasses
+    state: icon
  - type: Icon
    sprite: Clothing/Glasses/sunglasses.rsi
-    state: sunglasses
+    state: icon
  - type: Clothing
    sprite: Clothing/Glasses/sunglasses.rsi

--- a/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Gloves/gloves.yml
@@ -11,32 +11,6 @@
    Slots:
    - gloves

- type: entity
-  parent: GlovesBase
-  id: GlovesAssetProtectionRig
-  name: asset protection rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/asset_protection_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/asset_protection_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/asset_protection_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesAssetProtectionRigSealed
-  name: asset protection rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/asset_protection_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/asset_protection_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/asset_protection_rig_sealed.rsi
-
 - type: entity
  parent: GlovesBase
  id: GlovesBlack
@@ -141,188 +115,6 @@
  - type: Clothing
    sprite: Clothing/Gloves/captain.rsi

- type: entity
-  parent: GlovesBase
-  id: GlovesCeRig
-  name: ce rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ce_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ce_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ce_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesCeRigSealed
-  name: ce rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ce_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ce_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ce_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesEngineeringRig
-  name: engineering rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/engineering_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/engineering_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/engineering_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesEngineeringRigSealed
-  name: engineering rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/engineering_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/engineering_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/engineering_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtCommanderRig
-  name: ert commander rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_commander_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_commander_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_commander_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtCommanderRigSealed
-  name: ert commander rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_commander_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_commander_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_commander_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtEngineerRig
-  name: ert engineer rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_engineer_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_engineer_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_engineer_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtEngineerRigSealed
-  name: ert engineer rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_engineer_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_engineer_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_engineer_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtMedicalRig
-  name: ert medical rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_medical_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_medical_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_medical_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtMedicalRigSealed
-  name: ert medical rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_medical_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_medical_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_medical_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtSecurityRig
-  name: ert security rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_security_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_security_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_security_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesErtSecurityRigSealed
-  name: ert security rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ert_security_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ert_security_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ert_security_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesEvaRig
-  name: EVA rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/eva_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/eva_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/eva_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesEvaRigSealed
-  name: EVA rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/eva_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/eva_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/eva_rig_sealed.rsi
-
 - type: entity
  parent: GlovesBase
  id: GlovesGray
@@ -349,58 +141,6 @@
  - type: Clothing
    sprite: Clothing/Gloves/green.rsi

- type: entity
-  parent: GlovesBase
-  id: GlovesHackerRig
-  name: hacker rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/hacker_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/hacker_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/hacker_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesHackerRigSealed
-  name: hacker rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/hacker_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/hacker_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/hacker_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesHazardRig
-  name: hazard rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/hazard_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/hazard_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/hazard_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesHazardRigSealed
-  name: hazard rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/hazard_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/hazard_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/hazard_rig_sealed.rsi
-
 - type: entity
  parent: GlovesBase
  id: GlovesIhscombat
@@ -414,32 +154,6 @@
  - type: Clothing
    sprite: Clothing/Gloves/ihscombat.rsi

- type: entity
-  parent: GlovesBase
-  id: GlovesIhsRig
-  name: IHS rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ihs_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ihs_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ihs_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesIhsRigSealed
-  name: IHS rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ihs_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ihs_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ihs_rig_sealed.rsi
-
 - type: entity
  parent: GlovesBase
  id: GlovesLatex
@@ -480,84 +194,6 @@
  - type: Clothing
    sprite: Clothing/Gloves/lightbrown.rsi

- type: entity
-  parent: GlovesBase
-  id: GlovesMedicalRig
-  name: medical rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/medical_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/medical_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/medical_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesMedicalRigSealed
-  name: medical rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/medical_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/medical_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/medical_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesMercRig
-  name: merc rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/merc_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/merc_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/merc_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesMercRigSealed
-  name: merc rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/merc_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/merc_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/merc_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesNinjaRig
-  name: ninja rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ninja_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ninja_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ninja_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesNinjaRigSealed
-  name: ninja rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/ninja_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/ninja_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/ninja_rig_sealed.rsi
-
 - type: entity
  parent: GlovesBase
  id: GlovesOrange
@@ -649,84 +285,6 @@
  - type: Clothing
    sprite: Clothing/Gloves/robohands.rsi

- type: entity
-  parent: GlovesBase
-  id: GlovesScienceRig
-  name: science rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/science_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/science_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/science_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesScienceRigSealed
-  name: science rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/science_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/science_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/science_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesSecurityRig
-  name: security rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/security_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/security_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/security_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesSecurityRigSealed
-  name: security rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/security_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/security_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/security_rig_sealed.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesStealthRig
-  name: stealth rig gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/stealth_rig.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/stealth_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/stealth_rig.rsi
-
- type: entity
-  parent: GlovesBase
-  id: GlovesStealthRigSealed
-  name: stealth rig sealed gloves
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Gloves/stealth_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Gloves/stealth_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Gloves/stealth_rig_sealed.rsi
-
 - type: entity
  parent: GlovesBase
  id: GlovesSNinja
--- a/Resources/Prototypes/Entities/Clothing/Head/animals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/animals.yml
@@ -0,0 +1,142 @@
+- type: entity
+  parent: HatBase
+  id: HatMonkey
+  name: monkey
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/monkey.rsi
+  - type: Icon
+    sprite: Clothing/Head/monkey.rsi
+  - type: Clothing
+    sprite: Clothing/Head/monkey.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMouseBrown
+  name: mouse brown
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mouse_brown.rsi
+  - type: Icon
+    sprite: Clothing/Head/mouse_brown.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mouse_brown.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMouseGray
+  name: mouse gray
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mouse_gray.rsi
+  - type: Icon
+    sprite: Clothing/Head/mouse_gray.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mouse_gray.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatMouseWhite
+  name: mouse white
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/mouse_white.rsi
+  - type: Icon
+    sprite: Clothing/Head/mouse_white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/mouse_white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNymph
+  name: nymph
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/nymph.rsi
+  - type: Icon
+    sprite: Clothing/Head/nymph.rsi
+  - type: Clothing
+    sprite: Clothing/Head/nymph.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPai-cat
+  name: pai-cat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pai-cat.rsi
+  - type: Icon
+    sprite: Clothing/Head/pai-cat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/pai-cat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPai-monkey
+  name: pai-monkey
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pai-monkey.rsi
+  - type: Icon
+    sprite: Clothing/Head/pai-monkey.rsi
+  - type: Clothing
+    sprite: Clothing/Head/pai-monkey.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPai-mouse
+  name: pai-mouse
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/pai-mouse.rsi
+  - type: Icon
+    sprite: Clothing/Head/pai-mouse.rsi
+  - type: Clothing
+    sprite: Clothing/Head/pai-mouse.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCatGrey
+  name: grey cat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cat.rsi
+  - type: Icon
+    sprite: Clothing/Head/cat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cat.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCatBrown
+  name: brown cat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cat2.rsi
+  - type: Icon
+    sprite: Clothing/Head/cat2.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cat2.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCatBlack
+  name: black cat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cat3.rsi
+  - type: Icon
+    sprite: Clothing/Head/cat3.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cat3.rsi
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -0,0 +1,131 @@
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-old
+  name: hardsuit-old
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-old.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-old.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-old.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-atmos
+  name: hardsuit-atmos
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-atmos.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-atmos.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-atmos.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-engineering
+  name: hardsuit-engineering
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-engineering.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-engineering.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-engineering.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-hazardhardsuit
+  name: hardsuit-hazardhardsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-medical
+  name: hardsuit-medical
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-medical.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-medical.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-medical.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-mining
+  name: hardsuit-mining
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-mining.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-mining.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-mining.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-sectg
+  name: hardsuit-sectg
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-sectg.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-sectg.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-sectg.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-syndie
+  name: hardsuit-syndie
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-syndie.rsi
+    state: icon
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-syndie.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-syndie.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-ce
+  name: hardsuit-ce
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-white.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardsuit-wiz
+  name: hardsuit-wiz
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardsuit-wiz.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardsuit-wiz.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardsuit-wiz.rsi
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -0,0 +1,169 @@
+- type: entity
+  parent: HatBase
+  id: HatAtmosHelm
+  name: atmos helm
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/atmos_helm.rsi
+  - type: Icon
+    sprite: Clothing/Head/atmos_helm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/atmos_helm.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCultHelmet
+  name: cult helmet
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/cult_helmet.rsi
+  - type: Icon
+    sprite: Clothing/Head/cult_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/cult_helmet.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatDblue
+  name: hardhat dblue
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_dblue.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_dblue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_dblue.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhat Orange
+  name: hardhat orange
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_orange.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_orange.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_orange.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatPumpkin
+  name: hardhat pumpkin
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_pumpkin.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_pumpkin.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_pumpkin.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatRed
+  name: hardhat red
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_red.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_red.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatWhite
+  name: hardhat white
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_white.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatYellow
+  name: hardhat yellow
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat0_yellow.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat0_yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat0_yellow.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatHardhatPumpkinAlt
+  name: hardhat pumpkin (alt)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/hardhat1_pumpkin.rsi
+  - type: Icon
+    sprite: Clothing/Head/hardhat1_pumpkin.rsi
+  - type: Clothing
+    sprite: Clothing/Head/hardhat1_pumpkin.rsi
+
+
+- type: entity
+  parent: HatBase
+  id: HatLightRiot
+  name: light riot
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/light_riot.rsi
+  - type: Icon
+    sprite: Clothing/Head/light_riot.rsi
+  - type: Clothing
+    sprite: Clothing/Head/light_riot.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatLightRiotOn
+  name: light riot (on)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/light_riot_on.rsi
+  - type: Icon
+    sprite: Clothing/Head/light_riot_on.rsi
+  - type: Clothing
+    sprite: Clothing/Head/light_riot_on.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatScaf
+  name: scaf
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/scaf.rsi
+  - type: Icon
+    sprite: Clothing/Head/scaf.rsi
+  - type: Clothing
+    sprite: Clothing/Head/scaf.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatSecurity
+  name: security
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/security.rsi
+  - type: Icon
+    sprite: Clothing/Head/security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/security.rsi
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -0,0 +1,168 @@
+- type: entity
+  parent: HatBase
+  id: HatBioCmo
+  name: bio - cmo
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_cmo.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_cmo.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_cmo.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioGeneral
+  name: bio - general
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_general.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_general.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_general.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioJanitor
+  name: bio - janitor
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_janitor.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_janitor.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioScientist
+  name: bio - scientist
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_scientist.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_scientist.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_scientist.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioSecurity
+  name: bio - security
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_security.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_security.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBioVirology
+  name: bio - virology
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bio_virology.rsi
+  - type: Icon
+    sprite: Clothing/Head/bio_virology.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bio_virology.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuit
+  name: bombsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuit.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuit.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuit.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuitsec
+  name: bombsuit sec
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuitsec.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuitsec.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuitsec.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatBombsuitWhite
+  name: bombsuit white
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/bombsuit_white.rsi
+  - type: Icon
+    sprite: Clothing/Head/bombsuit_white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/bombsuit_white.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatChaplainHood
+  name: chaplain hood
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/chaplain_hood.rsi
+  - type: Icon
+    sprite: Clothing/Head/chaplain_hood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/chaplain_hood.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatCulthood
+  name: cult hood
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/culthood.rsi
+  - type: Icon
+    sprite: Clothing/Head/culthood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/culthood.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatNunHood
+  name: nun hood
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/nun_hood.rsi
+  - type: Icon
+    sprite: Clothing/Head/nun_hood.rsi
+  - type: Clothing
+    sprite: Clothing/Head/nun_hood.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatRad
+  name: rad
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/rad.rsi
+  - type: Icon
+    sprite: Clothing/Head/rad.rsi
+  - type: Clothing
+    sprite: Clothing/Head/rad.rsi
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -0,0 +1,12 @@
+- type: entity
+  parent: HatBase
+  id: HatSkub
+  name: Skub Hat
+  description: 'Best paired with the Skub Suit.'
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/skubhead.rsi
+  - type: Icon
+    sprite: Clothing/Head/skubhead.rsi
+  - type: Clothing
+    sprite: Clothing/Head/skubhead.rsi
--- a/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding-masks.yml
@@ -0,0 +1,103 @@
+- type: entity
+  parent: HatBase
+  id: HatWelding
+  name: welding mask
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/welding.rsi
+  - type: Icon
+    sprite: Clothing/Head/welding.rsi
+  - type: Clothing
+    sprite: Clothing/Head/welding.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatWeldingup
+  name: welding mask (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/weldingup.rsi
+  - type: Icon
+    sprite: Clothing/Head/weldingup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/weldingup.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatFireWeldingMask
+  name: fire welding mask
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/fire_welding_mask_1.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/fire_welding_mask_1up.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/blue_flame_welding_mask_1.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/blue_flame_welding_mask_1up.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/paintedwelding.rsi
+  - type: Icon
+    sprite: Clothing/Head/paintedwelding.rsi
+  - type: Clothing
+    sprite: Clothing/Head/paintedwelding.rsi
+
+- type: entity
+  parent: HatBase
+  id: HatPaintedweldingup
+  name: painted welding mask (up)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/paintedweldingup.rsi
+  - type: Icon
+    sprite: Clothing/Head/paintedweldingup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/paintedweldingup.rsi
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -1,3 +1,16 @@
+- type: entity
+  parent: Clothing
+  id: OuterclothingBase
+  abstract: true
+  components:
+  - type: Clothing
+    Slots:
+    - outerclothing
+  - type: Sprite
+    state: icon
+  - type: Icon
+    state: icon
+
 - type: entity
  parent: OuterclothingBase
  id: OuterclothingArmorVest
@@ -6,23 +19,270 @@
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/armor.rsi
-    state: armoralt
+    state: armor
  - type: Icon
    sprite: Clothing/OuterClothing/armor.rsi
-    state: armoralt
+    state: armor
  - type: Clothing
    sprite: Clothing/OuterClothing/armor.rsi
-    ClothingPrefix: armoralt
-    HeldPrefix: armor
+    ClothingPrefix: armor

 - type: entity
-  parent: OuterclothingArmorVest
-  id: OuterclothingArmorVestAlt
-  description: "A Type I armored vest that provides decent protection against most types of damage."
+  parent: OuterclothingBase
+  id: OuterclothingArmorreflec
+  name: armor (reflective)
+  description: ''
  components:
  - type: Sprite
-    state: armor
+    sprite: Clothing/OuterClothing/armor_reflec.rsi
  - type: Icon
-    state: armor
+    sprite: Clothing/OuterClothing/armor_reflec.rsi
  - type: Clothing
-    ClothingPrefix: armor
+    sprite: Clothing/OuterClothing/armor_reflec.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBulletproof
+  name: bulletproof
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bulletproof.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bulletproof.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bulletproof.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingCaparmor
+  name: captain's armor
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/caparmor.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/caparmor.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/caparmor.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingAcolyte
+  name: acolyte
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/acolyte.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/acolyte.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/acolyte.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingCultarmour
+  name: cult armor
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/cult_armour.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/cult_armour.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/cult_armour.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingCustodian
+  name: custodian
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/custodian.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/custodian.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/custodian.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingHeavy
+  name: heavy
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/heavy.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/heavy.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/heavy.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingHmarmorvest
+  name: HM armor vest
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hm_armorvest.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hm_armorvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hm_armorvest.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingHos
+  name: HoS armor vest
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hos.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hos.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hos.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingKvest
+  name: kvest
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/kvest.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/kvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/kvest.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingMagusblue
+  name: magus blue
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/magusblue.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/magusblue.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/magusblue.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingMagusred
+  name: magus red
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/magusred.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/magusred.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/magusred.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingMercwebvest
+  name: merc web vest
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/mercwebvest.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/mercwebvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/mercwebvest.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingReactive
+  name: reactive
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/reactive.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/reactive.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/reactive.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingReactiveoff
+  name: reactive (off)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/reactiveoff.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/reactiveoff.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/reactiveoff.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingRiot
+  name: riot
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/riot.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/riot.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/riot.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingScaf
+  name: scaf
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/scaf.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/scaf.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/scaf.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingSwat
+  name: swat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/swat.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/swat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/swat.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingSninja
+  name: S ninja
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/s_ninja.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/s_ninja.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/s_ninja.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingWebvest
+  name: web vest
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/webvest.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/webvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/webvest.rsi
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -0,0 +1,300 @@
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBomber
+  name: bomber
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bomber.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bomber.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bomber.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBomberopen
+  name: bomber (open)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bomber_open.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bomber_open.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bomber_open.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingCargojacket
+  name: cargo jacket
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/cargo_jacket.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/cargo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/cargo_jacket.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingChurchcoat
+  name: church coat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/church_coat.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/church_coat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/church_coat.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingDetective
+  name: detective
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/detective.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/detective.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/detective.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingGentlecoat
+  name: gentle coat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/gentlecoat.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/gentlecoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/gentlecoat.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingGreyhoodie
+  name: grey hoodie
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/grey_hoodie.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/grey_hoodie_open.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/insp_coat.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/insp_coat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/insp_coat.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingJensencoat
+  name: jensen coat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/jensencoat.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/jensencoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/jensencoat.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingLabcoat
+  name: lab coat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/labcoat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/labcoat.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingLabcoatopen
+  name: lab coat (open)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat_open.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat_chem.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat_chem_open.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat_cmo.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat_cmo_open.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat_medspec.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/labcoat_medspec_open.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/leather_jacket.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/leather_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/leather_jacket.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingPirate
+  name: pirate
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/pirate.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/pirate.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/pirate.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingQmcoat
+  name: QM coat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/qm_coat.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/qm_coat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/qm_coat.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingRedwizard
+  name: red wizard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/redwizard.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/redwizard.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/redwizard.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingHoSTrenchcoat
+  name: head of security trenchcoat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    state: hos_trenchcoat
+  - type: Icon
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    state: hos_trenchcoat
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -0,0 +1,183 @@
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingDeathsquad
+  name: deathsquad
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/deathsquad.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/deathsquad.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/deathsquad.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingIhvoidsuit
+  name: IH voidsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/ihvoidsuit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/ihvoidsuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/ihvoidsuit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitatmos
+  name: hardsuit atmos
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitengineering
+  name: hardsuit engineering
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuithazardhardsuit
+  name: hardsuit hazard hardsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitmedical
+  name: hardsuit medical
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_medical.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_medical.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_medical.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitmining
+  name: hardsuit mining
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_mining.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_mining.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_mining.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitsectg
+  name: hardsuit sectg
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitsyndie
+  name: hardsuit syndie
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
+
+# Some massive smoothbrain had this named "hardsuit white" yeah thanks fuckhead really useful.
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitce
+  name: hardsuit ce
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterClothingHardsuitwiz
+  name: hardsuit wiz
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingSpace
+  name: space
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/space.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/space.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/space.rsi
+
+# I don't know what the hell "td" is but whatever i'll dump it here.
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingTdgreen
+  name: td green
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/tdgreen.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/tdgreen.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/tdgreen.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingTdred
+  name: td red
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/tdred.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/tdred.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/tdred.rsi
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -0,0 +1,313 @@
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingApron
+  name: apron
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/apron.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/apron.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/apron.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingApronchef
+  name: apron (chef)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/apronchef.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/apronchef.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/apronchef.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingAssjacket
+  name: ass jacket
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/ass_jacket.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/ass_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/ass_jacket.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBedsheet
+  name: ghost costume
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bedsheet.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bedsheet.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bedsheet.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBlackhoodie
+  name: black hoodie
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/black_hoodie.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/black_hoodie_open.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/cardborg.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/cardborg.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/cardborg.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingChaplainhoodie
+  name: chaplain hoodie
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/chaplain_hoodie.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingChef
+  name: chef
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/chef.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/chef.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/chef.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingChickensuit
+  name: chicken suit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/chickensuit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/chickensuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/chickensuit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingClassicponcho
+  name: classic poncho
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/classicponcho.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/classicponcho.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/classicponcho.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingCultrobes
+  name: cult robes
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/cultrobes.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/cultrobes.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/cultrobes.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingDetvest
+  name: detective's vest
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/detvest.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/detvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/detvest.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingHazard
+  name: hazard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hazard.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/hazard.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hazard.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingJudge
+  name: judge
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/judge.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/judge.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/judge.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingMonkeysuit
+  name: monkey suit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/monkeysuit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/monkeysuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/monkeysuit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingPoncho
+  name: poncho
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/poncho.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/poncho.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/poncho.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingSanta
+  name: santa
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/santa.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/santa.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/santa.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingStraightjacket
+  name: straight jacket
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/straight_jacket.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/straight_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/straight_jacket.rsi
+
+# This sprite looks like shit too but whatever...
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingSurgeon
+  name: surgeon
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/surgeon.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/surgeon.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/surgeon.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingVest
+  name: vest
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/vest.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/vest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/vest.rsi
+
+# Is this wizard wearing a fanny pack???
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingVioletwizard
+  name: violet wizard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/violetwizard.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/violetwizard.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/violetwizard.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingWizard
+  name: wizard
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/wizard.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/wizard.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/wizard.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingXenos
+  name: xenos
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/xenos.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/xenos.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/xenos.rsi
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/outer_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/outer_clothing.yml
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -0,0 +1,221 @@
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBio
+  name: bio
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bio.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bio.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bio.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBiocmo
+  name: bio suit (CMO)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bio_cmo.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bio_cmo.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bio_cmo.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBiogeneral
+  name: bio suit 
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bio_general.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bio_janitor.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bio_scientist.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bio_security.rsi
+  - type: Icon
+    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: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bio_virology.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bio_virology.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bio_virology.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBombsuit
+  name: bombsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bombsuit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bombsuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bombsuit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBombsuitsec
+  name: bombsuit (security)
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bombsuitsec.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bombsuitsec.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bombsuitsec.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingBombsuitwhite
+  name: bombsuit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/bombsuit_white.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/bombsuit_white.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/bombsuit_white.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingAnomalysuit
+  name: anomaly suit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/anomaly_suit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/anomaly_suit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/anomaly_suit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingEmergencysuit
+  name: emergency suit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/emergency_suit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/emergency_suit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/emergency_suit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingFiresuit
+  name: fire suit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/firesuit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/firesuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/firesuit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingRadSuit
+  name: rad suit
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/radsuit.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/radsuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/radsuit.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingSkub
+  name: Skub Suit
+  description: 'Skub is crudely written on the outside of this cylindrical suit.'
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/skubbody.rsi
+  - type: Icon
+    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
+  id: OuterclothingSyndicate
+  name: syndicate
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/syndicate.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/syndicate.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingVoid
+  name: void
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/void.rsi
+  - type: Icon
+    sprite: Clothing/OuterClothing/void.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/void.rsi
--- a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml
@@ -11,32 +11,6 @@
  - type: Icon
    state: icon

- type: entity
-  parent: ShoesBase
-  id: ShoesAssetProtectionRig
-  name: asset protection rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/asset_protection_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/asset_protection_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/asset_protection_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesAssetProtectionRigSealed
-  name: asset protection rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/asset_protection_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/asset_protection_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/asset_protection_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesAtmosMagboots0
@@ -115,32 +89,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/brown.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesCeRig
-  name: ce rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ce_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ce_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ce_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesCeRigSealed
-  name: ce rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ce_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ce_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ce_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesChef
@@ -206,162 +154,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/digiboots.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesEngineeringRig
-  name: engineering rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/engineering_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/engineering_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/engineering_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesEngineeringRigSealed
-  name: engineering rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/engineering_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/engineering_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/engineering_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtCommanderRig
-  name: ert commander rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_commander_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_commander_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_commander_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtCommanderRigSealed
-  name: ert commander rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_commander_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_commander_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_commander_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtEngineerRig
-  name: ert engineer rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_engineer_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_engineer_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_engineer_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtEngineerRigSealed
-  name: ert engineer rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_engineer_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_engineer_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_engineer_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtMedicalRig
-  name: ert medical rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_medical_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_medical_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_medical_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtMedicalRigSealed
-  name: ert medical rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_medical_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_medical_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_medical_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtSecurityRig
-  name: ert security rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_security_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_security_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_security_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesErtSecurityRigSealed
-  name: ert security rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ert_security_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ert_security_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ert_security_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesEvaRig
-  name: EVA rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/eva_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/eva_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/eva_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesEvaRigSealed
-  name: EVA rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/eva_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/eva_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/eva_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesFlippers
@@ -402,110 +194,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/green.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesHackerRig
-  name: hacker rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/hacker_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/hacker_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/hacker_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesHackerRigSealed
-  name: hacker rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/hacker_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/hacker_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/hacker_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesHazardRig
-  name: hazard rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/hazard_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/hazard_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/hazard_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesHazardRigSealed
-  name: hazard rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/hazard_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/hazard_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/hazard_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesIhsRig
-  name: IHS rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ihs_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ihs_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ihs_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesIhsRigOld
-  name: IHS rig old shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ihs_rig_old.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ihs_rig_old.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ihs_rig_old.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesIhsRigSealed
-  name: IHS rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ihs_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ihs_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ihs_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesIhsRigSealedOld
-  name: IHS rig sealed old shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ihs_rig_sealed_old.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ihs_rig_sealed_old.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ihs_rig_sealed_old.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesLeather
@@ -545,32 +233,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/magboots1.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesMedicalRig
-  name: medical rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/medical_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/medical_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/medical_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesMedicalRigSealed
-  name: medical rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/medical_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/medical_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/medical_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesMercboots0
@@ -597,32 +259,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/mercboots1.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesMercRig
-  name: merc rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/merc_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/merc_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/merc_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesMercRigSealed
-  name: merc rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/merc_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/merc_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/merc_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesMime
@@ -636,32 +272,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/mime.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesNinjaRig
-  name: ninja rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ninja_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ninja_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ninja_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesNinjaRigSealed
-  name: ninja rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/ninja_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/ninja_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/ninja_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesOrange
@@ -740,58 +350,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/reinforced.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesScienceRig
-  name: science rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/science_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/science_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/science_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesScienceRigSealed
-  name: science rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/science_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/science_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/science_rig_sealed.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesSecurityRig
-  name: security rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/security_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/security_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/security_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesSecurityRigSealed
-  name: security rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/security_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/security_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/security_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesSlippers
@@ -831,32 +389,6 @@
  - type: Clothing
    sprite: Clothing/Shoes/springjacks.rsi

- type: entity
-  parent: ShoesBase
-  id: ShoesStealthRig
-  name: stealth rig shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/stealth_rig.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/stealth_rig.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/stealth_rig.rsi
-
- type: entity
-  parent: ShoesBase
-  id: ShoesStealthRigSealed
-  name: stealth rig sealed shoes
-  description: ''
-  components:
-  - type: Sprite
-    sprite: Clothing/Shoes/stealth_rig_sealed.rsi
-  - type: Icon
-    sprite: Clothing/Shoes/stealth_rig_sealed.rsi
-  - type: Clothing
-    sprite: Clothing/Shoes/stealth_rig_sealed.rsi
-
 - type: entity
  parent: ShoesBase
  id: ShoesSwat
--- a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/icon.png
+++ b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/icon.png
--- a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/meta.json
+++ b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/meta.json
@@ -1 +1,74 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-EYES", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sunglasses", "directions": 1, "delays": [[1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+  "states": [
+    {
+      "name": "equipped-EYES",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
--- a/Resources/Textures/Clothing/Glasses/sunglasses.rsi/sunglasses.png
+++ b/Resources/Textures/Clothing/Glasses/sunglasses.rsi/sunglasses.png
--- a/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/meta.json
+++ b/Resources/Textures/Clothing/Glasses/sunglasses_sec.rsi/meta.json
@@ -1 +1,74 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-EYES", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
+  "states": [
+    {
+      "name": "equipped-EYES",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "icon",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/asset_protection_rig_sealed.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ce_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ce_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ce_rig_sealed.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/engineering_rig_sealed.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_commander_rig_sealed.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_engineer_rig_sealed.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_medical_rig_sealed.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/ert_security_rig_sealed.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/eva_rig.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/eva_rig.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/eva_rig.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/eva_rig.rsi/icon.png
--- a/Resources/Textures/Clothing/Gloves/eva_rig.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Gloves/eva_rig.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Gloves/eva_rig.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Gloves/eva_rig.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Gloves/eva_rig.rsi/meta.json
+++ b/Resources/Textures/Clothing/Gloves/eva_rig.rsi/meta.json
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
--- a/Resources/Textures/Clothing/Gloves/eva_rig_sealed.rsi/equipped-HAND.png
+++ b/Resources/Textures/Clothing/Gloves/eva_rig_sealed.rsi/equipped-HAND.png
--- a/Resources/Textures/Clothing/Gloves/eva_rig_sealed.rsi/icon.png
+++ b/Resources/Textures/Clothing/Gloves/eva_rig_sealed.rsi/icon.png
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
				`@@ -1 +0,0 @@`
				`{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/cb5bda251807e38fe5eae6b1def12f0c243b4d0a/icons/inventory/hands/mob.dmi", "states": [{"name": "equipped-HAND", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}`