Skip to content
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

Security Lockers Trim #633

Merged
merged 2 commits into from
Dec 4, 2023
+139 −125
Merged

Security Lockers Trim #633

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
f8ab8a6
Security
dvir001 Dec 2, 2023
0d9e373
Update security.yml
dvir001 Dec 2, 2023
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
38 changes: 17 additions & 21 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,20 +313,20 @@
components:
- type: StorageFill
contents:
- id: ClothingEyesHudSecurity
- id: WeaponDisabler
# - id: ClothingEyesHudSecurity
# - id: WeaponDisabler
- id: ClothingHeadHatBeretHoS
- id: ClothingHeadHatHoshat
- id: ClothingNeckCloakHos
- id: ClothingOuterCoatHoSTrench
# - id: ClothingNeckCloakHos # Frontier - Moved to starting gear
# - id: ClothingOuterCoatHoSTrench
- id: ClothingUniformJumpskirtHoSAlt
- id: ClothingUniformJumpsuitHoSAlt
- id: ClothingOuterHardsuitSecurityRed
- id: ClothingMaskGasSwat
- id: ClothingBeltSecurityFilled
# - id: ClothingBeltSecurityFilled
- id: ClothingHeadsetAltSecurity
- id: ClothingEyesGlassesSecurity
- id: ClothingShoesBootsJack
# - id: ClothingEyesGlassesSecurity
# - id: ClothingShoesBootsJack
# - id: CigarGoldCase # Frontier
# prob: 0.50
# - id: DoorRemoteSecurity # Frontier
Expand All @@ -337,10 +337,9 @@
# - id: JetpackSecurityFilled # Frontier
- id: BoxEncryptionKeySecurity
- id: HoloprojectorSecurity
- id: ClothingNeckMantleHOS # Frontier
- id: CrowbarRed # Frontier
- id: NitrogenTankFilled # Frontier
- id: OxygenTankFilled # Frontier
# - id: NitrogenTankFilled
# - id: OxygenTankFilled
- id: AirTankFilled
- id: JetpackSecurityFilled # Frontier
- id: HandheldGPSBasic # Frontier
- id: ClothingShoesBootsMagCombatFilled # Frontier
Expand All @@ -352,18 +351,18 @@
components:
- type: StorageFill
contents:
- id: ClothingEyesHudSecurity
- id: WeaponDisabler
# - id: ClothingEyesHudSecurity
# - id: WeaponDisabler
- id: ClothingHeadHatBeretHoS
- id: ClothingHeadHatHoshat
- id: ClothingNeckCloakHos
- id: ClothingOuterCoatHoSTrench
# - id: ClothingNeckCloakHos # Frontier - Moved to starting gear
# - id: ClothingOuterCoatHoSTrench
- id: ClothingUniformJumpskirtHoSAlt
- id: ClothingUniformJumpsuitHoSAlt
- id: ClothingBeltSecurityFilled
# - id: ClothingBeltSecurityFilled
- id: ClothingHeadsetAltSecurity
- id: ClothingEyesGlassesSecurity
- id: ClothingShoesBootsJack
# - id: ClothingEyesGlassesSecurity
# - id: ClothingShoesBootsJack
# - id: CigarGoldCase # Frontier
# prob: 0.50
# - id: DoorRemoteSecurity # Frontier
Expand All @@ -374,6 +373,3 @@
- id: BoxEncryptionKeySecurity
- id: HoloprojectorSecurity
# - id: BookSecretDocuments # Frontier
- id: ClothingNeckMantleHOS # Frontier
- id: ClothingOuterWinterHoS # Frontier
- id: CrowbarRed # Frontier
83 changes: 40 additions & 43 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
components:
- type: StorageFill
contents:
- id: FlashlightSeclite
- id: WeaponDisabler
# - id: FlashlightSeclite # Frontier
# - id: WeaponDisabler
- id: ClothingHeadHatWarden
- id: ClothingHeadHatBeretWarden
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
# - id: ClothingBeltSecurityFilled
# - id: Flash
# - id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetAltSecurityWarden # Frontier
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
# - id: ClothingHandsGlovesCombat
# - id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: RubberStampWarden
# - id: DoorRemoteArmory
- id: ClothingOuterHardsuitWarden
- id: HoloprojectorSecurity
- id: ClothingEyesHudSecurity
- id: CrowbarRed # Frontier
- id: NitrogenTankFilled # Frontier
- id: OxygenTankFilled # Frontier
# - id: HoloprojectorSecurity # Frontier - Starting gear
# - id: ClothingEyesHudSecurity
# - id: NitrogenTankFilled
# - id: OxygenTankFilled
- id: AirTankFilled
- id: ClothingMaskGasSecurity # Frontier
- id: JetpackSecurityFilled # Frontier
- id: HandheldGPSBasic # Frontier
Expand All @@ -37,23 +37,22 @@
components:
- type: StorageFill
contents:
- id: FlashlightSeclite
- id: WeaponDisabler
# - id: FlashlightSeclite
# - id: WeaponDisabler
- id: ClothingHeadHatWarden
- id: ClothingHeadHatBeretWarden
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
# - id: ClothingBeltSecurityFilled
# - id: Flash
# - id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetAltSecurityWarden # Frontier
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
# - id: ClothingHandsGlovesCombat
# - id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: RubberStampWarden
# - id: DoorRemoteArmory
- id: HoloprojectorSecurity
- id: ClothingEyesHudSecurity
- id: CrowbarRed # Frontier
# - id: HoloprojectorSecurity # Frontier - Starting gear
# - id: ClothingEyesHudSecurity

- type: entity
id: LockerSecurityFilled
Expand All @@ -62,21 +61,20 @@
components:
- type: StorageFill
contents:
- id: FlashlightSeclite
- id: ClothingUniformJumpsuitSecGrey
prob: 0.3
# - id: FlashlightSeclite
# - id: ClothingUniformJumpsuitSecGrey
# prob: 0.3
- id: ClothingHeadHelmetBasic
- id: ClothingOuterArmorBasic
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
# - id: ClothingBeltSecurityFilled
# - id: Flash
# - id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetSecuritySafe # Ask SR or Sheriff for keys
- id: ClothingHandsGlovesColorBlack
- id: ClothingShoesBootsJack
- id: WeaponMeleeNeedle
prob: 0.1
- id: ClothingEyesHudSecurity
- id: CrowbarRed # Frontier
# - id: ClothingHandsGlovesColorBlack
# - id: ClothingShoesBootsJack
# - id: WeaponMeleeNeedle
# prob: 0.1
# - id: ClothingEyesHudSecurity

- type: entity
id: LockerDetectiveFilled
Expand All @@ -85,17 +83,16 @@
components:
- type: StorageFill
contents:
- id: ClothingEyesHudSecurity
- id: ClothingHeadHatFedoraBrown
- id: ClothingNeckTieDet
# - id: ClothingEyesHudSecurity
# - id: ClothingHeadHatFedoraBrown
# - id: ClothingNeckTieDet
- id: ClothingOuterVestDetective
- id: ClothingOuterCoatDetective
- id: FlashlightSeclite
# - id: ClothingOuterCoatDetective
# - id: FlashlightSeclite
- id: ForensicScanner
- id: BoxForensicPad
- id: DrinkDetFlask
- id: ClothingHandsGlovesForensic
- id: CrowbarRed # Frontier

- type: entity
id: ClosetBombFilled
Expand All @@ -108,11 +105,11 @@
- id: ClothingOuterSuitBomb
# NT is cheap, what can you do...
- id: Wirecutter
prob: 0.9
# prob: 0.9 # Frontier - Always has this
- id: Screwdriver
prob: 0.9
# prob: 0.9 # Frontier - Always has this
- id: Multitool
prob: 0.5
# prob: 0.5 # Frontier - Always has this

- type: entity
parent: GunSafe
Expand Down
29 changes: 16 additions & 13 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
- type: vendingMachineInventory
id: SecTechInventory
startingInventory:
Handcuffs: 12
GrenadeFlashBang: 14
Flash: 15
FlashlightSeclite: 15
ClothingEyesGlassesSunglasses: 12
ClothingEyesHudSecurity: 12
ClothingBeltSecurityWebbing: 15
Zipties: 20
RiotShield: 12
RiotLaserShield: 12
RiotBulletShield: 12
Handcuffs: 10
Zipties: 10
GrenadeFlashBang: 10
Flash: 10
FlashlightSeclite: 10
ClothingEyesGlassesSunglasses: 5
ClothingEyesGlassesSecurity: 5 # Frontier
ClothingEyesHudSecurity: 10
ClothingBeltSecurityWebbing: 10
ClothingBeltSecurity: 10 # Frontier
RiotShield: 3
RiotLaserShield: 3
RiotBulletShield: 3
Stunbaton: 10
WeaponDisabler: 10
CrowbarRed: 10 # Frontier
# security officers need to follow a diet regimen!
contrabandInventory:
FoodDonutHomer: 12
FoodBoxDonut: 12
FoodDonutHomer: 3 # Frontier - No more then 3
FoodBoxDonut: 3 # Frontier - No more then 3
#box evidence
16 changes: 12 additions & 4 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,29 @@
ClothingBackpackSecurity: 3
ClothingBackpackSatchelSecurity: 3
ClothingBackpackDuffelSecurity: 3
ClothingUniformJumpsuitSec: 3
ClothingShoesBootsJack: 3
ClothingHeadHatBeretBrigmedic: 3
ClothingHeadHatBeretSecurity: 3
ClothingHeadHatSecsoft: 3
ClothingHeadBandRed: 3
ClothingHandsGlovesColorBlack: 3
ClothingHandsGlovesFingerless: 3
ClothingHandsGlovesCombat: 3 # Frontier - Officers just walk around with yellow insulated gloves if you wont sell the combat gloves.
# ClothingHandsGlovesColorBlack: 3 # Frontier - No point in selling this, its like the none insulated gloves.
ClothingHandsGlovesFingerless: 3 # Frontier - Leave this for the looks.
ClothingUniformJumpsuitSec: 3
ClothingUniformJumpskirtSec: 3
ClothingUniformJumpsuitSecGrey: 3
ClothingUniformJumpskirtSecGrey: 3
ClothingUniformJumpsuitSecBlue: 3
ClothingHeadsetSecuritySafe: 3 # Frontier - Ask SR or Sheriff for keys
ClothingUniformJumpsuitBrigmedic: 3
ClothingUniformJumpskirtBrigmedic: 3
ClothingOuterWinterSec: 2
ClothingHeadHelmetBasic: 2 # Frontier
ClothingOuterArmorBasic: 2
ClothingOuterArmorBasicSlim: 2
ClothingOuterCoatAMG: 2
ClothingEyesBlindfold: 1
ClothingShoesBootsJack: 3
ClothingShoesBootsCombat: 1
ClothingShoesBootsMagCombat: 1 # Frontier
contrabandInventory:
ClothingUniformJumpskirtOfLife: 1
1 change: 1 addition & 0 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 @@ -32,6 +32,7 @@
id: DetectivePDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltHolsterFilled
gloves: ClothingHandsGlovesCombat # Frontier
innerClothingSkirt: ClothingUniformJumpskirtDetective
satchel: ClothingBackpackSatchelSecurityFilledDetective
duffelbag: ClothingBackpackDuffelSecurityFilledDetective
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
ears: ClothingHeadsetAltSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
pocket2: HoloprojectorSecurity # Frontier
neck: ClothingNeckCloakHos # Frontier
innerClothingSkirt: ClothingUniformJumpskirtHoS
satchel: ClothingBackpackSatchelHOSFilled
duffelbag: ClothingBackpackDuffelHOSFilled
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
id: SecurityCadetPDA
ears: ClothingHeadsetSecurity
pocket1: WeaponPistolMk58Nonlethal
gloves: ClothingHandsGlovesCombat # Frontier
innerClothingSkirt: ClothingUniformJumpskirtColorRed
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
1 change: 1 addition & 0 deletions 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 @@ -33,6 +33,7 @@
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
gloves: ClothingHandsGlovesCombat # Frontier
innerClothingSkirt: ClothingUniformJumpskirtSec
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
gloves: ClothingHandsGlovesCombat # Frontier
innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/warden.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
ears: ClothingHeadsetAltSecurityWarden # Frontier
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
pocket2: HoloprojectorSecurity # Frontier
gloves: ClothingHandsGlovesCombat # Frontier
innerClothingSkirt: ClothingUniformJumpskirtWarden
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
Loading
Loading