Skip to content

Commit

Permalink
04/01/2024 - NFSD Addons (#1183)
Browse files Browse the repository at this point in the history
* 04/01/2024 - NFSD Addons

Experimental hardsuit, Suit/wall storage for each NFSD role, updated over ear headsets to include encrpyts, added crates and crate filled variants, locked/unlocked nfsd colored doors, NFSDDrobe and inventory/ads, brigmedic filled locker, jetpack, sheriff stamp. Probably other things I'm forgetting.

* Update to fix things....

removed helmet files from suit files...

* 04/02/2024

Updated Headsets to have "safe" variants, removing the NFSD key on purchase.

Updated Lockers to remove filled variants, and will update the drove/vending machine to add additional amounts of things people can purchase
-> This will make lockers work in a locker capacity so NFSD employees can use them for their item storage, rather than just clutter.

* 04/02/2024

Added updated Brigmedic badge.

* 04/04/2024

Added SecTec w/ inventory and Helmet

* 04/04/2024

Fixed small bit of yml for SecTec

* Fix

* 04/05/2024

READDED BRIGMEDIC STUFF FOR DARIN

* 04/05/2024

FIXED AGAIN THANKS DARIN

* 04/05/2024

Added updated banners and NFSD shipyard console/tabletop console.

* 04/05/2024

Added restock crates for the NFSDDrobe and NFSDTec vending machines.

* 04/05/2024

Updated NFSD Helmet crate to include actual NFSD helmets and added the updated deployable barrier. Also added the new NFSDFab with relevant inventory. (Circuit Board still pending)

* 04/05/2024

Pushed updated to fix yml for nfsdfab

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: checkraze <[email protected]>
  • Loading branch information
3 people authored Apr 8, 2024
1 parent 96823eb commit 0fa3e75
Show file tree
Hide file tree
Showing 173 changed files with 2,052 additions and 130 deletions.
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/advertisements/vending/nfsddrobe.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
advertisement-nfsddrobe-1 = Looking To 'Cop' A Fresh Look?
advertisement-nfsddrobe-2 = From Boots to Caps, We Got Your Back
advertisement-nfsddrobe-3 = Enforce Fashion With Arresting Attire
advertisement-nfsddrobe-4 = Serve Justice, Look Fabulous!
advertisement-nfsddrobe-5 = Now you can wear your brown pants too
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
- id: RubberStampHos # Frontier
- id: RubberStampSheriff # Frontier
- id: DoorRemoteSecurity # Frontier
- id: SecurityTechFabCircuitboard # Frontier
- id: BaseSecurityUplinkRadioSheriff # Frontier
Expand Down Expand Up @@ -399,3 +399,4 @@
- id: BoxSurvivalBrigmedic
- id: Flash
- id: FrontierUplinkCoin5
- id: EncryptionKeyMedical
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
- id: RubberStampHos # Frontier
- id: RubberStampSheriff # Frontier
- id: DoorRemoteSecurity # Frontier
- id: SecurityTechFabCircuitboard # Frontier
- id: BaseSecurityUplinkRadioSheriff # Frontier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
- id: BoxSurvivalSecurity
- id: Flash
- id: MagazinePistol
- id: RubberStampHos # Frontier
- id: RubberStampSheriff # Frontier
- id: DoorRemoteSecurity # Frontier
- id: SecurityTechFabCircuitboard # Frontier
- id: BaseSecurityUplinkRadioSheriff # Frontier
Expand Down
118 changes: 96 additions & 22 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,99 @@
- type: entity
id: LockerBrigmedicFilledHardsuit
suffix: Filled, Hardsuit
parent: LockerBrigmedic
components:
- type: StorageFill
contents:
# - id: ClothingEyesHudSecurity
# - id: WeaponDisabler
- id: ClothingOuterHardsuitBrigmedic
- id: BoxSterileMask
# - id: ClothingHeadHatBeretBrigmedic
# - id: ClothingOuterCoatAMG
# - id: ClothingUniformJumpsuitBrigmedic
# - id: ClothingUniformJumpskirtBrigmedic
# - id: ClothingUniformJumpskirtOfLife
# prob: 0.1
- id: MedkitFilled
- id: MedkitCombatFilled
# prob: 0.6
- id: MedkitAdvancedFilled
# prob: 0.4
# - id: MedkitOxygenFilled
# prob: 0.3
# - id: MedkitBruteFilled
# prob: 0.3
# - id: MedkitToxinFilled
# prob: 0.3
# - id: MedkitBurnFilled
# prob: 0.7
# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
# prob: 0.15
# - id: NitrogenTankFilled
# - id: OxygenTankFilled
- id: AirTankFilled
- id: ClothingMaskBreathMedicalSecurity
- id: JetpackSecurityFilled
- id: HandheldGPSBasic
- id: ClothingShoesBootsMagCombatFilled
- id: HypoBrigmedic # Frontier

- type: entity
id: LockerBrigmedicFilled
suffix: Filled
parent: LockerBrigmedic
components:
- type: StorageFill
contents:
# - id: ClothingEyesHudSecurity
# - id: WeaponDisabler
- id: BoxSterileMask
# - id: ClothingHeadHatBeretBrigmedic
# - id: ClothingOuterCoatAMG
# - id: ClothingUniformJumpsuitBrigmedic
# - id: ClothingUniformJumpskirtBrigmedic
# - id: ClothingUniformJumpskirtOfLife
# prob: 0.1
- id: MedkitFilled
- id: MedkitCombatFilled
# prob: 0.6
- id: MedkitAdvancedFilled
# prob: 0.4
# - id: MedkitOxygenFilled
# prob: 0.3
# - id: MedkitBruteFilled
# prob: 0.3
# - id: MedkitToxinFilled
# prob: 0.3
# - id: MedkitBurnFilled
# prob: 0.7
# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
# prob: 0.15
- id: HypoBrigmedic # Frontier

- type: entity
id: LockerSecurityFilled
suffix: Filled
parent: LockerSecurity
components:
- type: StorageFill
contents:
# - id: FlashlightSeclite
# - id: ClothingUniformJumpsuitSecGrey
# prob: 0.3
- id: ClothingHeadHelmetBasic
- id: ClothingOuterArmorBasic
# - 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

- type: entity
id: LockerWardenFilledHardsuit
suffix: Filled, Hardsuit
Expand Down Expand Up @@ -55,28 +151,6 @@
# - id: HoloprojectorSecurity # Frontier - Starting gear
# - id: ClothingEyesHudSecurity

- type: entity
id: LockerSecurityFilled
suffix: Filled
parent: LockerSecurity
components:
- type: StorageFill
contents:
# - id: FlashlightSeclite
# - id: ClothingUniformJumpsuitSecGrey
# prob: 0.3
- id: ClothingHeadHelmetBasic
- id: ClothingOuterArmorBasic
# - 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

- type: entity
id: LockerDetectiveFilled
suffix: Filled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
- type: ConditionalSpawner
prototypes:
- VendingMachineRestockRobustSoftdrinks
- VendingMachineRestockHotDrinks
- VendingMachineRestockHotDrinks
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

- type: entity
noSpawn: true
parent: ClothingBackpackSecurity
parent: ClothingBackpacknfsd
id: ClothingBackpackOfficerFilled
components:
- type: StorageFill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelSecurity
parent: ClothingBackpackDuffelnfsd
id: ClothingBackpackDuffelOfficerFilled
components:
- type: StorageFill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelSecurity
parent: ClothingBackpackSatchelnfsd
id: ClothingBackpackSatchelOfficerFilled
components:
- type: StorageFill
Expand Down
116 changes: 116 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
- type: entity
id: CrateNFSDArmor
parent: CratenfsdSecure1
name: nfsd armor crate
description: Three vests of well-rounded, decently-protective armor. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorNfsdArmor
amount: 3

- type: entity
id: CrateNFSDHelmet
parent: CratenfsdSecure1
name: nfsd helmet crate
description: Contains three standard-issue brain buckets. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: ClothingHeadHelmetNFSD
amount: 3

- type: entity
id: CrateNFSDNonlethal
parent: CratenfsdSecure1
name: nfsd nonlethals crate
description: Disabler weapons. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: WeaponDisabler
amount: 3
- id: Stunbaton
amount: 3
- id: BoxFlashbang
- id: Flash
amount: 3
# - Pepperspray
# - GrenadeTeargas

- type: entity
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:
- type: StorageFill
contents:
- id: ClothingOuterArmorRiot
amount: 2
- id: ClothingHeadHelmetRiot
amount: 2
- id: WeaponShotgunEnforcerRubber
amount: 2
- id: BoxBeanbag
amount: 2
- id: RiotShield
amount: 2
# - SecGasmask

- type: entity
id: CrateNFSDSupplies
parent: CratenfsdSecure1
name: nfsd supplies crate
description: Contains various supplies for the station's Security team. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: BoxHandcuff
- id: BoxSechud
# - SecBelt
# - SecGasmask
# - SpacelawBook

- type: entity
id: CrateNFSDRestraints
parent: CratenfsdSecure2
name: nfsd restraints crate
description: Contains two boxes each of handcuffs and zipties. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: BoxHandcuff
amount: 2
- id: BoxZiptie
amount: 2

- type: entity
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:
- type: StorageFill
contents:
- id: ClothingOuterBioSecurity
amount: 2
- id: ClothingHeadHatHoodBioSecurity
amount: 2
- id: ClothingMaskSterile
amount: 2

- type: entity
id: CrateNFSDImplants
name: nfsd implanter crate
description: Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open.
parent: CratenfsdSecure2
components:
- type: StorageFill
contents:
- id: MindShieldImplanter
amount: 4
- id: TrackingImplanter
amount: 4

# Cosmetic Crates
71 changes: 71 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
- type: entity
id: CrateArmorySMGNFSD
parent: CratenfsdSecure1
name: nfsd SMG crate
description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open.
components:
- type: StorageFill
contents:
- id: WeaponSubMachineGunWt550
amount: 2
- id: MagazinePistolSubMachineGunTopMounted
amount: 4

- type: entity
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:
- type: StorageFill
contents:
- id: WeaponShotgunKammerer
amount: 2
- id: BoxLethalshot
amount: 3

- type: entity
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:
- type: StorageFill
contents:
- id: TrackingImplanter
amount: 5

- type: entity
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:
- type: StorageFill
contents:
- id: TrainingBomb
amount: 3

- type: entity
id: CrateArmoryLaserNFSD
parent: CratenfsdSecure2
name: nfsd lasers crate
description: Contains three standard-issue laser rifles. Requires Armory access to open.
components:
- type: StorageFill
contents:
- id: WeaponLaserCarbine
amount: 3

- type: entity
id: CrateArmoryPistolsNFSD
parent: CratenfsdSecure2
name: nfsd pistols crate
description: Contains two standard NT pistols with four mags. Requires Armory access to open.
components:
- type: StorageFill
contents:
- id: WeaponPistolMk58
amount: 2
- id: MagazinePistol
amount: 4
Loading

0 comments on commit 0fa3e75

Please sign in to comment.