Loadout Re-Redux

Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs

@@ -29,19 +29,25 @@
 // SPDX-FileCopyrightText: 2024 plykiya <plykiya@protonmail.com>
 // SPDX-FileCopyrightText: 2024 Арт <123451459+JustArt1m@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2025 Froffy025 <scotttaco025@gmail.com>
+// SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
+// SPDX-FileCopyrightText: 2025 SX-7 <sn1.test.preria.2002@gmail.com>
 // SPDX-FileCopyrightText: 2025 Tayrtahn <tayrtahn@gmail.com>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+using Content.Shared.Inventory;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
 namespace Content.Shared.Preferences.Loadouts;
 
 /// <summary>
 /// Corresponds to a set of loadouts for a particular slot.
 /// </summary>
 [Prototype]
-public sealed partial class LoadoutGroupPrototype : IPrototype
+public sealed partial class LoadoutGroupPrototype : IPrototype, IInheritingPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = string.Empty;
@@ -72,4 +78,18 @@ public sealed partial class LoadoutGroupPrototype : IPrototype
 
     [DataField(required: true)]
     public List<ProtoId<LoadoutPrototype>> Loadouts = new();
-}
+
+    /// <summary>
+    /// If another item with these slotflags is attempted to be equippped, cancel. - Goobstation
+    /// </summary>
+    [DataField]
+    public SlotFlags? ExclusiveWith;
+
+    [ViewVariables]
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<LoadoutGroupPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    [ViewVariables]
+    [AbstractDataField]
+    public bool Abstract { get; private set; } = false;
+}

Content.Shared/Preferences/Loadouts/RoleLoadout.cs

@@ -65,22 +65,25 @@
 // SPDX-FileCopyrightText: 2024 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2024 Арт <123451459+JustArt1m@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2025 Froffy025 <scotttaco025@gmail.com>
+// SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
 // SPDX-FileCopyrightText: 2025 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
+// SPDX-FileCopyrightText: 2025 SX-7 <sn1.test.preria.2002@gmail.com>
 // SPDX-FileCopyrightText: 2025 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2025 āda <ss.adasts@gmail.com>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Content.Shared.CCVar;
-using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Random;
 using Robust.Shared.Collections;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Content.Shared.Preferences.Loadouts;
 
@@ -298,6 +301,7 @@ public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? sessio
                 continue;
 
             var loadouts = new List<Loadout>();
+
             SelectedLoadouts[group] = loadouts;
 
             if (groupProto.MinLimit > 0)
@@ -309,6 +313,7 @@ public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? sessio
                     if (loadouts.Count >= groupProto.MinLimit)
                         break;
 
+
                     if (!protoManager.TryIndex(protoId, out var loadoutProto))
                         continue;
 
@@ -457,4 +462,4 @@ public override int GetHashCode()
     {
         return HashCode.Combine(Role, SelectedLoadouts, Points);
     }
-}
+}

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

@@ -54,12 +54,14 @@ loadout-group-hop-backpack = Head of Personnel backpack
 loadout-group-hop-outerclothing = Head of Personnel outer clothing
 
 # Civilian
-loadout-group-passenger-jumpsuit = Passenger jumpsuit
-loadout-group-passenger-mask = Passenger mask
-loadout-group-passenger-gloves = Passenger gloves
-loadout-group-passenger-outerclothing = Passenger outer clothing
-loadout-group-passenger-shoes = Passenger shoes
-loadout-group-passenger-neck = Passenger neck
+loadout-group-civilian-jumpsuit = Civilian Jumpsuits
+loadout-group-civilian-mask = Civilian Facewear
+loadout-group-civilian-hat = Civilian Headwear
+loadout-group-civilian-gloves = Civilian Gloves
+loadout-group-civilian-outerclothing = Civilian Outerwear
+loadout-group-civilian-shoes = Civilian Footwear
+loadout-group-civilian-neck = Civilian Neckwear
+loadout-group-civilian-belt = Civilian Beltwear
 
 loadout-group-bartender-head = Bartender head
 loadout-group-bartender-jumpsuit = Bartender jumpsuit

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -29,7 +29,6 @@
 # SPDX-FileCopyrightText: 2024 Scruq445 <storchdamien@gmail.com>
 # SPDX-FileCopyrightText: 2024 beck-thompson <107373427+beck-thompson@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2024 degradka <69397649+degradka@users.noreply.github.com>
-# SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2024 metalgearsloth <comedian_vs_clown@hotmail.com>
 # SPDX-FileCopyrightText: 2024 potato1234_x <79580518+potato1234x@users.noreply.github.com>
@@ -40,18 +39,22 @@
 # SPDX-FileCopyrightText: 2025 Aineias1 <142914808+Aineias1@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Aineias1 <dmitri.s.kiselev@gmail.com>
 # SPDX-FileCopyrightText: 2025 FaDeOkno <143940725+FaDeOkno@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Froffy025 <78222136+Froffy025@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
 # SPDX-FileCopyrightText: 2025 McBosserson <148172569+McBosserson@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Milon <plmilonpl@gmail.com>
 # SPDX-FileCopyrightText: 2025 Piras314 <p1r4s@proton.me>
+# SPDX-FileCopyrightText: 2025 PotRoastPiggy <121025443+PotRoastPiggy@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Rouden <149893554+Roudenn@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 SX-7 <sn1.test.preria.2002@gmail.com>
 # SPDX-FileCopyrightText: 2025 TheBorzoiMustConsume <197824988+TheBorzoiMustConsume@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Unlumination <144041835+Unlumy@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 deltanedas <39013340+deltanedas@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 deltanedas <@deltanedas:kde.org>
 # SPDX-FileCopyrightText: 2025 gluesniffler <159397573+gluesniffler@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 gluesniffler <linebarrelerenthusiast@gmail.com>
+# SPDX-FileCopyrightText: 2025 lzk <124214523+lzk228@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 username <113782077+whateverusername0@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 whateverusername0 <whateveremail>
 #
@@ -90,7 +93,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 3200
+  cost: 7500 # Goob - NoCargoOrderArbitrage test
   category: cargoproduct-category-name-service
   group: market
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml

@@ -18,10 +18,14 @@
 # SPDX-FileCopyrightText: 2024 Alekshhh <44923899+Alekshhh@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2024 Hanz <41141796+Hanzdegloker@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Froffy025 <scotttaco025@gmail.com>
+# SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
+# SPDX-FileCopyrightText: 2025 SX-7 <sn1.test.preria.2002@gmail.com>
 # SPDX-FileCopyrightText: 2025 SX_7 <sn1.test.preria.2002@gmail.com>
+# SPDX-FileCopyrightText: 2025 Smith <182301147+AgentSmithRadio@users.noreply.github.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-
 - type: vendingMachineInventory
   id: BarDrobeInventory
   startingInventory:
@@ -40,5 +44,6 @@
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
+    ClothingUniformJumpskirtWaitress: 2  # Loadouts Rework Addition - Einstein Engines
   contrabandInventory:
-    ToyFigurineBartender: 1
+    ToyFigurineBartender: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -35,8 +35,12 @@
 # SPDX-FileCopyrightText: 2024 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Armok <155400926+ARMOKS@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Froffy025 <scotttaco025@gmail.com>
 # SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
+# SPDX-FileCopyrightText: 2025 Jacktastic09 <148667265+Jacktastic09@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Marcus F <199992874+thebiggestbruh@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 PotRoastPiggy <121025443+PotRoastPiggy@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 SX_7 <sn1.test.preria.2002@gmail.com>
 # SPDX-FileCopyrightText: 2025 Smith <182301147+AgentSmithRadio@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Solstice <solsticeofthewinter@gmail.com>
@@ -147,6 +151,51 @@
     ClothingUniformJumpskirtDressOpenShoulder: 1 # Goobstation
     ClothingShoesSandals: 1 # Goobstation
     # DO NOT ADD MORE, USE UNIFORM DYING
+    #Loadouts Rework Stuff Start
+    ClothingOuterCoatAcidRaincoat: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatAcidRaincoatBlue: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatAcidRaincoatGreen: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatAcidRaincoatMagenta: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatAcidRaincoatYellow: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatBomberPunkRed: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatJacketLeather: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatJacketBiker: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatJacketJamrock: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatBomberAerostatic: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatJacketLettermanBrown: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatJacketLettermanMagenta: 3 #Loadouts Rework addition - Frontier
+    ClothingOuterCoatBomberPinkSleeves: 3 #Loadouts Rework addition - Frontier
+    ClothingUniformJumpskirtDressAsymmetric: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpskirtDressEvening: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpskirtDressMidi: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpskirtDressTea: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpskirtDressSleeveless: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpsuitYogaGymBra: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpsuitSuitBlueBlazer: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpsuitOliveSweater: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpsuitVictorianRedBlack: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpsuitVictorianRedVest: 3 #Loadouts Rework addition - EE
+    ClothingUniformJumpsuitRippedPunk: 3 #Loadouts Rework addition - Nyanotrasen
+    ClothingOuterCoatInspector: 3 #Loadouts Rework addition - EE
+    ClothingOuterCoatModern: 3 #Loadouts Rework addition - EE
+    ClothingOuterTailcoat: 3 #Loadouts Rework addition - EE
+    ClothingOuterCoatVictorian: 3 #Loadouts Rework addition - EE
+    ClothingOuterCoatVictorianRed: 3 #Loadouts Rework addition - EE
+    ClothingOuterCoatPeacoat: 3 #Loadouts Rework addition - EE
+    ClothingOuterCoatAsymmetric: 3 #Loadouts Rework addition - EE
+    ClothingOuterCoatSubmariner: 3 #Loadouts Rework addition - EE
+    ClothingOuterSuitJacket: 3 #Loadouts Rework addition - EE
+    ClothingOuterCardigan: 3 #Loadouts Rework addition - EE
+    ClothingOuterCardiganSweater: 3 #Loadouts Rework addition - EE
+    ClothingOuterCardiganArgyle: 3 #Loadouts Rework addition - EE
+    ClothingOuterCardiganSlim: 3 #Loadouts Rework addition - EE
+    ClothingOuterCowboyDuster: 3 #Loadouts Rework addition - EE
+    ClothingOuterBlazer: 3 #Loadouts Rework addition - EE
+    ClothingOuterBlazerLong: 3 #Loadouts Rework addition - EE
+    ClothingOuterBlazerFormal: 3 #Loadouts Rework addition - EE
+    ClothingOuterBlazerFlatCollar: 3 #Loadouts Rework addition - EE
+    ClothingOuterBlazerPosh: 3 #Loadouts Rework addition - EE
+    #Loadouts Rework Stuff End
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 2 # +1 Goobstation

Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml

@@ -12,14 +12,15 @@
 # SPDX-FileCopyrightText: 2024 deltanedas <39013340+deltanedas@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Froffy025 <scotttaco025@gmail.com>
 # SPDX-FileCopyrightText: 2025 Bokser815 <70928915+Bokser815@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
 # SPDX-FileCopyrightText: 2025 SX-7 <sn1.test.preria.2002@gmail.com>
 # SPDX-FileCopyrightText: 2025 SX_7 <sn1.test.preria.2002@gmail.com>
 # SPDX-FileCopyrightText: 2025 Smith <182301147+AgentSmithRadio@users.noreply.github.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-
 - type: vendingMachineInventory
   id: JaniDrobeInventory
   startingInventory:
@@ -32,9 +33,10 @@
     ClothingHeadsetService: 2
     ClothingOuterWinterJani: 2
     ClothingNeckScarfStripedPurple: 3
+    UniformMaid: 1  # Loadouts Rework addition - Nyanotrasen
   contrabandInventory:
     ToyFigurineJanitor: 1
   emaggedInventory:
     ClothingUniformJumpskirtJanimaid: 2
     ClothingUniformJumpskirtJanimaidmini: 1
-    SlipocalypseClusterSoap: 1 # Goobstation
+    SlipocalypseClusterSoap: 1 # Goobstation

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

@@ -18,23 +18,28 @@
 # SPDX-FileCopyrightText: 2024 icekot8 <93311212+icekot8@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Froffy025 <scotttaco025@gmail.com>
+# SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
+# SPDX-FileCopyrightText: 2025 SX-7 <sn1.test.preria.2002@gmail.com>
 # SPDX-FileCopyrightText: 2025 SX_7 <sn1.test.preria.2002@gmail.com>
+# SPDX-FileCopyrightText: 2025 Smith <182301147+AgentSmithRadio@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Ted Lukin <66275205+pheenty@users.noreply.github.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-
 - type: vendingMachineInventory
   id: MediDrobeInventory
   startingInventory:
     ClothingBackpackDuffelMedical: 4
     ClothingBackpackMedical: 4
     ClothingBackpackSatchelMedical: 4
-    ClothingBackpackMessengerMedical: 4 # Frontier
+    ClothingBackpackMessengerMedical: 4  # Frontier
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     ClothingBeltMedical: 4
     ClothingHeadHatBeretMedic: 4
     ClothingHeadNurseHat: 4
+    ClothingUniformJumpskirtNurse: 4  # Loadout Reworks Addition - Nyanotrasen
     ClothingOuterCoatLab: 4
     ClothingShoesColorWhite: 4
     ClothingHandsGlovesLatex: 4
@@ -53,4 +58,4 @@
     ClothingUniformJumpskirtOfLife: 1
     ToyFigurineMedicalDoctor: 1
     ToyFigurineParamedic: 1
-    ToyFigurineChiefMedicalOfficer: 1
+    ToyFigurineChiefMedicalOfficer: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -21,6 +21,7 @@
 # SPDX-FileCopyrightText: 2024 Speebro <speebro@notreal.com>
 # SPDX-FileCopyrightText: 2024 themias <89101928+themias@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Bokser815 <70928915+Bokser815@users.noreply.github.com>
 # SPDX-FileCopyrightText: 2025 Creatorbot01 <creatorbot02@gmail.com>
 # SPDX-FileCopyrightText: 2025 Creatorbot01 <creatorbot20@gmail.com>
@@ -53,6 +54,7 @@
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
+    ClothingUniformJumpsuitSecSummer: 3 # Loadouts Rework Addition - Nyanotrasen
     ClothingUniformJumpsuitBrigmedic: 1 # Goobstation
     ClothingUniformJumpskirtBrigmedic: 1 # Goobstation
     ClothingHeadsetAltSecurityRegular: 3 # Goobstation