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

Fill Sheriff's Locker & Move SR Access config to their locker. #2819

Merged
merged 4 commits into from
Feb 8, 2025
Merged

Fill Sheriff's Locker & Move SR Access config to their locker. #2819

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
5fbea0c
Fill Sheriff's Locker & Move SR Access config to their locker.
BramvanZijp Jan 31, 2025
3980b6b
No second medal case.
BramvanZijp Jan 31, 2025
c349f60
Move from locker to ptech.
BramvanZijp Feb 8, 2025
50d2175
Update sr.yml
dvir001 Feb 8, 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
9 changes: 1 addition & 8 deletions Resources/Maps/_NF/POI/nfsd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13719,7 +13719,7 @@ entities:
- type: Transform
pos: 7.5,13.5
parent: 1
- proto: LockerNfsdSheriff
- proto: LockerNfsdSheriffFilled
entities:
- uid: 218
components:
Expand Down Expand Up @@ -13850,13 +13850,6 @@ entities:
- type: Transform
pos: 18.5,23.5
parent: 1
- proto: MedalCaseNfsd
entities:
- uid: 72
components:
- type: Transform
pos: 4.382657,9.643819
parent: 1
- proto: MedicalBed
entities:
- uid: 41
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@
- id: MedalCase # Frontier
- id: Demag # Frontier

- type: entity
id: LockerNfsdSheriffFilled
suffix: Filled
parent: LockerNfsdSheriff
components:
- type: StorageFill
contents:
- id: ShriffIDCard
- id: BoxHandcuff # Frontier
- id: CommsComputerCircuitboard # Frontier
- id: MedalCaseNfsd # Frontier
BramvanZijp marked this conversation as resolved.
Show resolved Hide resolved
- id: Demag # Frontier

- type: entity
parent: GunSafe
id: GunSafeSr
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
EncryptionKeyService: 4294967295 #Infinite
EncryptionKeyNfsd: 5
EncryptionKeyCommand: 5
AccessConfigurator: 2

- type: vendingMachineInventory
id: NFPTechNfsdInventory
Expand Down Expand Up @@ -70,3 +71,4 @@
ClothingNeckNfsdBadgeWarden: 10
ClothingNeckNfsdBadgeSheriff: 3
ClothingMaskGasSheriff: 3
AccessConfigurator: 2
1 change: 0 additions & 1 deletion Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,5 @@
- Flash
- RubberStampSr
- DoorRemoteCommand
- AccessConfigurator
- EncryptionKeyStationMaster
- EncryptionKeyCentCom
Loading