diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
index b073bdb773f..efa1b7e7677 100644
--- a/Resources/Locale/en-US/customization/character-requirements.ftl
+++ b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -9,7 +9,7 @@ character-species-requirement = You must {$inverted ->
 character-trait-requirement = You must {$inverted ->
     [true] not have
     *[other] have
-} the trait [color=lightblue]{$trait}[/color]
+} one of these traits: [color=lightblue]{$traits}[/color]
 character-backpack-type-requirement = You must {$inverted ->
     [true] not use
     *[other] use
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
index 685c5cbcbd9..9770bd8bafd 100644
--- a/Resources/Locale/en-US/loadouts/categories.ftl
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -2,7 +2,14 @@
 
 loadout-category-Uncategorized = Uncategorized
 loadout-category-Accessories = Accessories
+loadout-category-Eyes = Eyes
+loadout-category-Hands = Hands
+loadout-category-Head = Head
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
+loadout-category-Mask = Mask
+loadout-category-Neck = Neck
 loadout-category-Outer = Outer
+loadout-category-Shoes = Shoes
+loadout-category-Species = Species
 loadout-category-Uniform = Uniform
diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/items.ftl
index a4819011262..b92f56bc7cb 100644
--- a/Resources/Locale/en-US/loadouts/items.ftl
+++ b/Resources/Locale/en-US/loadouts/items.ftl
@@ -11,3 +11,5 @@ loadout-description-LoadoutItemPlushieSharkBlue = Dive into battle with your ver
 loadout-description-LoadoutItemPlushieSharkPink = Unleash the power of pink with the Pink Shark Plushie! This rosy-hued predator might not have real teeth, but its sheer adorableness is enough to take a bite out of anyone's resolve. Watch as foes melt away in the face of its cottony charm.
 loadout-description-LoadoutItemPlushieSharkGrey = Introducing the Grey Shark Plushie, the apex predator of snuggles! With its sleek and understated design, this plushie strikes the perfect balance between cuddle companion and imaginary ocean guardian. Beware; opponents may be mesmerized by its dorsal fin's hypnotic sway!
 loadout-description-LoadoutItemPlushieCarp = Brace for extraterrestrial antics with the Purple Space Carp Plushie! A fishy invader from the cosmic deep, this plushie brings a splash of humor to zero-gravity escapades. From hostile waters to interstellar giggles, it's a cuddly contradiction that's out of this world
+loadout-description-LoadoutSolCommonTranslator = The most common of all translators, such that it can be purchased in any civilized station.
+                                                 This device translates Sol Common speech into Galactic Common.
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 1f90b421526..e6c08bf90b9 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -607,6 +607,20 @@
   - type: Clothing
     sprite: Clothing/Belt/securitywebbing.rsi
 
+- type: entity
+  parent: ClothingBeltSecurityWebbing
+  id: ClothingBeltSecurityWebbingFilled
+  name: security webbing
+  description: Unique and versatile chest rig, can hold security gear.
+  components:
+  - type: StorageFill
+    contents:
+      - id: GrenadeFlashBang
+      - id: TearGasGrenade
+      - id: Stunbaton
+      - id: Handcuffs
+      - id: Handcuffs
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMercWebbing
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 659cbaa28a2..18ea198697e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -80,7 +80,7 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Omnizine
-            Quantity: 30
+            Quantity: 5
 
 - type: entity
   id: CigaretteOmnizine
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index bc9079fb2db..eb8e0a1ffe6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -182,7 +182,7 @@
   id: CigPackSyndicate
   parent: CigPackBase
   name: Interdyne herbals packet
-  description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
+  description: Premium medicinal cigarettes from the Interdyne Corporation. Not endorsed by the Terra-Gov Surgeon General.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
index 5e88006fcee..6dcce11d09f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/medical.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -9,6 +9,8 @@
         - MedicalDoctor
         - Paramedic
         - ChiefMedicalOfficer
+        - MedicalIntern
+        - Chemist
   items:
     - ClothingHandsGlovesNitrile
 
@@ -35,6 +37,7 @@
       jobs:
         - MedicalDoctor
         - ChiefMedicalOfficer
+        - MedicalIntern
   items:
     - ClothingNeckStethoscope
 
@@ -47,6 +50,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorBlue
 
@@ -59,6 +65,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorGreen
 
@@ -71,9 +80,85 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
   items:
     - UniformScrubsColorPurple
 
+- type: loadout
+  id: LoadoutMedicalUniformScrubsCyan
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorCyan
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsBlack
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorBlack
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsPink
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - UniformScrubsColorPink
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsCybersun
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - UniformScrubsColorCybersun
+
+- type: loadout
+  id: LoadoutMedicalOuterCybersunWindbreaker
+  category: Jobs
+  cost: 5
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - ClothingOuterCoatCybersunWindbreaker
+
 - type: loadout
   id: LoadoutMedicalOuterLabcoatChem
   category: Jobs
@@ -130,6 +215,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -151,6 +239,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -184,6 +275,9 @@
     - !type:CharacterJobRequirement
       jobs:
         - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - ChiefMedicalOfficer
     - !type:CharacterPlaytimeRequirement
       tracker: JobChemist
       min: 21600 # 6 hours
@@ -195,3 +289,173 @@
       min: 216000 # 60 hours
   items:
     - ClothingHeadHatBeretSeniorPhysician
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapBlue
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapPurple
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapPurple
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapGreen
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapGreen
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapCyan
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapCyan
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapBlack
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapBlack
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapPink
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapPink
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapWhite
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+        - MedicalIntern
+  items:
+    - ClothingHeadHatSurgcapWhite
+
+- type: loadout
+  id: LoadoutMedicalHeadSurgcapCybersun
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+        - Paramedic
+  items:
+    - ClothingHeadHatSurgcapCybersun
+
+- type: loadout
+  id: LoadoutMedicalEyesHudMedical
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+  items:
+    - ClothingEyesHudMedical
+
+- type: loadout
+  id: LoadoutMedicalEyesEyepatchHudMedical
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+  items:
+    - ClothingEyesEyepatchHudMedical
+
+- type: loadout
+  id: LoadoutMedicalEyesHudMedicalPrescription
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
+  items:
+    - ClothingEyesPrescriptionMedHud
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
index ad6f02e589e..b9c815a15b0 100644
--- a/Resources/Prototypes/Loadouts/Jobs/science.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -84,3 +84,59 @@
         - ResearchDirector
   items:
     - ClothingHeadHatBeretRND
+
+- type: loadout
+  id: LoadoutScienceEyesHudDiagnostic
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingEyesHudDiagnostic
+
+- type: loadout
+  id: LoadoutScienceEyesEyepatchHudDiag
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingEyesEyepatchHudDiag
+
+## Robes
+- type: loadout
+  id: LoadoutOuterRobeTechPriest
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterRobeTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+
+- type: loadout
+  id: LoadoutHeadHoodTechPriest
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadTechPriest
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index ecf7e4893a2..e6a6693ec18 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -1,7 +1,22 @@
+## Uniforms
 - type: loadout
-  id: LoadoutSecurityUniformGrey
+  id: LoadoutSecurityUniformJumpsuitBlue
   category: Jobs
-  cost: 2
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpsuitSecBlue
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpsuitGrey
+  category: Jobs
+  cost: 1
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -12,6 +27,34 @@
   items:
     - ClothingUniformJumpsuitSecGrey
 
+- type: loadout
+  id: LoadoutSecurityUniformJumpskirtGrey
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpskirtSecGrey
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpskirtBlue
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpskirtSecBlue
+
 - type: loadout
   id: LoadoutSecurityUniformJumpskirtSenior
   category: Jobs
@@ -60,6 +103,108 @@
   items:
     - ClothingUniformJumpsuitSeniorOfficer
 
+- type: loadout
+  id: LoadoutUniformJumpsuitWardenBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpsuitWardenBlue
+
+- type: loadout
+  id: LoadoutUniformJumpsuitWardenGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpsuitWardenGrey
+
+- type: loadout
+  id: LoadoutUniformJumpskirtWardenBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpskirtWardenBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtWardenGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Warden
+  items:
+    - ClothingUniformJumpskirtWardenGrey
+
+- type: loadout
+  id: LoadoutUniformJumpskirtHoSBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtHoSGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSGrey
+
+- type: loadout
+  id: LoadoutUniformJumpsuitSecFormal
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitSecFormal
+
+- type: loadout
+  id: LoadoutUniformJumpsuitSecSummer
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitSecSummer
+## Mask
 - type: loadout
   id: LoadoutSecurityMaskGasSwat
   category: Jobs
@@ -73,6 +218,7 @@
   items:
     - ClothingMaskGasSwat
 
+## Shoes
 - type: loadout
   id: LoadoutSecurityShoesJackboots
   category: Jobs
@@ -87,3 +233,119 @@
         - HeadOfSecurity
   items:
     - ClothingShoesBootsJack
+
+## Eyes
+- type: loadout
+  id: LoadoutSecurityEyesHudSecurity
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingEyesHudSecurity
+
+- type: loadout
+  id: LoadoutSecurityEyesEyepatchHudSecurity
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingEyesEyepatchHudSecurity
+
+- type: loadout
+  id: LoadoutSecurityEyesHudSecurityPrescription
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+    - !type:CharacterTraitRequirement
+      traits:
+        - Nearsighted
+  items:
+    - ClothingEyesPrescriptionHudSecurity
+
+## Head
+- type: loadout
+  id: LoadoutSecurityHeadHatBeret
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingHeadHatBeretSecurity
+
+- type: loadout
+  id: LoadoutSecurityHeadHelmetInsulated
+  category: Jobs
+  cost: 3
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+  items:
+    - ClothingHeadHelmetInsulated
+
+## Belt
+- type: loadout
+  id: LoadoutSecurityBeltWebbing
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingBeltSecurityWebbingFilled
+
+## Species
+#- type: loadout ##Uncomment this and reassess points when we can make it replace the secoff duty pistol
+#  id: LoadoutSecurityEquipmentTruncheon
+#  category: Jobs
+#  cost: 8 ## TODO: Make this replace the secoff handgun, and thus also make it cheaper
+#  requirements:
+#    - !type:CharacterJobRequirement
+#      jobs:
+#        - SecurityOfficer
+#        - Warden
+#        - HeadOfSecurity
+#        - Brigmedic
+#    - !type:CharacterPlaytimeRequirement
+#      tracker: JobSecurityOfficer
+#      min: 36000 # 10 hours
+#    - !type:CharacterSpeciesRequirement
+#      species: Oni
+#  items:
+#    - Truncheon
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
index 6ef3c3ad485..ed6107db9e9 100644
--- a/Resources/Prototypes/Loadouts/Jobs/service.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -1,3 +1,4 @@
+## Clown
 - type: loadout
   id: LoadoutServiceClownOutfitJester
   category: Jobs
@@ -26,6 +27,7 @@
     - ClothingHeadHatJesterAlt
     - ClothingShoesJester
 
+## Bartender
 - type: loadout
   id: LoadoutServiceBartenderUniformPurple
   category: Jobs
@@ -38,6 +40,7 @@
   items:
     - ClothingUniformJumpsuitBartenderPurple
 
+## Botanist
 - type: loadout
   id: LoadoutServiceBotanistUniformOveralls
   category: Jobs
@@ -50,6 +53,7 @@
   items:
     - ClothingUniformOveralls
 
+## Lawyer
 - type: loadout
   id: LoadoutServiceLawyerUniformBlueSuit
   category: Jobs
@@ -158,6 +162,7 @@
   items:
     - ClothingUniformJumpsuitJournalist
 
+## Reporter
 - type: loadout
   id: LoadoutServiceReporterUniformDetectivesuit
   category: Jobs
@@ -181,3 +186,15 @@
         - Reporter
   items:
     - ClothingUniformJumpskirtDetective
+
+## Musician
+- type: loadout
+  id: LoadoutItemSynthesizerInstrument
+  category: Jobs
+  cost: 8
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Musician
+  items:
+    - SynthesizerInstrument
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
index a4381941acc..79d2d7fe2bf 100644
--- a/Resources/Prototypes/Loadouts/categories.yml
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -4,7 +4,13 @@
   id: Uncategorized
 
 - type: loadoutCategory
-  id: Accessories
+  id: Eyes
+
+- type: loadoutCategory
+  id: Hands
+
+- type: loadoutCategory
+  id: Head
 
 - type: loadoutCategory
   id: Items
@@ -12,8 +18,17 @@
 - type: loadoutCategory
   id: Jobs
 
+- type: loadoutCategory
+  id: Neck
+
 - type: loadoutCategory
   id: Outer
 
+- type: loadoutCategory
+  id: Shoes
+
+- type: loadoutCategory
+  id: Species
+
 - type: loadoutCategory
   id: Uniform
diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml
index a7a8cbd7736..74226604e92 100644
--- a/Resources/Prototypes/Loadouts/eyes.yml
+++ b/Resources/Prototypes/Loadouts/eyes.yml
@@ -1,13 +1,21 @@
 - type: loadout
   id: LoadoutEyesEyepatch
-  category: Accessories
+  category: Eyes
   cost: 1
   items:
     - ClothingEyesEyepatch
 
 - type: loadout
   id: LoadoutEyesBlindfold
-  category: Accessories
+  category: Eyes
   cost: 2
   items:
     - ClothingEyesBlindfold
+
+- type: loadout
+  id: LoadoutItemSunglasses
+  category: Eyes
+  cost: 5
+  exclusive: true
+  items:
+    - ClothingEyesGlassesSunglasses
diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml
new file mode 100644
index 00000000000..3604678d387
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/hands.yml
@@ -0,0 +1,115 @@
+- type: loadout
+  id: LoadoutHandsColorPurple
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorPurple
+
+- type: loadout
+  id: LoadoutHandsColorRed
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorRed
+
+- type: loadout
+  id: LoadoutHandsColorBlack
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBlack
+
+- type: loadout
+  id: LoadoutHandsColorBlue
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBlue
+
+- type: loadout
+  id: LoadoutHandsColorBrown
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorBrown
+
+- type: loadout
+  id: LoadoutHandsColorGray
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorGray
+
+- type: loadout
+  id: LoadoutHandsColorGreen
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorGreen
+
+- type: loadout
+  id: LoadoutHandsColorLightBrown
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorLightBrown
+
+- type: loadout
+  id: LoadoutHandsColorOrange
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorOrange
+
+- type: loadout
+  id: LoadoutHandsColorWhite
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesColorWhite
+
+- type: loadout
+  id: LoadoutHandsColorYellowBudget
+  category: Hands
+  cost: 4
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
+  items:
+    - ClothingHandsGlovesColorYellowBudget
+
+- type: loadout
+  id: LoadoutHandsGlovesLeather
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesLeather
+
+- type: loadout
+  id: LoadoutHandsGlovesPowerglove
+  category: Hands
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHandsGlovesPowerglove
+
+- type: loadout
+  id: LoadoutHandsGlovesRobohands
+  category: Hands
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHandsGlovesRobohands
diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml
index 33a2f0b19bc..25cb4dadf11 100644
--- a/Resources/Prototypes/Loadouts/head.yml
+++ b/Resources/Prototypes/Loadouts/head.yml
@@ -1,125 +1,273 @@
+## Hats
 - type: loadout
   id: LoadoutHeadBeaverHat
-  category: Accessories
+  category: Head
   cost: 2
+  exclusive: true
   items:
     - ClothingHeadHatBeaverHat
 
 - type: loadout
   id: LoadoutHeadTophat
-  category: Accessories
+  category: Head
   cost: 2
+  exclusive: true
   items:
     - ClothingHeadHatTophat
 
+- type: loadout
+  id: LoadoutHeadFedoraBlack
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraBlack
+
+- type: loadout
+  id: LoadoutHeadFedoraChoc
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraChoc
+
+- type: loadout
+  id: LoadoutHeadFedoraWhite
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFedoraWhite
+
+- type: loadout
+  id: LoadoutHeadFlatBlack
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFlatBlack
+
+- type: loadout
+  id: LoadoutHeadFlatBrown
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatFlatBrown
+
+- type: loadout
+  id: LoadoutHeadTinfoil
+  category: Head
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingHeadTinfoil
+
+- type: loadout
+  id: LoadoutHeadBellhop
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadHatBellhop
+## Color Hats
 - type: loadout
   id: LoadoutHeadHatBluesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatBluesoft
 
 - type: loadout
   id: LoadoutHeadHatBluesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatBluesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatCorpsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatCorpsoft
 
 - type: loadout
   id: LoadoutHeadHatCorpsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatCorpsoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatGreensoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreensoft
 
 - type: loadout
   id: LoadoutHeadHatGreensoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreensoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatGreysoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreysoft
 
 - type: loadout
   id: LoadoutHeadHatGreysoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatGreysoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatOrangesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatOrangesoft
 
 - type: loadout
   id: LoadoutHeadHatOrangesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatOrangesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatPurplesoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatPurplesoft
 
 - type: loadout
   id: LoadoutHeadHatPurplesoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatPurplesoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatRedsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatRedsoft
 
 - type: loadout
   id: LoadoutHeadHatRedsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatRedsoftFlipped
 
 - type: loadout
   id: LoadoutHeadHatYellowsoft
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatYellowsoft
 
 - type: loadout
   id: LoadoutHeadHatYellowsoftFlipped
-  category: Accessories
+  category: Head
   cost: 1
+  exclusive: true
   items:
     - ClothingHeadHatYellowsoftFlipped
+
+## Headbands
+- type: loadout
+  id: LoadoutHeadBandBlack
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBlack
+
+- type: loadout
+  id: LoadoutHeadBandBlue
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBlue
+
+- type: loadout
+  id: LoadoutHeadBandGold
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGold
+
+- type: loadout
+  id: LoadoutHeadBandGreen
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGreen
+
+- type: loadout
+  id: LoadoutHeadBandGrey
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandGrey
+
+- type: loadout
+  id: LoadoutHeadBandRed
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandRed
+
+- type: loadout
+  id: LoadoutHeadBandSkull
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandSkull
+
+- type: loadout
+  id: LoadoutHeadBandMerc
+  category: Head
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingHeadBandMerc
+
+- type: loadout
+  id: LoadoutHeadBandBrown
+  category: Head
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingHeadBandBrown
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
index 6ce8d260613..072061d2e28 100644
--- a/Resources/Prototypes/Loadouts/items.yml
+++ b/Resources/Prototypes/Loadouts/items.yml
@@ -1,3 +1,4 @@
+#Smokes
 - type: loadout
   id: LoadoutItemCig
   category: Items
@@ -34,11 +35,18 @@
     - CigPackBlack
 
 - type: loadout
-  id: LoadoutItemPAI
+  id: LoadoutItemCigsMixed
   category: Items
   cost: 3
   items:
-    - PersonalAI
+    - CigPackMixed
+
+- type: loadout
+  id: LoadoutItemCigsSyndicate
+  category: Items
+  cost: 4
+  items:
+    - CigPackSyndicate
 
 - type: loadout
   id: LoadoutItemLighter
@@ -61,30 +69,138 @@
   items:
     - Matchbox
 
+## Instruments
 - type: loadout
-  id: LoadoutItemPlushieSharkBlue
+  id: LoadoutItemMicrophoneInstrument
   category: Items
-  cost: 2
+  cost: 4
   items:
-    - PlushieSharkBlue
+    - MicrophoneInstrument
 
 - type: loadout
-  id: LoadoutItemPlushieSharkPink
+  id: LoadoutItemKalimbaInstrument
   category: Items
-  cost: 2
+  cost: 4
+  items:
+    - KalimbaInstrument
+
+- type: loadout
+  id: LoadoutItemTrumpetInstrument
+  category: Items
+  cost: 6
+  items:
+    - TrumpetInstrument
+
+- type: loadout
+  id: LoadoutItemElectricGuitar
+  category: Items
+  cost: 7
+  items:
+    - ElectricGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemBassGuitar
+  category: Items
+  cost: 7
+  items:
+    - BassGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemRockGuitar
+  category: Items
+  cost: 7
+  items:
+    - RockGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemAcousticGuitar
+  category: Items
+  cost: 7
+  items:
+    - AcousticGuitarInstrument
+
+- type: loadout
+  id: LoadoutItemViolin
+  category: Items
+  cost: 6
+  items:
+    - ViolinInstrument
+
+- type: loadout
+  id: LoadoutItemHarmonica
+  category: Items
+  cost: 3
+  items:
+    - HarmonicaInstrument
+
+- type: loadout
+  id: LoadoutItemAccordion
+  category: Items
+  cost: 6
+  items:
+    - AccordionInstrument
+
+- type: loadout
+  id: LoadoutItemFlute
+  category: Items
+  cost: 4
   items:
-    - PlushieSharkPink
+    - FluteInstrument
 
 - type: loadout
-  id: LoadoutItemPlushieSharkGrey
+  id: LoadoutItemOcarina
+  category: Items
+  cost: 3
+  items:
+    - OcarinaInstrument
+
+# Survival Kit
+- type: loadout
+  id: LoadoutItemsEmergencyOxygenTank
+  category: Items
+  cost: 1
+  items:
+    - EmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsExtendedEmergencyOxygenTank
   category: Items
   cost: 2
   items:
-    - PlushieSharkGrey
+    - ExtendedEmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsDoubleEmergencyOxygenTank
+  category: Items
+  cost: 4
+  items:
+    - DoubleEmergencyOxygenTankFilled
+
+- type: loadout
+  id: LoadoutItemsEmergencyCrowbar
+  category: Items
+  cost: 3
+  items:
+    - CrowbarRed
 
+#Misc Items
 - type: loadout
-  id: LoadoutItemPlushieCarp
+  id: LoadoutItemPAI
+  category: Items
+  cost: 3
+  items:
+    - PersonalAI
+
+- type: loadout
+  id: LoadoutItemWaistbag
   category: Items
   cost: 2
   items:
-    - PlushieCarp
+    - ClothingBeltStorageWaistbag
+
+- type: loadout
+  id: LoadoutSolCommonTranslator
+  category: Items
+  cost: 3
+  items:
+    - SolCommonTranslator
diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml
index 7e5526f966a..eb933de29ee 100644
--- a/Resources/Prototypes/Loadouts/neck.yml
+++ b/Resources/Prototypes/Loadouts/neck.yml
@@ -1,27 +1,104 @@
 - type: loadout
   id: LoadoutNeckScarfStripedRed
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedRed
 
 - type: loadout
   id: LoadoutNeckScarfStripedBlue
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedBlue
 
 - type: loadout
   id: LoadoutNeckScarfStripedGreen
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedGreen
 
 - type: loadout
   id: LoadoutNeckScarfStripedZebra
-  category: Accessories
+  category: Neck
   cost: 1
+  exclusive: true
   items:
     - ClothingNeckScarfStripedZebra
+
+#Pride Accessories
+- type: loadout
+  id: LoadoutItemsPrideLGBTPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckLGBTPin
+
+- type: loadout
+  id: LoadoutItemsPrideAromanticPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckAromanticPin
+
+- type: loadout
+  id: LoadoutItemsPrideAsexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckAsexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideBisexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckBisexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideIntersexPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckIntersexPin
+
+- type: loadout
+  id: LoadoutItemsPrideLesbianPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckLesbianPin
+
+- type: loadout
+  id: LoadoutItemsPrideNonBinaryPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckNonBinaryPin
+
+- type: loadout
+  id: LoadoutItemsPridePansexualPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckPansexualPin
+
+- type: loadout
+  id: LoadoutItemsPrideTransPin
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckTransPin
diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml
index 078cf530ba2..a5932214ce9 100644
--- a/Resources/Prototypes/Loadouts/outerClothing.yml
+++ b/Resources/Prototypes/Loadouts/outerClothing.yml
@@ -1,10 +1,3 @@
-- type: loadout
-  id: LoadoutOuterGhostSheet
-  category: Outer
-  cost: 2
-  items:
-    - ClothingOuterGhostSheet
-
 - type: loadout
   id: LoadoutOuterCoatBomberjacket
   category: Outer
@@ -33,6 +26,72 @@
   items:
     - ClothingOuterWinterCoat
 
+- type: loadout
+  id: LoadoutOuterCoatHyenhSweater
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatHyenhSweater
+
+- type: loadout
+  id: LoadoutOuterWinterCoatLong
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterWinterCoatLong
+
+- type: loadout
+  id: LoadoutOuterWinterCoatPlaid
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterWinterCoatPlaid
+
+- type: loadout
+  id: LoadoutOuterVestValet
+  category: Outer
+  cost: 1
+  items:
+    - ClothingOuterVestValet
+
+## Letterman Jackets
+- type: loadout
+  id: LoadoutOuterCoatLettermanBlue
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatLettermanBlue
+
+- type: loadout
+  id: LoadoutOuterCoatLettermanRed
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatLettermanRed
+
+## MNK
+- type: loadout
+  id: LoadoutOuterCoatMNKWhiteHoodie
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKWhiteHoodie
+
+- type: loadout
+  id: LoadoutOuterCoatMNKBlackTopCoat
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKBlackTopCoat
+
+- type: loadout
+  id: LoadoutOuterCoatMNKBlackJacket
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatMNKBlackJacket
+
+## Contractor Jackets
 - type: loadout
   id: LoadoutOuterCorporateJacket
   category: Outer
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
index 4a1880b5e21..3c2e21e631b 100644
--- a/Resources/Prototypes/Loadouts/shoes.yml
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -1,7 +1,7 @@
 # Colored
 - type: loadout
   id: LoadoutShoesBlack
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -9,7 +9,7 @@
 
 - type: loadout
   id: LoadoutShoesBlue
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -17,7 +17,7 @@
 
 - type: loadout
   id: LoadoutShoesBrown
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -25,7 +25,7 @@
 
 - type: loadout
   id: LoadoutShoesGreen
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -33,7 +33,7 @@
 
 - type: loadout
   id: LoadoutShoesOrange
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -41,7 +41,7 @@
 
 - type: loadout
   id: LoadoutShoesPurple
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -49,7 +49,7 @@
 
 - type: loadout
   id: LoadoutShoesRed
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -57,7 +57,7 @@
 
 - type: loadout
   id: LoadoutShoesWhite
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -65,25 +65,93 @@
 
 - type: loadout
   id: LoadoutShoesYellow
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
     - ClothingShoesColorYellow
 
+- type: loadout
+  id: LoadoutShoesGeta
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesGeta
+
+## Boots
+- type: loadout
+  id: LoadoutShoesBootsWork
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesBootsWork
+
+- type: loadout
+  id: LoadoutShoesBootsLaceup
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsLaceup
+
+- type: loadout
+  id: LoadoutShoesBootsWinter
+  category: Shoes
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesBootsWinter
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyBrown
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyBrown
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyBlack
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyBlack
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyWhite
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyWhite
+
+- type: loadout
+  id: LoadoutShoesBootsCowboyFancy
+  category: Shoes
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingShoesBootsCowboyFancy
 
 # Miscellaneous
 - type: loadout
   id: LoadoutShoesSlippersDuck
-  category: Accessories
-  cost: 1
+  category: Shoes
+  cost: 2
   exclusive: true
   items:
     - ClothingShoeSlippersDuck
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Clown
 
 - type: loadout
   id: LoadoutShoesLeather
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
@@ -91,7 +159,7 @@
 
 - type: loadout
   id: LoadoutShoesMiscWhite
-  category: Accessories
+  category: Shoes
   cost: 1
   exclusive: true
   items:
diff --git a/Resources/Prototypes/Loadouts/species.yml b/Resources/Prototypes/Loadouts/species.yml
new file mode 100644
index 00000000000..1d2fb58dc0a
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/species.yml
@@ -0,0 +1,35 @@
+- type: loadout
+  id: LoadoutSpeciesEmergencyNitrogenTank
+  category: Species
+  cost: 0
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
+  items:
+    - EmergencyNitrogenTankFilled
+
+- type: loadout
+  id: LoadoutSpeciesExtendedEmergencyNitrogenTank
+  category: Species
+  cost: 1
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
+  items:
+    - ExtendedEmergencyNitrogenTankFilled
+
+- type: loadout
+  id: LoadoutSpeciesDoubleEmergencyNitrogenTank
+  category: Species
+  cost: 3
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species: SlimePerson
+    - !type:CharacterSpeciesRequirement
+      species: Vox
+  items:
+    - DoubleEmergencyNitrogenTankFilled
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
index 5afdd303c0b..20c5b42c7c2 100644
--- a/Resources/Prototypes/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -19,6 +19,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlack
@@ -27,6 +31,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlack
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBlue
@@ -35,6 +43,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBlue
@@ -43,6 +55,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorGreen
@@ -51,6 +67,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorGreen
@@ -59,6 +79,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorOrange
@@ -67,6 +91,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorOrange
@@ -75,6 +103,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorOrange
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPink
@@ -83,6 +115,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPink
@@ -91,6 +127,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPink
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorRed
@@ -99,6 +139,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorRed
@@ -107,6 +151,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorRed
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorWhite
@@ -115,6 +163,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorWhite
@@ -123,6 +175,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorWhite
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorYellow
@@ -131,6 +187,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorYellow
@@ -139,6 +199,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorYellow
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkBlue
@@ -147,6 +211,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkBlue
@@ -155,6 +223,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkBlue
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorTeal
@@ -163,6 +235,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorTeal
@@ -171,6 +247,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorTeal
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorPurple
@@ -179,6 +259,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorPurple
@@ -187,6 +271,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorPurple
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorDarkGreen
@@ -195,6 +283,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorDarkGreen
@@ -203,6 +295,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorDarkGreen
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorLightBrown
@@ -211,6 +307,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorLightBrown
@@ -219,6 +319,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorLightBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorBrown
@@ -227,6 +331,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorBrown
@@ -235,6 +343,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorBrown
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpsuitColorMaroon
@@ -243,6 +355,10 @@
   exclusive: true
   items:
     - ClothingUniformJumpsuitColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
 
 - type: loadout
   id: LoadoutUniformJumpskirtColorMaroon
@@ -251,11 +367,131 @@
   exclusive: true
   items:
     - ClothingUniformJumpskirtColorMaroon
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Passenger
+
+## Kendo
+- type: loadout
+  id: LoadoutUniformKendoHakama
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformKendoHakama
+
+- type: loadout
+  id: LoadoutUniformMartialGi
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformMartialGi
+
+## Kimono
+- type: loadout
+  id: LoadoutClothingKimonoBlue
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoBlue
+
+- type: loadout
+  id: LoadoutClothingKimonoPink
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoPink
+
+- type: loadout
+  id: LoadoutClothingKimonoPurple
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoPurple
+
+- type: loadout
+  id: LoadoutClothingKimonoSky
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoSky
+
+- type: loadout
+  id: LoadoutClothingKimonoGreen
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingKimonoGreen
 
+## Gakuran
 - type: loadout
-  id: LoadoutUniformJumpsuitColorRainbow
+  id: LoadoutUniformSchoolGakuranBlack
   category: Uniform
   cost: 2
   exclusive: true
   items:
-    - ClothingUniformColorRainbow
+    - ClothingUniformSchoolGakuranBlack
+
+## MNK Uniforms
+- type: loadout
+  id: LoadoutClothingMNKOfficeSkirt
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKOfficeSkirt
+
+- type: loadout
+  id: LoadoutClothingMNKUnderGarment
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKUnderGarment
+
+- type: loadout
+  id: LoadoutClothingMNKGymBra
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKGymBra
+
+- type: loadout
+  id: LoadoutClothingMNKDressBlack
+  category: Uniform
+  cost: 4
+  exclusive: true
+  items:
+    - ClothingUniformMNKDressBlack
+
+- type: loadout
+  id: LoadoutClothingMNKBlackOveralls
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKBlackOveralls
+
+- type: loadout
+  id: LoadoutClothingMNKBlackShoulder
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKBlackShoulder
+
+- type: loadout
+  id: LoadoutClothingMNKTracksuitBlack
+  category: Uniform
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingUniformMNKTracksuitBlack