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.

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

Update lockers.yml #1241

Merged
merged 5 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 16 additions & 16 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
id: CrateNFSDArmor
parent: CrateNFSDSecure1
id: CrateNfsdArmor
parent: CrateNfsdSecure1
name: nfsd armor crate
description: Three vests of well-rounded, decently-protective armor. Requires Security access to open.
components:
Expand All @@ -10,8 +10,8 @@
amount: 3

- type: entity
id: CrateNFSDHelmet
parent: CrateNFSDSecure1
id: CrateNfsdHelmet
parent: CrateNfsdSecure1
name: nfsd helmet crate
description: Contains three standard-issue brain buckets. Requires Security access to open.
components:
Expand All @@ -21,8 +21,8 @@
amount: 3

- type: entity
id: CrateNFSDNonlethal
parent: CrateNFSDSecure1
id: CrateNfsdNonlethal
parent: CrateNfsdSecure1
name: nfsd nonlethals crate
description: Disabler weapons. Requires Security access to open.
components:
Expand All @@ -39,8 +39,8 @@
# - GrenadeTeargas

- type: entity
id: CrateNFSDRiot
parent: CrateNFSDSecure1
id: CrateNfsdRiot
parent: CrateNfsdSecure1
name: nfsd swat crate
description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
components:
Expand All @@ -59,8 +59,8 @@
# - SecGasmask

- type: entity
id: CrateNFSDSupplies
parent: CrateNFSDSecure1
id: CrateNfsdSupplies
parent: CrateNfsdSecure1
name: nfsd supplies crate
description: Contains various supplies for the station's Security team. Requires Security access to open.
components:
Expand All @@ -73,8 +73,8 @@
# - SpacelawBook

- type: entity
id: CrateNFSDRestraints
parent: CrateNFSDSecure2
id: CrateNfsdRestraints
parent: CrateNfsdSecure2
name: nfsd restraints crate
description: Contains two boxes each of handcuffs and zipties. Requires Security access to open.
components:
Expand All @@ -86,8 +86,8 @@
amount: 2

- type: entity
id: CrateNFSDBioSuit
parent: CrateNFSDSecure2
id: CrateNfsdBioSuit
parent: CrateNfsdSecure2
name: nfsd bio suit crate
description: Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open.
components:
Expand All @@ -101,10 +101,10 @@
amount: 2

- type: entity
id: CrateNFSDImplants
id: CrateNfsdImplants
name: nfsd implanter crate
description: Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open.
parent: CrateNFSDSecure2
parent: CrateNfsdSecure2
components:
- type: StorageFill
contents:
Expand Down
24 changes: 12 additions & 12 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
id: CrateArmorySMGNFSD
parent: CrateNFSDSecure1
id: CrateArmorySMGNfsd
parent: CrateNfsdSecure1
name: nfsd SMG crate
description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open.
components:
Expand All @@ -12,8 +12,8 @@
amount: 4

- type: entity
id: CrateArmoryShotgunNFSD
parent: CrateNFSDSecure1
id: CrateArmoryShotgunNfsd
parent: CrateNfsdSecure1
name: nfsd shotgun crate
description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open.
components:
Expand All @@ -25,8 +25,8 @@
amount: 3

- type: entity
id: CrateTrackingImplantsNFSD
parent: CrateNFSDSecure1
id: CrateTrackingImplantsNfsd
parent: CrateNfsdSecure1
name: nfsd tracking implants
description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of.
components:
Expand All @@ -36,8 +36,8 @@
amount: 5

- type: entity
parent: CrateNFSDSecure2
id: CrateTrainingBombsNFSD
parent: CrateNfsdSecure2
id: CrateTrainingBombsNfsd
name: nfsd training bombs
description: Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open.
components:
Expand All @@ -47,8 +47,8 @@
amount: 3

- type: entity
id: CrateArmoryLaserNFSD
parent: CrateNFSDSecure2
id: CrateArmoryLaserNfsd
parent: CrateNfsdSecure2
name: nfsd lasers crate
description: Contains three standard-issue laser rifles. Requires Armory access to open.
components:
Expand All @@ -58,8 +58,8 @@
amount: 3

- type: entity
id: CrateArmoryPistolsNFSD
parent: CrateNFSDSecure2
id: CrateArmoryPistolsNfsd
parent: CrateNfsdSecure2
name: nfsd pistols crate
description: Contains two standard NT pistols with four mags. Requires Armory access to open.
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi

- type: entity
parent: ClothingBackpackSatchelNfsdBrown
parent: ClothingBackpackDuffelNfsdBrown
id: ClothingBackpackDuffelNfsdCream
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
- type: entity
parent: Holoprojector
parent: HoloprojectorSecurity
id: HoloprojectorNfsd
name: nfsd holobarrier projector
description: Creates a solid but fragile holographic barrier.
components:
- type: HolosignProjector
signProto: HolosignNFSD
chargeUse: 120
- type: Sprite
sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi
state: icon
- type: Tag
tags:
- HolofanProjector
- type: StaticPrice
price: 50
- type: Sprite
sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi
state: icon
- type: HolosignProjector
signProto: HolosignNfsd

- type: entity
parent: HoloprojectorNfsd
id: HoloprojectorNFSDEmpty
parent: HoloprojectorSecurityEmpty
id: HoloprojectorNfsdEmpty
suffix: Empty
components:
- type: Sprite
sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi
state: icon
- type: HolosignProjector
signProto: HolosignNfsd
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
name: power-cell-slot-component-slot-name-default
7 changes: 3 additions & 4 deletions Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
id: BedsheetNFSD
id: BedsheetNfsd
parent: BedsheetBase
name: nfsd bedsheet
components:
Expand All @@ -9,7 +9,7 @@
sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi

- type: entity
id: BedsheetNFSDBrigmed
id: BedsheetNfsdBrigmed
parent: BedsheetBase
name: brigmedic bedsheet
components:
Expand All @@ -19,12 +19,11 @@
sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi

- type: entity
id: BedsheetNFSDSheriff
id: BedsheetNfsdSheriff
parent: BedsheetBase
name: sheriff bedsheet
components:
- type: Sprite
state: sheetnfsdsheriff
- type: Clothing
sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi

68 changes: 2 additions & 66 deletions Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,77 +108,13 @@

- type: entity
name: nfsd deployable barrier
id: NFSDDeployableBarrier
id: NfsdDeployableBarrier
description: A deployable barrier. Swipe your ID card to lock/unlock it.
parent: BaseStructure
parent: DeployableBarrier
components:
- type: Transform
anchored: false
noRot: true
- type: Sprite
sprite: _NF/Objects/Specific/Security/nfsdbarrier.rsi
layers:
- state: idle
- state: locked
map: ["enum.LockVisualLayers.Lock"]
- type: Appearance
- type: LockVisuals
- type: InteractionOutline
- type: Physics
bodyType: Dynamic
canCollide: false
- type: Fixtures
fixtures:
base:
shape:
!type:PhysShapeCircle
radius: 0.45
density: 75
mask:
- MachineMask
barrier:
shape:
!type:PhysShapeCircle
radius: 0.45
layer:
- WallLayer
- type: DeployableBarrier
fixture: barrier
- type: AccessReader
access: [["Security"]]
- type: Lock
locked: false
lockOnClick: true # toggle lock just by clicking on barrier
lockTime: 5
unlockTime: 5
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 600
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 300
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel:
min: 5
max: 5
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: PointLight
enabled: false
radius: 3
color: red
- type: StaticPrice
price: 200
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#Filled security
- type: entity
id: JetpackNfsdFilled
parent: [JetpackSecurity, JetpackSecurityFilled]
parent: [JetpackNfsd, JetpackSecurityFilled]
name: nfsd jetpack
suffix: Filled
components:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
id: BannerNFSD
id: BannerNfsd
parent: BannerBase
name: nfsd banner
description: A banner displaying the colors of the new frontier sheriff's department. # Frontier - description change
Expand All @@ -12,7 +12,7 @@
node: BannerSecurityNode # Frontier

- type: entity
id: FlagNFSD
id: FlagNfsd
parent: BannerBase
name: nfsd flag
description: A flag displaying the colors of the new frontier sheriff's department. # Frontier - description change
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
tag: DockTransit

- type: entity
parent: AirlockNFSDGlass
id: AirlockNFSDGlassLocked
parent: AirlockNfsdGlass
id: AirlockNfsdGlassLocked
suffix: NFSD, Locked
components:
- type: AccessReader
Expand All @@ -93,8 +93,8 @@
layoutId: AirlockSecurity

- type: entity
parent: AirlockNFSD
id: AirlockNFSDLocked
parent: AirlockNfsd
id: AirlockNfsdLocked
suffix: NFSD, Locked
components:
- type: AccessReader
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

- type: entity
parent: Airlock
id: AirlockNFSD
id: AirlockNfsd
suffix: NFSD
components:
- type: Sprite
Expand All @@ -28,7 +28,7 @@
#Glass
- type: entity
parent: AirlockGlass
id: AirlockNFSDGlass
id: AirlockNfsdGlass
suffix: NFSD
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
id: HolosignNFSD
id: HolosignNfsd
parent: HolosignWetFloor
name: nfsd holographic barrier
description: A barrier of hard light that blocks movement, but pretty weak.
Expand Down
Loading
Loading