Skip to content

[Fix] & tweaks. Reorganize Security Loadouts. #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NotActuallyMarty wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Fix] & tweaks. Reorganize Security Loadouts. #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
631f8fa
Fix loadouts
NotActuallyMarty Jan 18, 2026
2fec395
HyperYaml
NotActuallyMarty Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Goobstation.Shared/Clothing/Systems/SharedAltClothingLayerSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private void OnVerb(Entity<AltClothingLayerComponent> ent, ref GetVerbsEvent<Alt
},
Text = ent.Comp.AltStyle ? Loc.GetString(ent.Comp.ChangeToDefaultMessage) : Loc.GetString(ent.Comp.ChangeToAltMessage),
Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/flip.svg.192dpi.png")),
Priority = 1,
Priority = -10, // Omu
};

args.Verbs.Add(verb);
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/_Omu/loadouts/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 5 additions & 3 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,12 @@
- WardenJumpsuit
- SecurityBackpack
- SecurityMelee # Goobstation
- TrinketsSecurity # Omu Edit
- SecurityNeck
- SecurityBelt
- WardenOuterClothing
- SecurityShoes
- SurvivalSecurity
- TrinketsSecurity # Omu Edit
- Trinkets
- SecurityStar
- Animals
Expand All @@ -634,13 +634,13 @@
- SecurityJumpsuit
- SecurityBackpack
- SecurityMelee # Goobstation
- TrinketsSecurity # Omu Edit
- SecurityOuterClothing
- SecurityShoes
- SecurityNeck
- SecurityPDA
- SecurityBelt
- SurvivalSecurity
- TrinketsSecurity # Omu Edit
- Trinkets
- SecurityStar
- Animals
Expand All @@ -654,13 +654,15 @@
id: JobDetective
groups:
- DetectiveHead
- DetectiveEyes # Omu edit
- DetectiveNeck
- DetectiveJumpsuit
- SecurityBackpack
- SecurityMelee # Omu edit
- TrinketsSecurityDetective # Omu Edit
- DetectiveOuterClothing
- SecurityShoes
- SurvivalSecurity
- TrinketsSecurity # Omu Edit
- Trinkets
- SecurityStar
- Animals
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Security/detective.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ClothingBeltHolsterFilled
#belt: ClothingBeltHolsterFilled # Omu Moved to loadout
storage:
back:
- Flash
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
storage:
back:
- Flash
- MagazinePistol
#- MagazinePistol # Omu moved to loadouts and will give ammo based on gun

- type: chameleonOutfit
id: SecurityOfficerChameleonOutfit
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Security/warden.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
storage:
back:
- Flash
- MagazinePistol
#- MagazinePistol # Omu moved to loadouts and will give ammo according to weapon
- ClothingMaskGasSecurity # Goobstation

- type: chameleonOutfit
Expand Down
6 changes: 5 additions & 1 deletion Resources/Prototypes/_Gabystation/Loadouts/Jobs/Security/Security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 0 additions & 8 deletions Resources/Prototypes/_Gabystation/loadout_groups.yml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion Resources/Prototypes/_Goobstation/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
- MedicalGloves
- BrigmedicBackpack
- SecurityMelee # EE parity, make corpsman able to carry weapons like the rest of security
- TrinketsSecurityBrigmed # Omu Edit
- SecurityShoes
- SecurityNeck
- SurvivalSecurity
Expand Down Expand Up @@ -264,5 +265,5 @@
- Trinkets
- GroupSpeciesBreathToolMedical
- VirologistEnvirohelm # Omu
- VirologistEnvirosuit # Omu
- VirologistEnvirosuit # Omu
- VirologistEnvirogloves # Omu
20 changes: 20 additions & 0 deletions Resources/Prototypes/_Omu/Catalog/Fills/Items/belts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,23 @@
- type: entity
id: ClothingBeltCorpsmanFilled
parent: [ClothingBeltCorpsman, ClothingBeltCorpsmanWebbingFilled]

- type: entity
id: ClothingBeltHolsterMagazinePistolFilled
parent: ClothingBeltHolster
suffix: Filled, MagazinePistol
components:
- type: StorageFill
contents:
- id: MagazinePistol
amount: 2

- type: entity
id: ClothingBeltHolsterSpeedLoaderRevolverLightRifleFilled # holy name
parent: ClothingBeltHolster
suffix: Filled, SpeedLoaderRevolverLightRifle
components:
- type: StorageFill
contents:
- id: SpeedLoaderRevolverLightRifle
amount: 2
99 changes: 97 additions & 2 deletions Resources/Prototypes/_Omu/Loadouts/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,104 @@
equipment:
belt: ClothingBeltSheathStunswordFilled

#Backpack
#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:
- OfficerGunCase
- SpeedLoaderRevolverLightRifle
- SpeedLoaderRevolverLightRifle
groupBy: "Main weapon"

- type: loadout
id: SecurityOfficerTerminus
equipment:
suitstorage: Terminus
groupBy: "Main weapon"

#Detective
- type: loadout
id: DetectiveWeaponRevolverInspector
dummyEntity: WeaponRevolverInspector
equipment:
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"
49 changes: 49 additions & 0 deletions Resources/Prototypes/_Omu/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading