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

LockerFill tweaks #34467

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+22 −46
Open

LockerFill tweaks #34467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5af663
Changed security things
Nox38 Jan 16, 2025
4d5ef03
removed air masks from suit lockers
Nox38 Jan 16, 2025
890a71e
Reverted a few changes
Nox38 Jan 16, 2025
a74ce47
Added kosticia's changes
Nox38 Jan 17, 2025
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
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
- id: ClothingUniformJumpsuitHosFormal
- id: ClothingOuterWinterHoS
- id: ClothingNeckCloakHos
- id: ClothingMaskNeckGaiter

- type: entity
id: DresserQuarterMasterFilled
Expand Down Expand Up @@ -106,5 +107,8 @@
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitWarden
- id: ClothingUniformJumpskirtWarden
- id: ClothingHeadHatWarden
- id: ClothingHeadHatBeretWarden
- id: ClothingOuterWinterWarden
3 changes: 1 addition & 2 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 @@ -320,11 +320,10 @@
- id: ClothingBeltSecurityFilled
- id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetAltSecurity
- id: ClothingMaskNeckGaiter
- id: FlashlightSeclite
- id: ClothingOuterCoatHoSTrench
- id: ClothingShoesBootsJack
- id: DoorRemoteSecurity
- id: HoloprojectorSecurity
- id: RubberStampHos
- id: SecurityTechFabCircuitboard
- id: WeaponDisabler
Expand Down
35 changes: 13 additions & 22 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 @@ -8,17 +8,16 @@
- id: FlashlightSeclite
- id: WeaponDisabler
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: ClothingOuterHardsuitWarden
- id: HoloprojectorSecurity
- id: BookSpaceLaw
- id: HandLabeler
- id: Multitool
- id: ClothingBackpackElectropack
amount: 2
- id: RemoteSignaller
Expand All @@ -34,16 +33,15 @@
- id: FlashlightSeclite
- id: WeaponDisabler
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSecurity
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: HoloprojectorSecurity
- id: BookSpaceLaw
- id: HandLabeler
- id: Multitool
- id: ClothingBackpackElectropack
amount: 2
- id: RemoteSignaller
Expand All @@ -57,23 +55,18 @@
- type: StorageFill
contents:
- id: FlashlightSeclite
prob: 0.8
- id: WeaponDisabler
- id: ClothingUniformJumpsuitSecGrey
prob: 0.3
- id: ClothingHeadHelmetBasic
- id: ClothingOuterArmorBasic
- id: ClothingBeltSecurityFilled
- id: Flash
prob: 0.5
- id: Tourniquet
- id: ClothingEyesGlassesSecurity
- id: ClothingHeadsetSecurity
- id: ClothingHandsGlovesColorBlack
- id: ClothingShoesBootsJack
- id: WeaponMeleeNeedle
prob: 0.1
- id: HoloprojectorSecurity
prob: 0.6
- id: BookSpaceLaw
prob: 0.5

Expand Down Expand Up @@ -119,20 +112,16 @@
components:
- type: StorageFill
contents:
- id: ClothingEyesGlassesSecurity
prob: 0.3
- id: ClothingHeadHatFedoraBrown
- id: ClothingNeckTieDet
- id: ClothingOuterVestDetective
- id: ClothingOuterCoatDetective
- id: ClothingEyesGlassesSecurity
- id: FlashlightSeclite
- id: ClothingHeadsetSecurity
- id: ForensicScanner
- id: LogProbeCartridge
- id: HoloprojectorSecurity
- id: BoxForensicPad
- id: DrinkDetFlask
- id: ClothingHandsGlovesForensic
- id: RubberStampDetective
- id: HoloprojectorSecurity
Nox38 marked this conversation as resolved.
Show resolved Hide resolved
- id: BoxEvidenceMarkers
- id: HandLabeler

Expand All @@ -148,7 +137,9 @@
- id: Wirecutter
- id: Screwdriver
- id: Multitool
prob: 0.5
- id: d10Dice
prob: 0.2


- type: entity
parent: [GunSafeBaseSecure, BaseRestrictedContraband]
Expand Down Expand Up @@ -216,9 +207,9 @@
- type: StorageFill
contents:
- id: WeaponShotgunKammerer
amount: 2
amount: 3
- id: BoxLethalshot
amount: 2
amount: 3

- type: entity
id: GunSafeSubMachineGunWt550
Expand Down
14 changes: 0 additions & 14 deletions Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitEVA
- id: ClothingHeadHelmetEVA
- id: ClothingMaskBreath

#Basic EVA (Big Ass Helmet)
- type: entity
Expand All @@ -23,7 +22,6 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitEVA
- id: ClothingHeadHelmetEVALarge
- id: ClothingMaskBreath

#Emergency EVA
- type: entity
Expand All @@ -35,7 +33,6 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterSuitEmergency
- id: ClothingMaskBreath

#Prisoner EVA
- type: entity
Expand All @@ -48,7 +45,6 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitEVAPrisoner
- id: ClothingHeadHelmetEVALarge
- id: ClothingMaskBreath

#Syndicate EVA
- type: entity
Expand All @@ -73,7 +69,6 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitPirateEVA
- id: ClothingMaskGas

#NTSRA Voidsuit
- type: entity
Expand All @@ -86,7 +81,6 @@
- id: JetpackVoidFilled
- id: ClothingOuterHardsuitAncientEVA
- id: ClothingHeadHelmetAncient
- id: ClothingMaskBreath

#HARDSUITS
#Basic hardsuit
Expand All @@ -99,7 +93,6 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitBasic
- id: ClothingMaskBreath

#Engineering hardsuit
- type: entity
Expand All @@ -112,7 +105,6 @@
- id: OxygenTankFilled
- id: ClothingShoesBootsMag
- id: ClothingOuterHardsuitEngineering
- id: ClothingMaskBreath
- type: AccessReader
access: [["Engineering"]]

Expand All @@ -126,7 +118,6 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitAtmos
- id: ClothingMaskBreath
- type: AccessReader
access: [["Atmospherics"]]

Expand All @@ -140,7 +131,6 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitSecurity
- id: ClothingMaskBreath
- type: AccessReader
access: [["Security"]]

Expand Down Expand Up @@ -206,7 +196,6 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitWarden
- id: ClothingMaskBreath
- type: AccessReader
access: [["Armory"]]

Expand Down Expand Up @@ -247,7 +236,6 @@
- id: OxygenTankFilled
- id: ClothingOuterHardsuitSyndie
- id: ClothingShoesBootsMagSyndie
- id: ClothingMaskGasSyndicate
Nox38 marked this conversation as resolved.
Show resolved Hide resolved

#Pirate Captain's hardsuit
- type: entity
Expand All @@ -259,7 +247,6 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitPirateCap
- id: ClothingMaskGas

#Wizard
- type: entity
Expand All @@ -271,4 +258,3 @@
contents:
- id: OxygenTankFilled
- id: ClothingOuterHardsuitWizard
- id: ClothingMaskBreath
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
ClothingOuterVestDetective: 2
ClothingNeckTieDet: 2
ClothingHeadHatFedoraGrey: 2
ClothingHandsGlovesForensic: 2
ClothingHandsGlovesColorBlack: 2
Nox38 marked this conversation as resolved.
Show resolved Hide resolved
ClothingHandsGlovesLatex: 2
Nox38 marked this conversation as resolved.
Show resolved Hide resolved
ClothingHeadsetSecurity: 2
9 changes: 3 additions & 6 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@
ClusterBangFull: 2
GrenadeStinger: 4
Flash: 5
Tourniquet: 5
Tourniquet: 6
FlashlightSeclite: 5
ClothingEyesGlassesSunglasses: 2
ClothingEyesGlassesSunglasses: 4
ClothingEyesHudSecurity: 2
ClothingEyesEyepatchHudSecurity: 2
ClothingBeltSecurityWebbing: 5
CombatKnife: 3
CombatKnife: 6
Zipties: 12
RiotShield: 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shields should be probably available roundstart because them are pretty useless

Copy link
Contributor Author

@Nox38 Nox38 Jan 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can either put them back in the sectech, or map them into the armory where they logically should be. What do you think?

RiotLaserShield: 2
RiotBulletShield: 2
RadioHandheldSecurity: 5
# security officers need to follow a diet regimen!
contrabandInventory:
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
ClothingNeckScarfStripedRed: 3
ClothingOuterArmorBasicSlim: 2
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingHeadHelmetJustice: 1
contrabandInventory:
Expand Down
Loading