Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)

*

Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs

@@ -0,0 +1,72 @@
+using System.Linq;
+using Content.Shared.Roles;
+using Content.Server.Storage.EntitySystems;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Collections;
+
+namespace Content.IntegrationTests.Tests.Roles;
+
+[TestFixture]
+public sealed class StartingGearPrototypeStorageTest
+{
+    /// <summary>
+    /// Checks that a storage fill on a StartingGearPrototype will properly fill
+    /// </summary>
+    [Test]
+    public async Task TestStartingGearStorage()
+    {
+        var settings = new PoolSettings { Connected = true, Dirty = true };
+        await using var pair = await PoolManager.GetServerClient(settings);
+        var server = pair.Server;
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var storageSystem = server.System<StorageSystem>();
+
+        var protos = server.ProtoMan
+            .EnumeratePrototypes<StartingGearPrototype>()
+            .Where(p => !p.Abstract)
+            .ToList()
+            .OrderBy(p => p.ID);
+
+        var testMap = await pair.CreateTestMap();
+        var coords = testMap.GridCoords;
+
+        await server.WaitAssertion(() =>
+        {
+            foreach (var gearProto in protos)
+            {
+                var backpackProto = gearProto.GetGear("back");
+                if (backpackProto == string.Empty)
+                    continue;
+
+                var bag = server.EntMan.SpawnEntity(backpackProto, coords);
+                var ents = new ValueList<EntityUid>();
+
+                foreach (var (slot, entProtos) in gearProto.Storage)
+                {
+                    if (entProtos.Count == 0)
+                        continue;
+
+                    foreach (var ent in entProtos)
+                    {
+                        ents.Add(server.EntMan.SpawnEntity(ent, coords));
+                    }
+
+                    foreach (var ent in ents)
+                    {
+                        if (!storageSystem.CanInsert(bag, ent, out _))
+                            Assert.Fail($"StartingGearPrototype {gearProto.ID} could not successfully put items into storage {bag.Id}");
+
+                        server.EntMan.DeleteEntity(ent);
+                    }
+                }
+
+                server.EntMan.DeleteEntity(bag);
+            }
+
+            mapManager.DeleteMap(testMap.MapId);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}

Content.Server/Station/Systems/StationSpawningSystem.cs

@@ -179,13 +179,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
             profile = HumanoidCharacterProfile.RandomWithSpecies(speciesId);
         }
 
-        if (prototype?.StartingGear != null)
-        {
-            var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
-            EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
-        }
-
-        // Run loadouts after so stuff like storage loadouts can get
         var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID);
 
         if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto))
@@ -203,6 +196,12 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
             EquipRoleLoadout(entity.Value, loadout, roleProto);
         }
 
+        if (prototype?.StartingGear != null)
+        {
+            var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
+            EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
+        }
+
         var gearEquippedEv = new StartingGearEquippedEvent(entity.Value);
         RaiseLocalEvent(entity.Value, ref gearEquippedEv);
 
@@ -309,4 +308,4 @@ public sealed class PlayerSpawningEvent : EntityEventArgs
         HumanoidCharacterProfile = humanoidCharacterProfile;
         Station = station;
     }
-}
+}

Content.Shared/Roles/StartingGearPrototype.cs

@@ -1,30 +1,50 @@
-using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
-namespace Content.Shared.Roles
+namespace Content.Shared.Roles;
+
+[Prototype]
+public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype
 {
-    [Prototype("startingGear")]
-    public sealed partial class StartingGearPrototype : IPrototype
+    /// <inheritdoc/>
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = string.Empty;
+
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StartingGearPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    /// <inheritdoc/>
+    [AbstractDataField]
+    public bool Abstract { get; }
+
+    /// <summary>
+    /// The slot and entity prototype ID of the equipment that is to be spawned and equipped onto the entity.
+    /// </summary>
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, EntProtoId> Equipment = new();
+
+    /// <summary>
+    /// The inhand items that are equipped when this starting gear is equipped onto an entity.
+    /// </summary>
+    [DataField]
+    [AlwaysPushInheritance]
+    public List<EntProtoId> Inhand = new(0);
+
+    /// <summary>
+    /// Inserts entities into the specified slot's storage (if it does have storage).
+    /// </summary>
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, List<EntProtoId>> Storage = new();
+
+    /// <summary>
+    /// Gets the entity prototype ID of a slot in this starting gear.
+    /// </summary>
+    public string GetGear(string slot)
     {
-        [DataField]
-        public Dictionary<string, EntProtoId> Equipment = new();
-
-        [DataField]
-        public List<EntProtoId> Inhand = new(0);
-
-        /// <summary>
-        /// Inserts entities into the specified slot's storage (if it does have storage).
-        /// </summary>
-        [DataField]
-        public Dictionary<string, List<EntProtoId>> Storage = new();
-
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = string.Empty;
-
-        public string GetGear(string slot)
-        {
-            return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
-        }
+        return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
     }
 }

Content.Shared/Station/SharedStationSpawningSystem.cs

@@ -15,9 +15,9 @@ public abstract class SharedStationSpawningSystem : EntitySystem
 {
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly InventorySystem InventorySystem = default!;
-    [Dependency] private   readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private   readonly SharedStorageSystem _storage = default!;
-    [Dependency] private   readonly SharedTransformSystem _xformSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedStorageSystem _storage = default!;
+    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
     private EntityQuery<HandsComponent> _handsQuery;
     private EntityQuery<InventoryComponent> _inventoryQuery;
@@ -91,7 +91,7 @@ public abstract class SharedStationSpawningSystem : EntitySystem
                 if (!string.IsNullOrEmpty(equipmentStr))
                 {
                     var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, xform.Coordinates);
-                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force:true);
+                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force: true);
                 }
             }
         }
@@ -122,15 +122,15 @@ public abstract class SharedStationSpawningSystem : EntitySystem
                 if (entProtos.Count == 0)
                     continue;
 
-                foreach (var ent in entProtos)
-                {
-                    ents.Add(Spawn(ent, coords));
-                }
-
                 if (inventoryComp != null &&
                     InventorySystem.TryGetSlotEntity(entity, slot, out var slotEnt, inventoryComponent: inventoryComp) &&
                     _storageQuery.TryComp(slotEnt, out var storage))
                 {
+                    foreach (var ent in entProtos)
+                    {
+                        ents.Add(Spawn(ent, coords));
+                    }
+
                     foreach (var ent in ents)
                     {
                         _storage.Insert(slotEnt.Value, ent, out _, storageComp: storage, playSound: false);
@@ -145,4 +145,4 @@ public abstract class SharedStationSpawningSystem : EntitySystem
             RaiseLocalEvent(entity, ref ev);
         }
     }
-}
+}

Resources/Locale/en-US/preferences/loadout-groups.ftl

@@ -1,6 +1,7 @@
 # Miscellaneous
 loadout-group-trinkets = Trinkets
 loadout-group-glasses = Glasses
+loadout-group-backpack = Backpack
 
 # Command
 loadout-group-captain-head = Captain head
@@ -19,7 +20,6 @@ loadout-group-hop-outerclothing = Head of Personnel outer clothing
 loadout-group-passenger-jumpsuit = Passenger jumpsuit
 loadout-group-passenger-mask = Passenger mask
 loadout-group-passenger-gloves = Passenger gloves
-loadout-group-passenger-backpack = Passenger backpack
 loadout-group-passenger-outerclothing = Passenger outer clothing
 loadout-group-passenger-shoes = Passenger shoes
 
@@ -36,12 +36,10 @@ loadout-group-librarian-jumpsuit = Librarian jumpsuit
 
 loadout-group-lawyer-jumpsuit = Lawyer jumpsuit
 loadout-group-lawyer-neck = Lawyer neck
-loadout-group-lawyer-backpack = Lawyer backpack
 
 loadout-group-chaplain-head = Chaplain head
 loadout-group-chaplain-mask = Chaplain mask
 loadout-group-chaplain-jumpsuit = Chaplain jumpsuit
-loadout-group-chaplain-backpack = Chaplain backpack
 loadout-group-chaplain-outerclothing = Chaplain outer clothing
 loadout-group-chaplain-neck = Chaplain neck
 
@@ -67,13 +65,11 @@ loadout-group-mime-jumpsuit = Mime jumpsuit
 loadout-group-mime-backpack = Mime backpack
 loadout-group-mime-outerclothing = Mime outer clothing
 
-loadout-group-musician-backpack = Musician backpack
 loadout-group-musician-outerclothing = Musician outer clothing
 
 # Cargo
 loadout-group-quartermaster-head = Quartermaster head
 loadout-group-quartermaster-jumpsuit = Quartermaster jumpsuit
-loadout-group-quartermaster-backpack = Quartermaster backpack
 loadout-group-quartermaster-neck = Quartermaster neck
 loadout-group-quartermaster-outerclothing = Quartermaster outer clothing
 loadout-group-quartermaster-shoes = Quartermaster shoes
@@ -91,7 +87,6 @@ loadout-group-salvage-specialist-shoes = Salvage Specialist shoes
 # Engineering
 loadout-group-chief-engineer-head = Chief Engineer head
 loadout-group-chief-engineer-jumpsuit = Chief Engineer jumpsuit
-loadout-group-chief-engineer-backpack = Chief Engineer backpack
 loadout-group-chief-engineer-outerclothing = Chief Engineer outer clothing
 loadout-group-chief-engineer-neck = Chief Engineer neck
 loadout-group-chief-engineer-shoes = Chief Engineer shoes
@@ -114,7 +109,6 @@ loadout-group-atmospheric-technician-shoes = Atmospheric Technician shoes
 loadout-group-research-director-head = Research Director head
 loadout-group-research-director-neck = Research Director neck
 loadout-group-research-director-jumpsuit = Research Director jumpsuit
-loadout-group-research-director-backpack = Research Director backpack
 loadout-group-research-director-outerclothing = Research Director outer clothing
 loadout-group-research-director-shoes = Research Director shoes
 
@@ -150,7 +144,6 @@ loadout-group-security-id = Security ID
 loadout-group-detective-head = Detective head
 loadout-group-detective-neck = Detective neck
 loadout-group-detective-jumpsuit = Detective jumpsuit
-loadout-group-detective-backpack = Detective backpack
 loadout-group-detective-outerclothing = Detective outer clothing
 
 loadout-group-security-cadet-jumpsuit = Security cadet jumpsuit
@@ -162,7 +155,6 @@ loadout-group-medical-mask = Medical mask
 loadout-group-chief-medical-officer-head = Chief Medical Officer head
 loadout-group-chief-medical-officer-jumpsuit = Chief Medical Officer jumpsuit
 loadout-group-chief-medical-officer-outerclothing = Chief Medical Officer outer clothing
-loadout-group-chief-medical-officer-backpack = Chief Medical Officer backpack
 loadout-group-chief-medical-officer-shoes = Chief Medical Officer shoes
 loadout-group-chief-medical-officer-neck = Chief Medical Officer neck
 
@@ -183,7 +175,6 @@ loadout-group-paramedic-head = Paramedic head
 loadout-group-paramedic-jumpsuit = Paramedic jumpsuit
 loadout-group-paramedic-outerclothing = Paramedic outer clothing
 loadout-group-paramedic-shoes = Paramedic shoes
-loadout-group-paramedic-backpack = Paramedic backpack
 
 # Wildcards
 loadout-group-reporter-jumpsuit = Reporter jumpsuit

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -1,422 +0,0 @@
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackFilled
-  noSpawn: true
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackClown
-  id: ClothingBackpackClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-      - id: CrayonRainbow
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCaptain
-  id: ClothingBackpackCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackIan
-  id: ClothingBackpackHOPIanFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackAtmospherics
-  id: ClothingBackpackAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHydroponics
-  id: ClothingBackpackHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMime
-  id: ClothingBackpackMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackChemistry
-  id: ClothingBackpackChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-  
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-      - id: BoxForensicPad
-
-# ERT
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTLeader
-  id: ClothingBackpackERTLeaderFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazineMagnum
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackERTSecurityFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTMedical
-  id: ClothingBackpackERTMedicalFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: Hypospray
-        - id: MedkitAdvancedFilled
-        - id: CrowbarRed
-        - id: OmnizineChemistryBottle
-        - id: EpinephrineChemistryBottle
-        - id: EpinephrineChemistryBottle
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTEngineer
-  id: ClothingBackpackERTEngineerFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: trayScanner
-        - id: RCD
-        - id: RCDAmmo
-          amount: 2
-        - id: CableMVStack
-        - id: CableHVStack
-        - id: CableApcStack
-        - id: SheetPlasteel
-        - id: SheetSteel
-        - id: SheetGlass
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTJanitor
-  id: ClothingBackpackERTJanitorFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: LightReplacer
-        - id: BoxLightMixed
-        - id: BoxLightMixed
-        - id: Soap
-        - id: CrowbarRed
-        - id: AdvMopItem
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTChaplain
-  id: ClothingBackpackERTChaplainFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: BoxCandle
-        - id: BoxBodyBag
-        - id: DrinkWaterMelonJuiceJug
-        - id: Lantern
-        - id: Lantern
-        - id: Bible
-        - id: CrowbarRed
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: Lighter
-
-# Death Squad
-
-- type: entity
-  noSpawn: false
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackDeathSquadFilled
-  name: death squad backpack
-  description: Holds the kit of CentComm's most feared agents.
-  components:
-    - type: Storage
-      grid:
-      - 0,0,7,6
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponPulseRifle
-        - id: WeaponPulsePistol
-        - id: WeaponRevolverMateba
-        - id: SpeedLoaderMagnumAP
-        - id: SpeedLoaderMagnumAP
-        - id: BoxFlashbang
-        - id: ToolDebug # spanish army knife
-        - id: WelderExperimental
-        - id: Hypospray
-        - id: DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
-        - id: FreedomImplanter
-
-# Cargo
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSalvage
-  id: ClothingBackpackSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-# Pirate
-
-- type: entity
-  parent: ClothingBackpackSatchelLeather
-  id: ClothingBackpackPirateFilled
-  suffix: Filled, Pirate
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: Cutlass
-        - id: WeaponRevolverPirate
-        - id: ClothingEyesEyepatch

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml

@@ -1,275 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelClown
-  id: ClothingBackpackDuffelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCaptain
-  id: ClothingBackpackDuffelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelAtmospherics
-  id: ClothingBackpackDuffelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelHydroponics
-  id: ClothingBackpackDuffelHydroponicsFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMime
-  id: ClothingBackpackDuffelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelChemistry
-  id: ClothingBackpackDuffelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-  
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: BoxForensicPad
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSalvage
-  id: ClothingBackpackDuffelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -1,300 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelTools
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Crowbar
-      - id: Wrench
-      - id: Screwdriver
-      - id: Wirecutter
-      - id: Welder
-      - id: Multitool
-
-- type: entity
-  parent: ClothingBackpackSatchelClown
-  id: ClothingBackpackSatchelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCaptain
-  id: ClothingBackpackSatchelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelAtmospherics
-  id: ClothingBackpackSatchelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHydroponics
-  id: ClothingBackpackSatchelHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelChemistry
-  id: ClothingBackpackSatchelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: BoxForensicPad
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSalvage
-  id: ClothingBackpackSatchelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMime
-  id: ClothingBackpackSatchelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHolding
-  id: ClothingBackpackSatchelHoldingAdmin
-  components:
-  - type: StorageFill
-    contents:
-    - id: GasAnalyzer
-    - id: trayScanner
-    - id: AccessConfiguratorUniversal
-  - type: Unremoveable

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -13,23 +13,6 @@
       - id: Retractor
       - id: Scalpel
 
-- type: entity
-  id: ClothingBackpackDuffelCBURNFilled
-  parent: ClothingBackpackDuffelCBURN
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-    - id: BoxSurvivalEngineering
-    - id: WeaponShotgunDoubleBarreled
-    - id: BoxShotgunIncendiary
-      amount: 2
-    - id: GrenadeFlashBang
-      amount: 2
-    - id: PillAmbuzolPlus
-    - id: PillAmbuzol
-      amount: 4
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateFilledMedical
@@ -320,38 +303,6 @@
       - id: PillAmbuzol
         amount: 3
 
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateOperative
-  name: operative duffelbag
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSyndicate
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: DeathAcidifierImplanter
-
-
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateMedicalBundle
-  id: ClothingBackpackDuffelSyndicateOperativeMedic
-  name: operative medic duffelbag
-  description: A large duffel bag for holding extra medical supplies.
-  components:
-  - type: StorageFill
-    contents:
-      - id: SyndiHypo
-      - id: BoxSurvivalSyndicate
-      - id: SawAdvanced
-      - id: Cautery
-      - id: CombatKnife
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: HandheldHealthAnalyzer
-      - id: CombatMedipen
-      - id: DeathAcidifierImplanter
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateMedicalBundleFilled

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

@@ -257,6 +257,16 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertchaplain.rsi
 
+- type: entity
+  parent: ClothingBackpackERTSecurity
+  id: ClothingBackpackDeathSquad
+  name: death squad backpack
+  description: Holds the kit of CentComm's most feared agents.
+  components:
+    - type: Storage
+      grid:
+      - 0,0,7,6
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack

Resources/Prototypes/Entities/Mobs/NPCs/human.yml

@@ -7,7 +7,7 @@
   - type: InputMover
   - type: MobMover
   - type: Loadout
-    prototypes: [PassengerGear]
+    prototypes: [LimitedPassengerGear]
   - type: NpcFactionMember
     factions:
     - NanoTrasen

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

@@ -35,7 +35,7 @@
 - type: startingGear
   id: CargoTechnicianBackpack
   equipment:
-    back: ClothingBackpackCargoFilled
+    back: ClothingBackpackCargo
 
 - type: loadout
   id: CargoTechnicianSatchel
@@ -44,7 +44,7 @@
 - type: startingGear
   id: CargoTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelCargoFilled
+    back: ClothingBackpackSatchelCargo
 
 - type: loadout
   id: CargoTechnicianDuffel
@@ -53,7 +53,7 @@
 - type: startingGear
   id: CargoTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelCargoFilled
+    back: ClothingBackpackDuffelCargo
 
 # OuterClothing
 - type: loadout

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

@@ -82,34 +82,6 @@
   equipment:
     neck: ClothingNeckMantleQM
 
-# Back
-- type: loadout
-  id: QuartermasterBackpack
-  equipment: QuartermasterBackpack
-
-- type: startingGear
-  id: QuartermasterBackpack
-  equipment:
-    back: ClothingBackpackQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterSatchel
-  equipment: QuartermasterSatchel
-
-- type: startingGear
-  id: QuartermasterSatchel
-  equipment:
-    back: ClothingBackpackSatchelQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterDuffel
-  equipment: QuartermasterDuffel
-
-- type: startingGear
-  id: QuartermasterDuffel
-  equipment:
-    back: ClothingBackpackDuffelQuartermasterFilled
-
 # OuterClothing
 - type: loadout
   id: QuartermasterWintercoat

Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -6,7 +6,7 @@
 - type: startingGear
   id: SalvageSpecialistBackpack
   equipment:
-    back: ClothingBackpackSalvageFilled
+    back: ClothingBackpackSalvage
 
 - type: loadout
   id: SalvageSpecialistSatchel
@@ -15,7 +15,7 @@
 - type: startingGear
   id: SalvageSpecialistSatchel
   equipment:
-    back: ClothingBackpackSatchelSalvageFilled
+    back: ClothingBackpackSatchelSalvage
 
 - type: loadout
   id: SalvageSpecialistDuffel
@@ -24,7 +24,7 @@
 - type: startingGear
   id: SalvageSpecialistDuffel
   equipment:
-    back: ClothingBackpackDuffelSalvageFilled
+    back: ClothingBackpackDuffelSalvage
 
 # OuterClothing
 - type: loadout

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

@@ -53,7 +53,7 @@
 - type: startingGear
   id: BotanistBackpack
   equipment:
-    back: ClothingBackpackHydroponicsFilled
+    back: ClothingBackpackHydroponics
 
 - type: loadout
   id: BotanistSatchel
@@ -62,7 +62,7 @@
 - type: startingGear
   id: BotanistSatchel
   equipment:
-    back: ClothingBackpackSatchelHydroponicsFilled
+    back: ClothingBackpackSatchelHydroponics
 
 - type: loadout
   id: BotanistDuffel
@@ -71,7 +71,7 @@
 - type: startingGear
   id: BotanistDuffel
   equipment:
-    back: ClothingBackpackDuffelHydroponicsFilled
+    back: ClothingBackpackDuffelHydroponics
 
 # Outer clothing
 - type: loadout

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

@@ -91,34 +91,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitMonasticRobeLight
 
-# Back
-- type: loadout
-  id: ChaplainBackpack
-  equipment: ChaplainBackpack
-
-- type: startingGear
-  id: ChaplainBackpack
-  equipment:
-    back: ClothingBackpackChaplainFilled
-
-- type: loadout
-  id: ChaplainSatchel
-  equipment: ChaplainSatchel
-
-- type: startingGear
-  id: ChaplainSatchel
-  equipment:
-    back: ClothingBackpackSatchelChaplainFilled
-
-- type: loadout
-  id: ChaplainDuffel
-  equipment: ChaplainDuffel
-
-- type: startingGear
-  id: ChaplainDuffel
-  equipment:
-    back: ClothingBackpackDuffelChaplainFilled
-
 # Neck
 - type: loadout
   id: ChaplainNeck

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

@@ -35,7 +35,7 @@
 - type: startingGear
   id: ClownBackpack
   equipment:
-    back: ClothingBackpackClownFilled
+    back: ClothingBackpackClown
 
 - type: loadout
   id: ClownSatchel
@@ -44,7 +44,7 @@
 - type: startingGear
   id: ClownSatchel
   equipment:
-    back: ClothingBackpackSatchelClownFilled
+    back: ClothingBackpackSatchelClown
 
 - type: loadout
   id: ClownDuffel
@@ -53,7 +53,7 @@
 - type: startingGear
   id: ClownDuffel
   equipment:
-    back: ClothingBackpackDuffelClownFilled
+    back: ClothingBackpackDuffelClown
 
 # Shoes
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml

@@ -97,32 +97,4 @@
 - type: startingGear
   id: LawyerNeck
   equipment:
-    neck: ClothingNeckLawyerbadge
-
-# Backpack
-- type: loadout
-  id: LawyerBackpack
-  equipment: LawyerBackpack
-
-- type: startingGear
-  id: LawyerBackpack
-  equipment:
-    back: ClothingBackpackLawyerFilled
-
-- type: loadout
-  id: LawyerSatchel
-  equipment: LawyerSatchel
-
-- type: startingGear
-  id: LawyerSatchel
-  equipment:
-    back: ClothingBackpackSatchelLawyerFilled
-
-- type: loadout
-  id: LawyerDuffel
-  equipment: LawyerDuffel
-
-- type: startingGear
-  id: LawyerDuffel
-  equipment:
-    back: ClothingBackpackDuffelLawyerFilled
+    neck: ClothingNeckLawyerbadge

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

@@ -81,7 +81,7 @@
 - type: startingGear
   id: MimeBackpack
   equipment:
-    back: ClothingBackpackMimeFilled
+    back: ClothingBackpackMime
 
 - type: loadout
   id: MimeSatchel
@@ -90,7 +90,7 @@
 - type: startingGear
   id: MimeSatchel
   equipment:
-    back: ClothingBackpackSatchelMimeFilled
+    back: ClothingBackpackSatchelMime
 
 - type: loadout
   id: MimeDuffel
@@ -99,7 +99,7 @@
 - type: startingGear
   id: MimeDuffel
   equipment:
-    back: ClothingBackpackDuffelMimeFilled
+    back: ClothingBackpackDuffelMime
 
 # Outerclothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml

@@ -1,31 +1,3 @@
-# Back
-- type: loadout
-  id: MusicianBackpack
-  equipment: MusicianBackpack
-
-- type: startingGear
-  id: MusicianBackpack
-  equipment:
-    back: ClothingBackpackMusicianFilled
-
-- type: loadout
-  id: MusicianSatchel
-  equipment: MusicianSatchel
-
-- type: startingGear
-  id: MusicianSatchel
-  equipment:
-    back: ClothingBackpackSatchelMusicianFilled
-
-- type: loadout
-  id: MusicianDuffel
-  equipment: MusicianDuffel
-
-- type: startingGear
-  id: MusicianDuffel
-  equipment:
-    back: ClothingBackpackDuffelMusicianFilled
-
 # Outerclothing
 - type: loadout
   id: MusicianWintercoat

Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml

@@ -75,7 +75,7 @@
 - type: startingGear
   id: CommonBackpack
   equipment:
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
 
 - type: loadout
   id: CommonSatchel
@@ -84,7 +84,7 @@
 - type: startingGear
   id: CommonSatchel
   equipment:
-    back: ClothingBackpackSatchelFilled
+    back: ClothingBackpackSatchel
 
 - type: loadout
   id: CommonDuffel
@@ -93,7 +93,7 @@
 - type: startingGear
   id: CommonDuffel
   equipment:
-    back: ClothingBackpackDuffelFilled
+    back: ClothingBackpackDuffel
 
 # Gloves
 - type: loadout

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

@@ -90,7 +90,7 @@
 - type: startingGear
   id: CaptainBackpack
   equipment:
-    back: ClothingBackpackCaptainFilled
+    back: ClothingBackpackCaptain
 
 - type: loadout
   id: CaptainSatchel
@@ -99,7 +99,7 @@
 - type: startingGear
   id: CaptainSatchel
   equipment:
-    back: ClothingBackpackSatchelCaptainFilled
+    back: ClothingBackpackSatchelCaptain
 
 - type: loadout
   id: CaptainDuffel
@@ -108,7 +108,7 @@
 - type: startingGear
   id: CaptainDuffel
   equipment:
-    back: ClothingBackpackDuffelCaptainFilled
+    back: ClothingBackpackDuffelCaptain
 
 # Outer clothing
 - type: loadout

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

@@ -57,33 +57,6 @@
     neck: ClothingNeckMantleHOP
 
 # Back
-- type: loadout
-  id: HoPBackpack
-  equipment: HoPBackpack
-
-- type: startingGear
-  id: HoPBackpack
-  equipment:
-    back: ClothingBackpackHOPFilled
-
-- type: loadout
-  id: HoPSatchel
-  equipment: HoPSatchel
-
-- type: startingGear
-  id: HoPSatchel
-  equipment:
-    back: ClothingBackpackSatchelHOPFilled
-
-- type: loadout
-  id: HoPDuffel
-  equipment: HoPDuffel
-
-- type: startingGear
-  id: HoPDuffel
-  equipment:
-    back: ClothingBackpackDuffelHOPFilled
-
 - type: loadout
   id: HoPBackpackIan
   equipment: HoPBackpackIan
@@ -94,7 +67,7 @@
 - type: startingGear
   id: HoPBackpackIan
   equipment:
-    back: ClothingBackpackHOPIanFilled
+    back: ClothingBackpackIan
 
 # Outerclothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml

@@ -34,7 +34,7 @@
 - type: startingGear
   id: AtmosphericTechnicianBackpack
   equipment:
-    back: ClothingBackpackAtmosphericsFilled
+    back: ClothingBackpackAtmospherics
 
 - type: loadout
   id: AtmosphericTechnicianSatchel
@@ -43,7 +43,7 @@
 - type: startingGear
   id: AtmosphericTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelAtmosphericsFilled
+    back: ClothingBackpackSatchelAtmospherics
 
 - type: loadout
   id: AtmosphericTechnicianDuffel
@@ -52,7 +52,7 @@
 - type: startingGear
   id: AtmosphericTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelAtmosphericsFilled
+    back: ClothingBackpackDuffelAtmospherics
 
 # OuterClothing
 - type: loadout

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

@@ -68,34 +68,6 @@
   equipment:
     neck: ClothingNeckMantleCE
 
-# Back
-- type: loadout
-  id: ChiefEngineerBackpack
-  equipment: ChiefEngineerBackpack
-
-- type: startingGear
-  id: ChiefEngineerBackpack
-  equipment:
-    back: ClothingBackpackChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerSatchel
-  equipment: ChiefEngineerSatchel
-
-- type: startingGear
-  id: ChiefEngineerSatchel
-  equipment:
-    back: ClothingBackpackSatchelChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerDuffel
-  equipment: ChiefEngineerDuffel
-
-- type: startingGear
-  id: ChiefEngineerDuffel
-  equipment:
-    back: ClothingBackpackDuffelChiefEngineerFilled
-
 # OuterClothing
 - type: loadout
   id: ChiefEngineerWintercoat

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

@@ -118,7 +118,7 @@
 - type: startingGear
   id: StationEngineerBackpack
   equipment:
-    back: ClothingBackpackEngineeringFilled
+    back: ClothingBackpackEngineering
 
 - type: loadout
   id: StationEngineerSatchel
@@ -127,7 +127,7 @@
 - type: startingGear
   id: StationEngineerSatchel
   equipment:
-    back: ClothingBackpackSatchelEngineeringFilled
+    back: ClothingBackpackSatchelEngineering
 
 - type: loadout
   id: StationEngineerDuffel
@@ -136,7 +136,7 @@
 - type: startingGear
   id: StationEngineerDuffel
   equipment:
-    back: ClothingBackpackDuffelEngineeringFilled
+    back: ClothingBackpackDuffelEngineering
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml

@@ -25,7 +25,7 @@
 - type: startingGear
   id: ChemistBackpack
   equipment:
-    back: ClothingBackpackChemistryFilled
+    back: ClothingBackpackChemistry
 
 - type: loadout
   id: ChemistSatchel
@@ -34,7 +34,7 @@
 - type: startingGear
   id: ChemistSatchel
   equipment:
-    back: ClothingBackpackSatchelChemistryFilled
+    back: ClothingBackpackSatchelChemistry
 
 - type: loadout
   id: ChemistDuffel
@@ -43,7 +43,7 @@
 - type: startingGear
   id: ChemistDuffel
   equipment:
-    back: ClothingBackpackDuffelChemistryFilled
+    back: ClothingBackpackDuffelChemistry
 
 # Outer clothing
 - type: loadout

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

@@ -73,34 +73,6 @@
   equipment:
     neck: ClothingNeckMantleCMO
 
-# Back
-- type: loadout
-  id: ChiefMedicalOfficerBackpack
-  equipment: ChiefMedicalOfficerBackpack
-
-- type: startingGear
-  id: ChiefMedicalOfficerBackpack
-  equipment:
-    back: ClothingBackpackCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerSatchel
-  equipment: ChiefMedicalOfficerSatchel
-
-- type: startingGear
-  id: ChiefMedicalOfficerSatchel
-  equipment:
-    back: ClothingBackpackSatchelCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerDuffel
-  equipment: ChiefMedicalOfficerDuffel
-
-- type: startingGear
-  id: ChiefMedicalOfficerDuffel
-  equipment:
-    back: ClothingBackpackDuffelCMOFilled
-
 # Outer clothing
 - type: loadout
   id: ChiefMedicalOfficerLabCoat

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

@@ -178,7 +178,7 @@
 - type: startingGear
   id: MedicalDoctorBackpack
   equipment:
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackMedical
 
 - type: loadout
   id: MedicalDoctorSatchel
@@ -187,7 +187,7 @@
 - type: startingGear
   id: MedicalDoctorSatchel
   equipment:
-    back: ClothingBackpackSatchelMedicalFilled
+    back: ClothingBackpackSatchelMedical
 
 - type: loadout
   id: MedicalDoctorDuffel
@@ -196,7 +196,7 @@
 - type: startingGear
   id: MedicalDoctorDuffel
   equipment:
-    back: ClothingBackpackDuffelMedicalFilled
+    back: ClothingBackpackDuffelMedical
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

@@ -27,34 +27,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtParamedic
 
-# Back
-- type: loadout
-  id: ParamedicBackpack
-  equipment: ParamedicBackpack
-
-- type: startingGear
-  id: ParamedicBackpack
-  equipment:
-    back: ClothingBackpackParamedicFilled
-
-- type: loadout
-  id: ParamedicSatchel
-  equipment: ParamedicSatchel
-
-- type: startingGear
-  id: ParamedicSatchel
-  equipment:
-    back: ClothingBackpackSatchelParamedicFilled
-
-- type: loadout
-  id: ParamedicDuffel
-  equipment: ParamedicDuffel
-
-- type: startingGear
-  id: ParamedicDuffel
-  equipment:
-    back: ClothingBackpackDuffelParamedicFilled
-
 # Outer clothing
 - type: loadout
   id: ParamedicWindbreaker

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

@@ -43,34 +43,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtResearchDirector
 
-# Back
-- type: loadout
-  id: ResearchDirectorBackpack
-  equipment: ResearchDirectorBackpack
-
-- type: startingGear
-  id: ResearchDirectorBackpack
-  equipment:
-    back: ClothingBackpackResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorSatchel
-  equipment: ResearchDirectorSatchel
-
-- type: startingGear
-  id: ResearchDirectorSatchel
-  equipment:
-    back: ClothingBackpackSatchelResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorDuffel
-  equipment: ResearchDirectorDuffel
-
-- type: startingGear
-  id: ResearchDirectorDuffel
-  equipment:
-    back: ClothingBackpackDuffelResearchDirectorFilled
-
 # OuterClothing
 - type: loadout
   id: ResearchDirectorLabCoat

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

@@ -120,7 +120,7 @@
 - type: startingGear
   id: ScientistBackpack
   equipment:
-    back: ClothingBackpackScienceFilled
+    back: ClothingBackpackScience
 
 - type: loadout
   id: ScientistSatchel
@@ -129,7 +129,7 @@
 - type: startingGear
   id: ScientistSatchel
   equipment:
-    back: ClothingBackpackSatchelScienceFilled
+    back: ClothingBackpackSatchelScience
 
 - type: loadout
   id: ScientistDuffel
@@ -138,7 +138,7 @@
 - type: startingGear
   id: ScientistDuffel
   equipment:
-    back: ClothingBackpackDuffelScienceFilled
+    back: ClothingBackpackDuffelScience
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

@@ -64,34 +64,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetectiveGrey
 
-# Back
-- type: loadout
-  id: DetectiveBackpack
-  equipment: DetectiveBackpack
-
-- type: startingGear
-  id: DetectiveBackpack
-  equipment:
-    back: ClothingBackpackSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveSatchel
-  equipment: DetectiveSatchel
-
-- type: startingGear
-  id: DetectiveSatchel
-  equipment:
-    back: ClothingBackpackSatchelSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveDuffel
-  equipment: DetectiveDuffel
-
-- type: startingGear
-  id: DetectiveDuffel
-  equipment:
-    back: ClothingBackpackDuffelSecurityFilledDetective
-
 # OuterClothing
 - type: loadout
   id: DetectiveArmorVest

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

@@ -110,7 +110,7 @@
 - type: startingGear
   id: SecurityBackpack
   equipment:
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurity
 
 - type: loadout
   id: SecuritySatchel
@@ -119,7 +119,7 @@
 - type: startingGear
   id: SecuritySatchel
   equipment:
-    back: ClothingBackpackSatchelSecurityFilled
+    back: ClothingBackpackSatchelSecurity
 
 - type: loadout
   id: SecurityDuffel
@@ -128,7 +128,7 @@
 - type: startingGear
   id: SecurityDuffel
   equipment:
-    back: ClothingBackpackDuffelSecurityFilled
+    back: ClothingBackpackDuffelSecurity
 
 # Belt
 - type: loadout

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -103,9 +103,9 @@
   id: HoPBackpack
   name: loadout-group-hop-backpack
   loadouts:
-  - HoPBackpack
-  - HoPSatchel
-  - HoPDuffel
+  - CommonBackpack
+  - CommonSatchel
+  - CommonDuffel
   - HoPBackpackIan
 
 - type: loadoutGroup
@@ -122,8 +122,8 @@
   loadouts:
   - GreyJumpsuit
   - GreyJumpskirt
-  - RainbowJumpsuit
   - AncientJumpsuit
+  - RainbowJumpsuit
 
 - type: loadoutGroup
   id: PassengerFace
@@ -141,7 +141,7 @@
 
 - type: loadoutGroup
   id: CommonBackpack
-  name: loadout-group-passenger-backpack
+  name: loadout-group-backpack
   loadouts:
   - CommonBackpack
   - CommonSatchel
@@ -247,14 +247,6 @@
   loadouts:
   - LawyerNeck
 
-- type: loadoutGroup
-  id: LawyerBackpack
-  name: loadout-group-lawyer-backpack
-  loadouts:
-  - LawyerBackpack
-  - LawyerSatchel
-  - LawyerDuffel
-
 - type: loadoutGroup
   id: ChaplainHead
   name: loadout-group-chaplain-head
@@ -282,14 +274,6 @@
   - ChaplainRobesLight
   - ChaplainRobesDark
 
-- type: loadoutGroup
-  id: ChaplainBackpack
-  name: loadout-group-chaplain-backpack
-  loadouts:
-  - ChaplainBackpack
-  - ChaplainSatchel
-  - ChaplainDuffel
-
 - type: loadoutGroup
   id: ChaplainOuterClothing
   name: loadout-group-chaplain-outerclothing
@@ -446,14 +430,6 @@
   loadouts:
   - MimeWintercoat
 
-- type: loadoutGroup
-  id: MusicianBackpack
-  name: loadout-group-musician-backpack
-  loadouts:
-  - MusicianBackpack
-  - MusicianSatchel
-  - MusicianDuffel
-
 - type: loadoutGroup
   id: MusicianOuterClothing
   name: loadout-group-musician-outerclothing
@@ -480,14 +456,6 @@
   - QuartermasterTurtleneckSkirt
   - QuartermasterFormalSuit
 
-- type: loadoutGroup
-  id: QuartermasterBackpack
-  name: loadout-group-quartermaster-backpack
-  loadouts:
-  - QuartermasterBackpack
-  - QuartermasterSatchel
-  - QuartermasterDuffel
-
 - type: loadoutGroup
   id: QuartermasterNeck
   name: loadout-group-quartermaster-neck
@@ -586,14 +554,6 @@
   - ChiefEngineerTurtleneck
   - ChiefEngineerTurtleneckSkirt
 
-- type: loadoutGroup
-  id: ChiefEngineerBackpack
-  name: loadout-group-chief-engineer-backpack
-  loadouts:
-  - ChiefEngineerBackpack
-  - ChiefEngineerSatchel
-  - ChiefEngineerDuffel
-
 - type: loadoutGroup
   id: ChiefEngineerNeck
   name: loadout-group-chief-engineer-neck
@@ -725,14 +685,6 @@
   - ResearchDirectorJumpsuit
   - ResearchDirectorJumpskirt
 
-- type: loadoutGroup
-  id: ResearchDirectorBackpack
-  name: loadout-group-research-director-backpack
-  loadouts:
-  - ResearchDirectorBackpack
-  - ResearchDirectorSatchel
-  - ResearchDirectorDuffel
-
 - type: loadoutGroup
   id: ResearchDirectorOuterClothing
   name: loadout-group-research-director-outerclothing
@@ -964,14 +916,6 @@
   - NoirJumpsuit
   - NoirJumpskirt
 
-- type: loadoutGroup
-  id: DetectiveBackpack
-  name: loadout-group-detective-backpack
-  loadouts:
-  - DetectiveBackpack
-  - DetectiveSatchel
-  - DetectiveDuffel
-
 - type: loadoutGroup
   id: DetectiveOuterClothing
   name: loadout-group-detective-outerclothing
@@ -1013,14 +957,6 @@
   - ChiefMedicalOfficerLabCoat
   - ChiefMedicalOfficerWintercoat
 
-- type: loadoutGroup
-  id: ChiefMedicalOfficerBackpack
-  name: loadout-group-chief-medical-officer-backpack
-  loadouts:
-  - ChiefMedicalOfficerBackpack
-  - ChiefMedicalOfficerSatchel
-  - ChiefMedicalOfficerDuffel
-
 - type: loadoutGroup
   id: ChiefMedicalOfficerNeck
   name: loadout-group-chief-medical-officer-neck
@@ -1160,14 +1096,6 @@
   - ParamedicWindbreaker
   - ParamedicWintercoat
 
-- type: loadoutGroup
-  id: ParamedicBackpack
-  name: loadout-group-paramedic-backpack
-  loadouts:
-  - ParamedicBackpack
-  - ParamedicSatchel
-  - ParamedicDuffel
-
 - type: loadoutGroup
   id: ParamedicShoes
   name: loadout-group-paramedic-shoes

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -75,7 +75,7 @@
   groups:
   - LawyerNeck
   - LawyerJumpsuit
-  - LawyerBackpack
+  - CommonBackpack
   - Glasses
   - Trinkets
 
@@ -86,7 +86,7 @@
   - ChaplainMask
   - ChaplainNeck
   - ChaplainJumpsuit
-  - ChaplainBackpack
+  - CommonBackpack
   - ChaplainOuterClothing
   - Glasses
   - Trinkets
@@ -137,7 +137,7 @@
 - type: roleLoadout
   id: JobMusician
   groups:
-  - MusicianBackpack
+  - CommonBackpack
   - MusicianOuterClothing
   - Glasses
   - Trinkets
@@ -149,7 +149,7 @@
   - QuartermasterHead
   - QuartermasterNeck
   - QuartermasterJumpsuit
-  - QuartermasterBackpack
+  - CargoTechnicianBackpack
   - QuartermasterOuterClothing
   - QuartermasterShoes
   - Glasses
@@ -181,7 +181,7 @@
   groups:
   - ChiefEngineerHead
   - ChiefEngineerJumpsuit
-  - ChiefEngineerBackpack
+  - StationEngineerBackpack
   - ChiefEngineerNeck
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
@@ -221,7 +221,7 @@
   - ResearchDirectorHead
   - ResearchDirectorNeck
   - ResearchDirectorJumpsuit
-  - ResearchDirectorBackpack
+  - ScientistBackpack
   - ResearchDirectorOuterClothing
   - ScientistGloves
   - ResearchDirectorShoes
@@ -292,7 +292,7 @@
   - DetectiveHead
   - DetectiveNeck
   - DetectiveJumpsuit
-  - DetectiveBackpack
+  - SecurityBackpack
   - DetectiveOuterClothing
   - SecurityShoes
   - Trinkets
@@ -312,7 +312,7 @@
   - MedicalMask
   - ChiefMedicalOfficerJumpsuit
   - MedicalGloves
-  - ChiefMedicalOfficerBackpack
+  - MedicalBackpack
   - ChiefMedicalOfficerOuterClothing
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
@@ -359,7 +359,7 @@
   - MedicalMask
   - ParamedicJumpsuit
   - MedicalGloves
-  - ParamedicBackpack
+  - MedicalBackpack
   - ParamedicOuterClothing
   - ParamedicShoes
   - Glasses

Resources/Prototypes/Roles/Antags/Thief.yml

@@ -4,3 +4,10 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-thief-objective
+
+- type: startingGear
+  id: ThiefGear
+  storage:
+    back:
+    - ToolboxThief
+    - ClothingHandsChameleonThief

Resources/Prototypes/Roles/Antags/ninja.yml

@@ -4,3 +4,33 @@
   antagonist: true
   setPreference: false
   objective: roles-antag-space-ninja-objective
+
+#Ninja Gear
+- type: startingGear
+  id: SpaceNinjaGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitNinja
+    back: ClothingBackpackSatchel
+    mask: ClothingMaskNinja
+    head: ClothingHeadHelmetSpaceNinja
+    eyes: ClothingEyesVisorNinja
+    gloves: ClothingHandsGlovesSpaceNinja
+    outerClothing: ClothingOuterSuitSpaceNinja
+    shoes: ClothingShoesSpaceNinja
+    id: AgentIDCard
+    ears: ClothingHeadsetGrey
+    pocket1: SpiderCharge
+    pocket2: PinpointerStation
+    belt: EnergyKatana
+    suitstorage: OxygenTankFilled
+  inhand:
+    - JetpackBlackFilled
+  storage:
+    back: # belt holds katana so satchel has the tools for sabotaging things
+    - BoxSurvival
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool

Resources/Prototypes/Roles/Antags/nukeops.yml

@@ -34,3 +34,66 @@
     department: Security
     time: 18000 # 5h
   # should be changed to nukie playtime when thats tracked (wyci)
+
+#Nuclear Operative Gear
+- type: startingGear
+  id: SyndicateOperativeGearFull
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackDuffelSyndicate
+    mask: ClothingMaskGasSyndicate
+    eyes: ClothingEyesHudSyndicate
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitSyndie
+    shoes: ClothingShoesBootsCombatFilled
+    id: SyndiPDA
+    pocket1: DoubleEmergencyOxygenTankFilled
+    pocket2: BaseUplinkRadio40TC
+    belt: ClothingBeltMilitaryWebbing
+  storage:
+    back:
+    - BoxSurvivalSyndicate
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - DeathAcidifierImplanter
+
+#Nuclear Operative Commander Gear
+- type: startingGear
+  id: SyndicateCommanderGearFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    neck: SyndicateWhistle
+    outerClothing: ClothingOuterHardsuitSyndieCommander
+  inhand:
+    - NukeOpsDeclarationOfWar
+
+#Nuclear Operative Medic Gear
+- type: startingGear
+  id: SyndicateOperativeMedicFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    eyes: ClothingEyesHudSyndicateAgent
+    outerClothing: ClothingOuterHardsuitSyndieMedic
+    shoes: ClothingShoesBootsMagSyndie
+    id: SyndiAgentPDA
+    belt: ClothingBeltMilitaryWebbingMedFilled
+  storage:
+    back:
+    - SyndiHypo
+    - BoxSurvivalSyndicate
+    - SawAdvanced
+    - Cautery
+    - CombatKnife
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - HandheldHealthAnalyzer
+    - CombatMedipen
+    - DeathAcidifierImplanter
+
+#Lone Operative Gear
+- type: startingGear
+  id: SyndicateLoneOperativeGearFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    pocket2: BaseUplinkRadio60TC

Resources/Prototypes/Roles/Antags/pirate.yml

@@ -2,7 +2,7 @@
   id: PirateGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
+    back: ClothingBackpackSatchelLeather
     head: ClothingHeadBandBlack
     shoes: ClothingShoesBootsLaceup
     id: PiratePDA
@@ -11,25 +11,15 @@
 
 - type: startingGear
   id: PirateCaptainGear
+  parent: PirateGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirate
-    shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
-    belt: ClothingBeltUtility
-    pocket1: AppraisalTool
     pocket2: EnergyCutlass
     outerClothing: ClothingOuterCoatPirate
 
 - type: startingGear
   id: PirateFirstmateGear
+  parent: PirateGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirateTricord
-    shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
-    belt: ClothingBeltUtility
-    pocket1: AppraisalTool
     outerClothing: ClothingOuterCoatGentle

Resources/Prototypes/Roles/Antags/revolutionary.yml

@@ -11,3 +11,10 @@
   antagonist: true
   setPreference: false
   objective: roles-antag-rev-objective
+
+- type: startingGear
+  id: HeadRevGear
+  storage:
+    back:
+    - Flash
+    - ClothingEyesGlassesSunglasses

Resources/Prototypes/Roles/Antags/traitor.yml

@@ -4,3 +4,36 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-syndicate-agent-objective
+
+# Syndicate Operative Outfit - Monkey
+- type: startingGear
+  id: SyndicateOperativeGearMonkey
+  equipment:
+    head: ClothingHeadHatOutlawHat
+    jumpsuit: ClothingUniformJumpsuitOperative
+    mask: CigaretteSyndicate
+
+# Syndicate Operative Outfit - Barratry
+- type: startingGear
+  id: SyndicateOperativeGearExtremelyBasic
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackSyndicate
+    shoes: ClothingShoesBootsCombatFilled
+    gloves: ClothingHandsGlovesColorBlack
+  storage:
+    back:
+    - BoxSurvivalSyndicate
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - DeathAcidifierImplanter
+
+#Syndicate Operative Outfit - Basic
+- type: startingGear
+  id: SyndicateOperativeGearBasic
+  parent: SyndicateOperativeGearExtremelyBasic
+  equipment:
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    pocket1: BaseUplinkRadio40TC
+    id: SyndiPDA

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

@@ -17,4 +17,7 @@
   equipment:
     id: CargoPDA
     ears: ClothingHeadsetCargo
-    pocket1: AppraisalTool
+    pocket1: AppraisalTool
+  storage:
+    back:
+    - BoxSurvival

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

@@ -41,4 +41,8 @@
     id: QuartermasterPDA
     ears: ClothingHeadsetQM
     belt: BoxFolderClipboard
-    pocket1: AppraisalTool
+    pocket1: AppraisalTool
+  storage:
+    back:
+    - BoxSurvival
+    - Flash

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

@@ -23,4 +23,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
     id: SalvagePDA
-    ears: ClothingHeadsetCargo
+    ears: ClothingHeadsetCargo
+  storage:
+    back:
+    - BoxSurvival

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

@@ -14,3 +14,6 @@
   equipment:
     id: PassengerPDA
     ears: ClothingHeadsetGrey
+  storage:
+    back:
+    - BoxSurvival

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

@@ -24,3 +24,6 @@
     shoes: ClothingShoesColorBlack
     id: BartenderPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival

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

@@ -21,3 +21,6 @@
     id: BotanistPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltPlantFilled
+  storage:
+    back:
+    - BoxSurvival

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

@@ -20,3 +20,8 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
+    - Bible
+    - RubberStampChaplain

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

@@ -25,3 +25,6 @@
     id: ChefPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltChefFilled
+  storage:
+    back:
+    - BoxSurvival

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

@@ -32,4 +32,9 @@
     pocket1: BikeHorn
     pocket2: ClownRecorder
     id: ClownPDA
-    ears: ClothingHeadsetService
+    ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxHug
+    - RubberStampClown
+    - CrayonRainbow

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

@@ -32,3 +32,6 @@
     head: ClothingHeadHatCatEars
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
+  storage:
+    back:
+    - BoxSurvival

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

@@ -24,3 +24,7 @@
     # TODO add copy of space law
   inhand:
     - BriefcaseBrownFilled
+  storage:
+    back:
+    - BoxSurvival
+    - RubberStampLawyer

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

@@ -18,3 +18,7 @@
     ears: ClothingHeadsetService
     pocket1: d10Dice
     pocket2: HandLabeler # for making named bestsellers
+  storage:
+    back:
+    - BoxSurvival
+    - BookRandom

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

@@ -28,6 +28,10 @@
     pocket2: Paper
     id: MimePDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
+    - RubberStampMime
 
 - type: entity
   id: ActionMimeInvisibleWall

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

@@ -21,4 +21,9 @@
     eyes: ClothingEyesGlassesSunglasses
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
-    ears: ClothingHeadsetService
+    ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
+    - AcousticGuitarInstrument
+    - SaxophoneInstrument

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

@@ -21,3 +21,6 @@
     shoes: ClothingShoesColorBlack
     id: ServiceWorkerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival

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

@@ -40,3 +40,8 @@
     gloves: ClothingHandsGlovesCaptain
     id: CaptainPDA
     ears: ClothingHeadsetAltCommand
+  storage:
+    back:
+    - BoxSurvival
+    - Flash
+    # - StationCharter

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

@@ -64,3 +64,7 @@
     gloves: ClothingHandsGlovesHop
     ears: ClothingHeadsetAltCommand
     belt: BoxFolderClipboard
+  storage:
+    back:
+    - BoxSurvival
+    - Flash

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

@@ -23,3 +23,6 @@
     id: AtmosPDA
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
+  storage:
+    back:
+    - BoxSurvivalEngineering

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

@@ -44,3 +44,7 @@
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
     belt: ClothingBeltUtilityEngineering
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - Flash

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

@@ -23,3 +23,6 @@
     eyes: ClothingEyesGlassesMeson
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
+  storage:
+    back:
+    - BoxSurvivalEngineering

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

@@ -26,4 +26,7 @@
     id: TechnicalAssistantPDA
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
-    pocket2: BookEngineersHandbook
+    pocket2: BookEngineersHandbook
+  storage:
+    back:
+    - BoxSurvivalEngineering

Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml

@@ -3,21 +3,27 @@
   id: CultLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadHelmetCult
     neck: BedsheetCult
     outerClothing: ClothingOuterArmorCult
     shoes: ClothingShoesCult
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
 
 - type: startingGear
   id: CultistGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadHatHoodCulthood
     outerClothing: ClothingOuterRobesCult
     shoes: ClothingShoesColorRed
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival

Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml

@@ -18,7 +18,7 @@
   id: ERTLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTLeader
     eyes: ClothingEyesGlassesSecurity
@@ -29,12 +29,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolN1984
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -46,12 +55,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolN1984
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVALecter
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -65,6 +83,15 @@
     pocket2: MagazineRifle
   inhand:
     - AirTankFilled
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 # Chaplain
 - type: job
@@ -90,7 +117,7 @@
   id: ERTChaplainGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplainFilled
+    back: ClothingBackpackERTChaplain
     shoes: ClothingShoesLeather
     head: ClothingHeadHatFez
     eyes: ClothingEyesGlasses
@@ -102,12 +129,27 @@
     belt: ClothingBeltStorageWaistbag
     pocket1: Flare
     pocket2: DrinkWaterBottleFull
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - BoxCandle
+    - BoxBodyBag
+    - DrinkWaterMelonJuiceJug
+    - Lantern
+    - Lantern
+    - Bible
+    - CrowbarRed
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - Lighter
 
 - type: startingGear
   id: ERTChaplainGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplainFilled
+    back: ClothingBackpackERTChaplain
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlasses
@@ -120,6 +162,21 @@
     belt: ClothingBeltStorageWaistbag
     pocket1: Flare
     pocket2: DrinkWaterBottleFull
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - BoxCandle
+    - BoxBodyBag
+    - DrinkWaterMelonJuiceJug
+    - Lantern
+    - Lantern
+    - Bible
+    - CrowbarRed
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - Lighter
 
 # Engineer
 - type: job
@@ -141,7 +198,7 @@
   id: ERTEngineerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerFilled
+    back: ClothingBackpackERTEngineer
     shoes: ClothingShoesBootsWork
     head: ClothingHeadHelmetERTEngineer
     eyes: ClothingEyesGlassesMeson
@@ -152,12 +209,25 @@
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
     pocket2: GasAnalyzer
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - trayScanner
+    - RCD
+    - RCDAmmo
+    - RCDAmmo
+    - CableMVStack
+    - CableHVStack
+    - CableApcStack
+    - SheetPlasteel
+    - SheetSteel
+    - SheetGlass
 
 - type: startingGear
   id: ERTEngineerGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerFilled
+    back: ClothingBackpackERTEngineer
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesMeson
@@ -169,6 +239,19 @@
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
     pocket2: GasAnalyzer
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - trayScanner
+    - RCD
+    - RCDAmmo
+    - RCDAmmo
+    - CableMVStack
+    - CableHVStack
+    - CableApcStack
+    - SheetPlasteel
+    - SheetSteel
+    - SheetGlass
 
 # Security
 - type: job
@@ -190,7 +273,7 @@
   id: ERTSecurityGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTSecurity
     eyes: ClothingEyesGlassesSecurity
@@ -201,12 +284,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -218,12 +310,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVALecter
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -237,6 +338,15 @@
     pocket2: MagazineRifle
   inhand:
     - AirTankFilled
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 # Medical
 - type: job
@@ -258,7 +368,7 @@
   id: ERTMedicalGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalFilled
+    back: ClothingBackpackERTMedical
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTMedic
     eyes: ClothingEyesHudMedical
@@ -268,12 +378,21 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - Hypospray
+    - MedkitAdvancedFilled
+    - CrowbarRed
+    - OmnizineChemistryBottle
+    - EpinephrineChemistryBottle
+    - EpinephrineChemistryBottle
 
 - type: startingGear
   id: ERTMedicalGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalFilled
+    back: ClothingBackpackERTMedical
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
@@ -284,6 +403,15 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - Hypospray
+    - MedkitAdvancedFilled
+    - CrowbarRed
+    - OmnizineChemistryBottle
+    - EpinephrineChemistryBottle
+    - EpinephrineChemistryBottle
 
 # Janitor
 - type: job
@@ -305,7 +433,7 @@
   id: ERTJanitorGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorFilled
+    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHelmetERTJanitor
     gloves: ClothingHandsGlovesColorPurple
@@ -314,12 +442,21 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - LightReplacer
+    - BoxLightMixed
+    - BoxLightMixed
+    - Soap
+    - CrowbarRed
+    - AdvMopItem
 
 - type: startingGear
   id: ERTJanitorGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorFilled
+    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     gloves: ClothingHandsGlovesColorPurple
@@ -329,3 +466,12 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - LightReplacer
+    - BoxLightMixed
+    - BoxLightMixed
+    - Soap
+    - CrowbarRed
+    - AdvMopItem

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -5,7 +5,7 @@
   id: SkeletonBiker
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadBandSkull
     eyes: ClothingEyesGlassesSunglasses
     outerClothing: ClothingOuterCoatGentle
@@ -13,35 +13,16 @@
     shoes: ClothingShoesBootsJack
     id: PassengerPDA
     ears: ClothingHeadsetGrey
-
-#Space Ninja Outfit
-- type: startingGear
-  id: SpaceNinjaGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitNinja
-    # belt holds katana so satchel has the tools for sabotaging things
-    back: ClothingBackpackSatchelTools
-    mask: ClothingMaskNinja
-    head: ClothingHeadHelmetSpaceNinja
-    eyes: ClothingEyesVisorNinja
-    gloves: ClothingHandsGlovesSpaceNinja
-    outerClothing: ClothingOuterSuitSpaceNinja
-    shoes: ClothingShoesSpaceNinja
-    id: AgentIDCard
-    ears: ClothingHeadsetGrey
-    pocket1: SpiderCharge
-    pocket2: PinpointerStation
-    belt: EnergyKatana
-    suitstorage: OxygenTankFilled
-  inhand:
-    - JetpackBlackFilled
+  storage:
+    back:
+    - BoxSurvival
 
 #Deathsquad Outfit
 - type: startingGear
   id: DeathSquadGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitDeathSquad
-    back: ClothingBackpackDeathSquadFilled
+    back: ClothingBackpackDeathSquad
     mask: ClothingMaskGasDeathSquad
     eyes: ClothingEyesHudSecurity
     ears: ClothingHeadsetAltCentCom
@@ -53,23 +34,20 @@
     pocket1: EnergySword
     pocket2: EnergyShield
     belt: ClothingBeltMilitaryWebbingMedFilled
-
-# Syndicate Operative Outfit - Monkey
-- type: startingGear
-  id: SyndicateOperativeGearMonkey
-  equipment:
-    head: ClothingHeadHatOutlawHat
-    jumpsuit: ClothingUniformJumpsuitOperative
-    mask: CigaretteSyndicate
-
-# Syndicate Operative Outfit - Barratry
-- type: startingGear
-  id: SyndicateOperativeGearExtremelyBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    shoes: ClothingShoesBootsCombatFilled
-    gloves: ClothingHandsGlovesColorBlack
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponPulseRifle
+    - WeaponPulsePistol
+    - WeaponRevolverMateba
+    - SpeedLoaderMagnumAP
+    - SpeedLoaderMagnumAP
+    - BoxFlashbang
+    - ToolDebug # spanish army knife
+    - WelderExperimental
+    - Hypospray
+    - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
+    - FreedomImplanter
 
 # Syndicate Operative Outfit - Civilian
 - type: startingGear
@@ -82,103 +60,6 @@
     id: SyndiPDA
     ears: ClothingHeadsetAltSyndicate
 
-#Syndicate Operative Outfit - Basic
-- type: startingGear
-  id: SyndicateOperativeGearBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    shoes: ClothingShoesBootsCombatFilled
-    pocket1: BaseUplinkRadio40TC
-    id: SyndiPDA
-
-#Syndicate Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-
-#Nuclear Operative Commander Gear
-- type: startingGear
-  id: SyndicateCommanderGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    neck: SyndicateWhistle
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieCommander
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-  inhand:
-    - NukeOpsDeclarationOfWar
-
-#Nuclear Operative Medic Gear
-- type: startingGear
-  id: SyndicateOperativeMedicFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperativeMedic
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicateAgent
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieMedic
-    shoes: ClothingShoesBootsMagSyndie
-    id: SyndiAgentPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbingMedFilled
-
-#Syndicate Lone Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateLoneOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio60TC
-    belt: ClothingBeltMilitaryWebbing
-
-# Syndicate Footsoldier Gear
-- type: startingGear
-  id: SyndicateFootsoldierGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasic
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombat
-    id: SyndiPDA
-
 # Syndicate Footsoldier Gear - No Headset
 - type: startingGear
   id: SyndicateFootsoldierGearRuin
@@ -188,16 +69,26 @@
     mask: ClothingMaskGas
     outerClothing: ClothingOuterArmorBasic
     gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     shoes: ClothingShoesBootsCombat
     id: SyndiPDA
+  storage:
+    back:
+    - BoxSurvival
+
+# Syndicate Footsoldier Gear
+- type: startingGear
+  id: SyndicateFootsoldierGear
+  parent: SyndicateFootsoldierGearRuin
+  equipment:
+    ears: ClothingHeadsetAltSyndicate
 
 # Nanotrasen Paramilitary Unit Gear
 - type: startingGear
   id: NanotrasenParamilitaryGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitSec
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurity
     shoes: ClothingShoesBootsCombatFilled
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHelmetSwat
@@ -205,13 +96,18 @@
     outerClothing: ClothingOuterArmorBasicSlim
     ears: ClothingHeadsetSecurity
     gloves: ClothingHandsGlovesCombat
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol
 
 #CBURN Unit Gear - Full Kit
 - type: startingGear
   id: CBURNGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBrown
-    back: ClothingBackpackDuffelCBURNFilled
+    back: ClothingBackpackDuffelCBURN
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetAltCentCom
@@ -223,6 +119,14 @@
     pocket2: WeaponLaserGun
     suitstorage: OxygenTankFilled
     belt: ClothingBeltBandolier
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponShotgunDoubleBarreled
+    - BoxShotgunIncendiary
+    - GrenadeFlashBang
+    - PillAmbuzolPlus
+    - PillAmbuzol
 
 - type: startingGear
   id: BoxingKangarooGear
@@ -237,14 +141,6 @@
     jumpsuit: ClothingUniformJumpsuitJacketMonkey
     id: PunPunIDCard
 
-# Passenger but without the ID, bag, or headset
-
-- type: startingGear
-  id: LimitedPassengerGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitColorGrey
-    shoes: ClothingShoesColorBlack
-
 # DeathMatch Gear
 
 - type: startingGear
@@ -278,24 +174,13 @@
 - type: startingGear
   id: MobAghostGear
   equipment:
-    back: ClothingBackpackSatchelHoldingAdmin
+    back: ClothingBackpackSatchelHolding
     id: AdminPDA
-
-#Head Rev Gear
-- type: startingGear
-  id: HeadRevGear
   storage:
     back:
-    - Flash
-    - ClothingEyesGlassesSunglasses
-
-#Thief Gear
-- type: startingGear
-  id: ThiefGear
-  storage:
-    back:
-    - ToolboxThief
-    - ClothingHandsChameleonThief
+    - GasAnalyzer
+    - trayScanner
+    - AccessConfiguratorUniversal
 
 #Gladiator with spear
 - type: startingGear
@@ -325,10 +210,16 @@
     shoes: ClothingShoesClownBanana
     jumpsuit: ClothingUniformJumpsuitClownBanana
     mask: ClothingMaskClownBanana
-    ears: ClothingHeadsetService
     pocket1: BikeHorn
     pocket2: ClownRecorder
 
+# Passenger but without the ID, bag, or headset
+- type: startingGear
+  id: LimitedPassengerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorGrey
+    shoes: ClothingShoesColorBlack
+
 #Clown Troupe
 - type: startingGear
   id: ClownTroupe

Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml

@@ -3,41 +3,33 @@
   id: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorDarkBlue
-    back: ClothingBackpackFilled
     head: ClothingHeadHatWizard
     outerClothing: ClothingOuterWizard
     shoes: ClothingShoesWizard
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
 
 - type: startingGear
   id: WizardRedGear
+  parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorRed
-    back: ClothingBackpackFilled
     head: ClothingHeadHatRedwizard
     outerClothing: ClothingOuterWizardRed
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
 
 - type: startingGear
   id: WizardVioletGear
+  parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorPurple
-    back: ClothingBackpackFilled
     head: ClothingHeadHatVioletwizard
     outerClothing: ClothingOuterWizardViolet
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
 
 - type: startingGear
   id: WizardHardsuitGear
+  parent: WizardVioletGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitColorPurple
-    back: ClothingBackpackFilled
-    outerClothing: ClothingOuterHardsuitWizard
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
+    outerClothing: ClothingOuterHardsuitWizard

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

@@ -22,4 +22,7 @@
     ears: ClothingHeadsetMedical
     belt: ChemBag
     pocket1: HandLabeler
-    eyes: ClothingEyesGlassesChemical
+    eyes: ClothingEyesGlassesChemical
+  storage:
+    back:
+    - BoxSurvivalMedical

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

@@ -44,3 +44,7 @@
     id: CMOPDA
     ears: ClothingHeadsetCMO
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - Flash

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

@@ -21,3 +21,6 @@
   equipment:
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - BoxSurvivalMedical

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

@@ -23,4 +23,7 @@
     id: MedicalInternPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
-    pocket2: BookMedicalReferenceBook
+    pocket2: BookMedicalReferenceBook
+  storage:
+    back:
+    - BoxSurvivalMedical

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

@@ -24,3 +24,7 @@
     id: ParamedicPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalEMTFilled
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - EmergencyRollerBedSpawnFolded

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

@@ -23,3 +23,6 @@
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
     pocket2: BookScientistsGuidebook
+  storage:
+    back:
+    - BoxSurvival

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

@@ -33,4 +33,8 @@
   id: ResearchDirectorGear
   equipment:
     id: RnDPDA
-    ears: ClothingHeadsetRD
+    ears: ClothingHeadsetRD
+  storage:
+    back:
+    - BoxSurvival
+    - Flash

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

@@ -18,4 +18,6 @@
   id: ScientistGear
   equipment:
     ears: ClothingHeadsetScience
-
+  storage:
+    back:
+    - BoxSurvival

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

@@ -28,3 +28,9 @@
     id: DetectivePDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltHolsterFilled
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - ForensicPad
+    - ForensicScanner

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

@@ -47,3 +47,8 @@
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
     pocket1: WeaponPistolMk58
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol

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

@@ -34,4 +34,9 @@
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58
-    pocket2: BookSecurity
+    pocket2: BookSecurity
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol

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

@@ -28,3 +28,8 @@
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol

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

@@ -31,3 +31,8 @@
     id: WardenPDA
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol

Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml

@@ -17,3 +17,6 @@
     ears: ClothingHeadsetService
     shoes: ClothingShoesColorRed
     belt: ClothingBeltChampion
+  storage:
+    back:
+    - BoxSurvival

Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml

@@ -19,3 +19,6 @@
     shoes: ClothingShoesLeather
     id: PsychologistPDA
     ears: ClothingHeadsetMedical
+  storage:
+    back:
+    - BoxSurvivalMedical

Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml

@@ -16,3 +16,6 @@
     shoes: ClothingShoesColorWhite
     id: ReporterPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival

Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml

@@ -18,3 +18,6 @@
     shoes: ClothingShoesColorWhite
     id: ZookeeperPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival

Resources/migration.yml

@@ -251,11 +251,11 @@ AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked
 AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked
 
 # 2024-03-10
-ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
-ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
-ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
 FoodChili: FoodChiliPepper
 FoodChilly: FoodChillyPepper
+# ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
+# ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
+# ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
 
 # 2024-03-11
 ImprovisedExplosive: FireBomb