From 4022665b3fd935ec78f63fc6755807004d6a06f7 Mon Sep 17 00:00:00 2001
From: MetalSage <metalsage.official@gmail.com>
Date: Wed, 11 Dec 2024 20:26:15 +0400
Subject: [PATCH] loadouts cleanup

---
 .../Prototypes/Loadouts/loadout_groups.yml    | 647 +++++++++---------
 .../_Stories/Loadouts/jedint_loadouts.yml     |  73 +-
 .../_Stories/Loadouts/prison_loadouts.yml     |  37 +-
 3 files changed, 394 insertions(+), 363 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index eb26d66a93..5ce2474de3 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -5,26 +5,6 @@
   minLimit: 0
   maxLimit: 3
   loadouts:
-  # Stories - start
-  - StoriesFlippoEngravedLighter
-  - WristwatchSilver
-  - StoriesWristwatchGold
-  - ClothingNeckCloakCollector
-  - ClothingNeckCloakAnomalist
-  - ClothingNeckCloakSnake
-  - ToyFigurineColossus
-  - ToyFigurineAshDragon
-  - ToyFigurineBubblegum
-  - ClothingNeckElectrospheres
-  - ToyFigurineShadowling
-  - ToyFigurineAscendedShadowling
-  - ToyFigurineSith
-  - ToyFigurineJediNt
-  - ToyFigurineMSP
-  - ToyFigurineOSP
-  - ToyFigurineESP
-  - ToyFigurineHOSP
-  #
   - FlowerWreath
   - Hairflower
   - Headphones
@@ -37,6 +17,7 @@
   - CigPackBlack
   - CigarCase
   - CigarGold
+  # Stories-Start
   # - ClothingNeckLGBTPin
   # - ClothingNeckAromanticPin
   # - ClothingNeckAsexualPin
@@ -49,7 +30,7 @@
   # - ClothingNeckTransPin
   # - ClothingNeckAutismPin
   # - ClothingNeckGoldAutismPin
-  # Stories - end
+  # Stories-End
   - TowelColorBlack
   - TowelColorDarkBlue
   - TowelColorDarkGreen
@@ -66,6 +47,26 @@
   - TowelColorSilver
   - TowelColorWhite
   - TowelColorYellow
+  # Stories-Partners-Start
+  - StoriesFlippoEngravedLighter
+  - WristwatchSilver
+  - StoriesWristwatchGold
+  - ClothingNeckCloakCollector
+  - ClothingNeckCloakAnomalist
+  - ClothingNeckCloakSnake
+  - ToyFigurineColossus
+  - ToyFigurineAshDragon
+  - ToyFigurineBubblegum
+  - ClothingNeckElectrospheres
+  - ToyFigurineShadowling
+  - ToyFigurineAscendedShadowling
+  - ToyFigurineSith
+  - ToyFigurineJediNt
+  - ToyFigurineMSP
+  - ToyFigurineOSP
+  - ToyFigurineESP
+  - ToyFigurineHOSP
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: Glasses
@@ -141,35 +142,36 @@
   id: CaptainBackpack
   name: loadout-group-captain-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - CaptainBackpack
+  - CaptainSatchel
+  - CaptainDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - CaptainBackpack
-  - CaptainSatchel
-  - CaptainDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: CaptainOuterClothing
@@ -204,36 +206,37 @@
   id: HoPBackpack
   name: loadout-group-hop-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - CommonBackpack
+  - CommonSatchel
+  - CommonDuffel
+  - HoPBackpackIan
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - CommonBackpack
-  - CommonSatchel
-  - CommonDuffel
-  - HoPBackpackIan
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: HoPOuterClothing
@@ -270,35 +273,36 @@
   id: CommonBackpack
   name: loadout-group-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - CommonBackpack
+  - CommonSatchel
+  - CommonDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - CommonBackpack
-  - CommonSatchel
-  - CommonDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: PassengerNeck
@@ -508,35 +512,36 @@
   id: BotanistBackpack
   name: loadout-group-botanist-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - BotanistBackpack
+  - BotanistSatchel
+  - BotanistDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - BotanistBackpack
-  - BotanistSatchel
-  - BotanistDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: BotanistOuterClothing
@@ -567,35 +572,36 @@
   id: ClownBackpack
   name: loadout-group-clown-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - ClownBackpack
+  - ClownSatchel
+  - ClownDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - ClownBackpack
-  - ClownSatchel
-  - ClownDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: ClownOuterClothing
@@ -650,35 +656,36 @@
   id: MimeBackpack
   name: loadout-group-mime-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - MimeBackpack
+  - MimeSatchel
+  - MimeDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - MimeBackpack
-  - MimeSatchel
-  - MimeDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: MimeOuterClothing
@@ -812,35 +819,36 @@
   id: CargoTechnicianBackpack
   name: loadout-group-cargo-technician-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - CargoTechnicianBackpack
+  - CargoTechnicianSatchel
+  - CargoTechnicianDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - CargoTechnicianBackpack
-  - CargoTechnicianSatchel
-  - CargoTechnicianDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: CargoTechnicianOuterClothing
@@ -860,35 +868,36 @@
   id: SalvageSpecialistBackpack
   name: loadout-group-salvage-specialist-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - SalvageSpecialistBackpack
+  - SalvageSpecialistSatchel
+  - SalvageSpecialistDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - SalvageSpecialistBackpack
-  - SalvageSpecialistSatchel
-  - SalvageSpecialistDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: SalvageSpecialistOuterClothing
@@ -974,35 +983,36 @@
   id: StationEngineerBackpack
   name: loadout-group-station-engineer-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - StationEngineerBackpack
+  - StationEngineerSatchel
+  - StationEngineerDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - StationEngineerBackpack
-  - StationEngineerSatchel
-  - StationEngineerDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: StationEngineerOuterClothing
@@ -1045,35 +1055,36 @@
   id: AtmosphericTechnicianBackpack
   name: loadout-group-atmospheric-technician-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - AtmosphericTechnicianBackpack
+  - AtmosphericTechnicianSatchel
+  - AtmosphericTechnicianDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - AtmosphericTechnicianBackpack
-  - AtmosphericTechnicianSatchel
-  - AtmosphericTechnicianDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: AtmosphericTechnicianShoes
@@ -1161,35 +1172,36 @@
   id: ScientistBackpack
   name: loadout-group-scientist-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - ScientistBackpack
+  - ScientistSatchel
+  - ScientistDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - ScientistBackpack
-  - ScientistSatchel
-  - ScientistDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: ScientistOuterClothing
@@ -1317,35 +1329,36 @@
   id: SecurityBackpack
   name: loadout-group-security-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - SecurityBackpack
+  - SecuritySatchel
+  - SecurityDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - SecurityBackpack
-  - SecuritySatchel
-  - SecurityDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: SecurityBelt
@@ -1516,35 +1529,36 @@
   id: MedicalBackpack
   name: loadout-group-medical-doctor-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - MedicalDoctorBackpack
+  - MedicalDoctorSatchel
+  - MedicalDoctorDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - MedicalDoctorBackpack
-  - MedicalDoctorSatchel
-  - MedicalDoctorDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: MedicalShoes
@@ -1602,35 +1616,36 @@
   id: ChemistBackpack
   name: loadout-group-chemist-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - ChemistBackpack
+  - ChemistSatchel
+  - ChemistDuffel
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - ChemistBackpack
-  - ChemistSatchel
-  - ChemistDuffel
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: ParamedicHead
diff --git a/Resources/Prototypes/_Stories/Loadouts/jedint_loadouts.yml b/Resources/Prototypes/_Stories/Loadouts/jedint_loadouts.yml
index 318eed6a25..79ca433a2f 100644
--- a/Resources/Prototypes/_Stories/Loadouts/jedint_loadouts.yml
+++ b/Resources/Prototypes/_Stories/Loadouts/jedint_loadouts.yml
@@ -19,23 +19,29 @@
   name: loadout-group-Jedi-head
   minLimit: 0
   loadouts:
+  # Stories-Partners-Start
   - ClothingHeadHatExe
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: JediNtMask
   name: loadout-group-Jedi-mask
   minLimit: 0
   loadouts:
+  # Stories-Partners-Start
   - ClothingMaskGasExe
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: JediNtShoes
   name: loadout-group-Jedi-shoes
   loadouts:
-  - ClothingShoesBootsExe
-  - ClothingShoesBootsJackJediNomad
   - ClothingShoesBootsJackJediNt
+  # Stories-Partners-Start
   - ClothingShoesBootsJackJedi
+  - ClothingShoesBootsJackJediNomad
+  - ClothingShoesBootsExe
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: JediNtBelt
@@ -50,8 +56,10 @@
   name: loadout-group-Jedi-neck
   minLimit: 0
   loadouts:
-  - ClothingNeckCloakExe
+  # Stories-Partners-Start
   - ClothingNeckMantleJediNt
+  # Stories-Partners-End
+  - ClothingNeckCloakExe
   - ClothingNeckMantleJediNomad
 
 - type: loadoutGroup
@@ -59,63 +67,70 @@
   name: loadout-group-Jedi-jumpsuits
   minLimit: 1
   loadouts:
-  - ClothingUniformJumpsuitExe
-  - ClothingUniformJumpsuitJediNomad
   - ClothingUniformJumpsuitJediNt
+  # Stories-Partners-Start
   - ClothingUniformJumpsuitJedi
+  - ClothingUniformJumpsuitJediNomad
+  - ClothingUniformJumpsuitExe
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: JediNtBackpack
   name: loadout-group-Jedi-backpack
   loadouts:
-  # Stories-partners - start
-  # Handbag
+  - ClothingBackpackJediNt
+  - ClothingBackpackSatchelJediNt
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
-  - ClothingBackpackJediNt
-  - ClothingBackpackSatchelJediNt
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: JediNtOuterClothing
   name: loadout-group-Jedi-outer-clothing
   minLimit: 0
   loadouts:
-  - ClothingOuterVestArmorExe
   - ClothingOuterVestJediNt
+  # Stories-Partners-Start
   - ClothingOuterCoatJedi
+  - ClothingOuterVestArmorExe
+  # Stories-Partners-End
 
 - type: loadoutGroup
   id: JediNtLightsaber
   name: loadout-group-Jedi-lightsaber
   minLimit: 1
   loadouts:
-  - LightsaberCrossguard
+  - Lightsaber
+  # Stories-Partners-Start
+  - LightsaberShort
   - LightsaberDouble
+  - LightsaberCrossguard
   - LightsaberRapier
-  - LightsaberShort
-  - Lightsaber
+  # Stories-Partners-End
 
 # Маска хранителя
 
diff --git a/Resources/Prototypes/_Stories/Loadouts/prison_loadouts.yml b/Resources/Prototypes/_Stories/Loadouts/prison_loadouts.yml
index ae683494c5..11ef2575f2 100644
--- a/Resources/Prototypes/_Stories/Loadouts/prison_loadouts.yml
+++ b/Resources/Prototypes/_Stories/Loadouts/prison_loadouts.yml
@@ -117,32 +117,33 @@
   - PRISONBackpack
   - PRISONSatchel
   - PRISONDuffel
-  # Stories-partners - start
-  # Handbag
+  # Stories-Partners-Start
+  # Adidos
   - ClothingBackpackHandbagAdidos
-  - ClothingBackpackHandbagBluesky
-  - ClothingBackpackHandbagEight
-  - ClothingBackpackHandbagGachi
-  - ClothingBackpackHandbagRl
-  # Backpack
   - ClothingBackpackAdidos
-  - ClothingBackpackBluesky
-  - ClothingBackpackEight
-  - ClothingBackpackGachi
-  - ClothingBackpackRl
-  # Duffel
   - ClothingBackpackDuffelAdidos
-  - ClothingBackpackDuffelBluesky
-  - ClothingBackpackDuffelEight
-  - ClothingBackpackDuffelGachi
-  - ClothingBackpackDuffelRl
-  # Satchel
   - ClothingBackpackSatchelAdidos
+  # Bluesky
+  - ClothingBackpackHandbagBluesky
+  - ClothingBackpackBluesky
+  - ClothingBackpackDuffelBluesky
   - ClothingBackpackSatchelBluesky
+  # Eight
+  - ClothingBackpackHandbagEight
+  - ClothingBackpackEight
+  - ClothingBackpackDuffelEight
   - ClothingBackpackSatchelEight
+  # Gachi
+  - ClothingBackpackHandbagGachi
+  - ClothingBackpackGachi
+  - ClothingBackpackDuffelGachi
   - ClothingBackpackSatchelGachi
+  # Rl
+  - ClothingBackpackHandbagRl
+  - ClothingBackpackRl
+  - ClothingBackpackDuffelRl
   - ClothingBackpackSatchelRl
-  # Stories-partners - end
+  # Stories-Partners-End
 
 - type: loadout
   id: PRISONDuffel