From 631f8fa2622e325a4fadc62769bc76be14dae533 Mon Sep 17 00:00:00 2001 From: notactuallymarty Date: Sun, 18 Jan 2026 22:27:33 +0200 Subject: [PATCH 1/2] Fix loadouts --- .../Clothing/Systems/SharedAltClothingLayerSystem.cs | 2 +- Resources/Prototypes/Loadouts/role_loadouts.yml | 2 +- .../Prototypes/Roles/Jobs/Security/detective.yml | 2 +- Resources/Prototypes/_Gabystation/loadout_groups.yml | 11 +++++++++++ .../_Goobstation/Loadouts/role_loadouts.yml | 3 ++- .../Prototypes/_Omu/Catalog/Fills/Items/belts.yml | 9 +++++++++ .../_Omu/Loadouts/Jobs/Security/security_officer.yml | 12 ++++++++---- 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/Content.Goobstation.Shared/Clothing/Systems/SharedAltClothingLayerSystem.cs b/Content.Goobstation.Shared/Clothing/Systems/SharedAltClothingLayerSystem.cs index e18a3922a6f..9b385558b38 100644 --- a/Content.Goobstation.Shared/Clothing/Systems/SharedAltClothingLayerSystem.cs +++ b/Content.Goobstation.Shared/Clothing/Systems/SharedAltClothingLayerSystem.cs @@ -67,7 +67,7 @@ private void OnVerb(Entity ent, ref GetVerbsEvent Date: Sun, 18 Jan 2026 23:52:26 +0200 Subject: [PATCH 2/2] HyperYaml --- .../en-US/_Omu/loadouts/loadout-groups.ftl | 3 + .../Prototypes/Loadouts/role_loadouts.yml | 8 +- .../Roles/Jobs/Security/detective.yml | 4 +- .../Roles/Jobs/Security/security_officer.yml | 2 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 2 +- .../Loadouts/Jobs/Security/Security.yml | 6 +- .../_Gabystation/loadout_groups.yml | 19 ---- .../_Goobstation/Loadouts/role_loadouts.yml | 2 +- .../_Omu/Catalog/Fills/Items/belts.yml | 17 +++- .../Jobs/Security/security_officer.yml | 95 ++++++++++++++++++- .../_Omu/Loadouts/loadout_groups.yml | 49 ++++++++++ 11 files changed, 174 insertions(+), 33 deletions(-) delete mode 100644 Resources/Prototypes/_Gabystation/loadout_groups.yml diff --git a/Resources/Locale/en-US/_Omu/loadouts/loadout-groups.ftl b/Resources/Locale/en-US/_Omu/loadouts/loadout-groups.ftl index 8b0175f0ee3..fe4dcf6cb6b 100644 --- a/Resources/Locale/en-US/_Omu/loadouts/loadout-groups.ftl +++ b/Resources/Locale/en-US/_Omu/loadouts/loadout-groups.ftl @@ -13,3 +13,6 @@ loadout-group-corpsman-headset = Corpsman headset loadout-group-virologist-envirohelm = Virologist envirohelm loadout-group-virologist-envirosuit = Virologist envirosuit loadout-group-virologist-envirogloves = Virologist envirogloves + +# Detective +loadout-group-detective-eyes = Detective Glasses diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 61faac649be..7abb0b3abc5 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -612,12 +612,12 @@ - WardenJumpsuit - SecurityBackpack - SecurityMelee # Goobstation + - TrinketsSecurity # Omu Edit - SecurityNeck - SecurityBelt - WardenOuterClothing - SecurityShoes - SurvivalSecurity - - TrinketsSecurity # Omu Edit - Trinkets - SecurityStar - Animals @@ -634,13 +634,13 @@ - SecurityJumpsuit - SecurityBackpack - SecurityMelee # Goobstation + - TrinketsSecurity # Omu Edit - SecurityOuterClothing - SecurityShoes - SecurityNeck - SecurityPDA - SecurityBelt - SurvivalSecurity - - TrinketsSecurity # Omu Edit - Trinkets - SecurityStar - Animals @@ -654,13 +654,15 @@ id: JobDetective groups: - DetectiveHead + - DetectiveEyes # Omu edit - DetectiveNeck - DetectiveJumpsuit - SecurityBackpack + - SecurityMelee # Omu edit + - TrinketsSecurityDetective # Omu Edit - DetectiveOuterClothing - SecurityShoes - SurvivalSecurity - - TrinketsSecurityDetective # Omu Edit - Trinkets - SecurityStar - Animals diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 7851e85cac5..2a4b0437bad 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -100,11 +100,11 @@ - type: startingGear id: DetectiveGear equipment: - eyes: ClothingEyesGlassesSecurity + # eyes: ClothingEyesGlassesSecurity # Omu move to loadouts id: DetectivePDA #gloves: ClothingHandsGlovesForensic - Goobstation, moved to loadouts ears: ClothingHeadsetAltSecurityRegular # Goobstation - belt: ClothingBeltHolsterAmmoFilled # Omu + #belt: ClothingBeltHolsterFilled # Omu Moved to loadout storage: back: - Flash diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 7fee3dc9c8e..7ec2178d8a9 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -127,7 +127,7 @@ storage: back: - Flash - - MagazinePistol + #- MagazinePistol # Omu moved to loadouts and will give ammo based on gun - type: chameleonOutfit id: SecurityOfficerChameleonOutfit diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 23c0d44bfbb..5790f583ef2 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -188,7 +188,7 @@ storage: back: - Flash - - MagazinePistol + #- MagazinePistol # Omu moved to loadouts and will give ammo according to weapon - ClothingMaskGasSecurity # Goobstation - type: chameleonOutfit diff --git a/Resources/Prototypes/_Gabystation/Loadouts/Jobs/Security/Security.yml b/Resources/Prototypes/_Gabystation/Loadouts/Jobs/Security/Security.yml index 7b8f5e6668d..648bc88b3f9 100644 --- a/Resources/Prototypes/_Gabystation/Loadouts/Jobs/Security/Security.yml +++ b/Resources/Prototypes/_Gabystation/Loadouts/Jobs/Security/Security.yml @@ -5,12 +5,16 @@ - type: loadout id: WeaponPistolMk58Gold + dummyEntity: WeaponPistolMk58Gold effects: - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Security time: 252000 #70 hrs + equipment: + pocket1: WeaponPistolMk58Gold storage: back: - - WeaponPistolMk58Gold + - MagazinePistol # You already start with one + this one = 2 the same as gun case + groupBy: "Main weapon" diff --git a/Resources/Prototypes/_Gabystation/loadout_groups.yml b/Resources/Prototypes/_Gabystation/loadout_groups.yml deleted file mode 100644 index c1f6b53d8c6..00000000000 --- a/Resources/Prototypes/_Gabystation/loadout_groups.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: loadoutGroup - id: TrinketsSecurity - name: loadout-group-trinkets-job - minLimit: 1 - maxLimit: 1 - loadouts: - - SecurityOfficerGunCase - - WeaponPistolMk58Gold - -# This latter one is from omu but given the only reason it exists is the golden mk im leaving it here. -- type: loadoutGroup - id: TrinketsSecurityDetective - name: loadout-group-trinkets-job - minLimit: 1 - maxLimit: 1 - loadouts: - - DetectiveWeaponRevolverInspector - - SecurityOfficerGunCase - - WeaponPistolMk58Gold diff --git a/Resources/Prototypes/_Goobstation/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Goobstation/Loadouts/role_loadouts.yml index 4eb26b4924a..a87222ef81a 100644 --- a/Resources/Prototypes/_Goobstation/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Goobstation/Loadouts/role_loadouts.yml @@ -192,10 +192,10 @@ - MedicalGloves - BrigmedicBackpack - SecurityMelee # EE parity, make corpsman able to carry weapons like the rest of security + - TrinketsSecurityBrigmed # Omu Edit - SecurityShoes - SecurityNeck - SurvivalSecurity - - TrinketsSecurity # Omu - Trinkets - Animals - SecurityStar diff --git a/Resources/Prototypes/_Omu/Catalog/Fills/Items/belts.yml b/Resources/Prototypes/_Omu/Catalog/Fills/Items/belts.yml index f50c7033952..86e3976b88a 100644 --- a/Resources/Prototypes/_Omu/Catalog/Fills/Items/belts.yml +++ b/Resources/Prototypes/_Omu/Catalog/Fills/Items/belts.yml @@ -19,10 +19,21 @@ parent: [ClothingBeltCorpsman, ClothingBeltCorpsmanWebbingFilled] - type: entity - id: ClothingBeltHolsterAmmoFilled + id: ClothingBeltHolsterMagazinePistolFilled parent: ClothingBeltHolster - suffix: Filled, SpeedLoaderMagnum + suffix: Filled, MagazinePistol components: - type: StorageFill contents: - - id: SpeedLoaderMagnum + - id: MagazinePistol + amount: 2 + +- type: entity + id: ClothingBeltHolsterSpeedLoaderRevolverLightRifleFilled # holy name + parent: ClothingBeltHolster + suffix: Filled, SpeedLoaderRevolverLightRifle + components: + - type: StorageFill + contents: + - id: SpeedLoaderRevolverLightRifle + amount: 2 diff --git a/Resources/Prototypes/_Omu/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_Omu/Loadouts/Jobs/Security/security_officer.yml index 0fbaa1e3f4e..429a5d4bdac 100644 --- a/Resources/Prototypes/_Omu/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/_Omu/Loadouts/Jobs/Security/security_officer.yml @@ -13,13 +13,104 @@ equipment: belt: ClothingBeltSheathStunswordFilled -#Pocket1 +#Secoff - type: loadout id: SecurityOfficerGunCase equipment: pocket1: OfficerGunCase + groupBy: "Main weapon" +- type: loadout + id: SecurityOfficerMk58 + dummyEntity: WeaponPistolMk58 + equipment: + pocket1: WeaponPistolMk58 + storage: + back: + - MagazinePistol + - MagazinePistol + groupBy: "Main weapon" + +- type: loadout + id: SecurityOfficerSecurityDutyRevolver + dummyEntity: SecurityDutyRevolver + equipment: + pocket1: SecurityDutyRevolver + storage: + back: + - SpeedLoaderRevolverLightRifle + - SpeedLoaderRevolverLightRifle + groupBy: "Main weapon" + +- type: loadout + id: SecurityOfficerTerminus + equipment: + suitstorage: Terminus + groupBy: "Main weapon" + +#Detective - type: loadout id: DetectiveWeaponRevolverInspector + dummyEntity: WeaponRevolverInspector equipment: - pocket1: WeaponRevolverInspector + belt: ClothingBeltHolsterFilled # Has revolver + ammo inside + groupBy: "Main weapon" + +- type: loadout + id: DetectiveOfficerGunCase + dummyEntity: OfficerGunCase + equipment: + pocket1: OfficerGunCase + belt: ClothingBeltHolster # Empty holster no revolver. they get ammo off the gun case. + groupBy: "Main weapon" + +- type: loadout + id: DetectiveMk58 + dummyEntity: WeaponPistolMk58 + equipment: + pocket1: WeaponPistolMk58 + belt: ClothingBeltHolsterMagazinePistolFilled # 2x mag (same as gun case) in holster + groupBy: "Main weapon" + +- type: loadout + id: DetectiveSecurityDutyRevolver + dummyEntity: SecurityDutyRevolver + equipment: + pocket1: SecurityDutyRevolver + belt: ClothingBeltHolsterSpeedLoaderRevolverLightRifleFilled + groupBy: "Main weapon" + +- type: loadout + id: DetectiveTerminus + equipment: + suitstorage: Terminus + groupBy: "Main weapon" + +- type: loadout + id: DetectiveWeaponPistolMk58Gold + dummyEntity: WeaponPistolMk58Gold + equipment: + pocket1: WeaponPistolMk58Gold + belt: ClothingBeltHolsterMagazinePistolFilled # 2x mag (same as gun case) in holster + groupBy: "Main weapon" + +- type: loadout + id: DetectiveClothingEyesGlassesSecurity + equipment: + eyes: ClothingEyesGlassesSecurity + groupBy: "Detective eyes" + +- type: loadout + id: DetectiveClothingEyesGlassesNoir + equipment: + eyes: ClothingEyesGlassesNoir + groupBy: "Detective eyes" + + +# Brigmed + +- type: loadout + id: BrigmedTerminus + inhand: + - Terminus + groupBy: "Main weapon" diff --git a/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml index c274c507ec2..b3664713579 100644 --- a/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml @@ -138,3 +138,52 @@ - BrigmedicHeadset - BrigmedicAltHeadset +# Security + +- type: loadoutGroup + id: TrinketsSecurity + name: loadout-group-trinkets-job + minLimit: 1 + maxLimit: 1 + loadouts: + - SecurityOfficerGunCase + - SecurityOfficerMk58 + - SecurityOfficerSecurityDutyRevolver + - SecurityOfficerTerminus + - WeaponPistolMk58Gold + +# We have a separate one for detective cause holster +- type: loadoutGroup + id: TrinketsSecurityDetective + name: loadout-group-trinkets-job + minLimit: 1 + maxLimit: 1 + loadouts: + - DetectiveWeaponRevolverInspector # Default for det should be their revolver + - DetectiveOfficerGunCase + - DetectiveMk58 + - DetectiveSecurityDutyRevolver + - DetectiveTerminus + - DetectiveWeaponPistolMk58Gold + +- type: loadoutGroup + id: DetectiveEyes + name: loadout-group-detective-eyes + minLimit: 1 + maxLimit: 1 + loadouts: + - DetectiveClothingEyesGlassesSecurity + - DetectiveClothingEyesGlassesNoir + +# And... a separate one for brigmed cause they cant put the terminus in the suit storage +- type: loadoutGroup + id: TrinketsSecurityBrigmed + name: loadout-group-trinkets-job + minLimit: 1 + maxLimit: 1 + loadouts: + - SecurityOfficerGunCase + - SecurityOfficerMk58 + - SecurityOfficerSecurityDutyRevolver + - BrigmedTerminus + - WeaponPistolMk58Gold