diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml index 9c6c81bb007..b6bc5c351ba 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml index 53a4ce2a82a..03916e5b3a5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml index 3d2b008c46c..c0be1f1c192 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -34,7 +34,7 @@ sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi - type: entity - parent: ClothingBackpackSatchelNfsdBrown + parent: ClothingBackpackDuffelNfsdBrown id: ClothingBackpackDuffelNfsdCream components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml index ee9aa158fb8..cad767c1e5b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml @@ -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 \ No newline at end of file + name: power-cell-slot-component-slot-name-default diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml index be035660d65..088da3cb6fa 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml @@ -1,5 +1,5 @@ - type: entity - id: BedsheetNFSD + id: BedsheetNfsd parent: BedsheetBase name: nfsd bedsheet components: @@ -9,7 +9,7 @@ sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi - type: entity - id: BedsheetNFSDBrigmed + id: BedsheetNfsdBrigmed parent: BedsheetBase name: brigmedic bedsheet components: @@ -19,7 +19,7 @@ sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi - type: entity - id: BedsheetNFSDSheriff + id: BedsheetNfsdSheriff parent: BedsheetBase name: sheriff bedsheet components: @@ -27,4 +27,3 @@ state: sheetnfsdsheriff - type: Clothing sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi - diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml index 3252171c22c..e513d219481 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml index ff17d70bb62..b84cd49c647 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml @@ -17,7 +17,7 @@ #Filled security - type: entity id: JetpackNfsdFilled - parent: [JetpackSecurity, JetpackSecurityFilled] + parent: [JetpackNfsd, JetpackSecurityFilled] name: nfsd jetpack suffix: Filled components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml index b2ddd0e305e..d9d4627a942 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index 84ced86b664..87fe83458ab 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -83,8 +83,8 @@ tag: DockTransit - type: entity - parent: AirlockNFSDGlass - id: AirlockNFSDGlassLocked + parent: AirlockNfsdGlass + id: AirlockNfsdGlassLocked suffix: NFSD, Locked components: - type: AccessReader @@ -93,8 +93,8 @@ layoutId: AirlockSecurity - type: entity - parent: AirlockNFSD - id: AirlockNFSDLocked + parent: AirlockNfsd + id: AirlockNfsdLocked suffix: NFSD, Locked components: - type: AccessReader diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml index d27121cba66..60bce78584c 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -8,7 +8,7 @@ - type: entity parent: Airlock - id: AirlockNFSD + id: AirlockNfsd suffix: NFSD components: - type: Sprite @@ -28,7 +28,7 @@ #Glass - type: entity parent: AirlockGlass - id: AirlockNFSDGlass + id: AirlockNfsdGlass suffix: NFSD components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml index 77bffbf7cda..30027362feb 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml @@ -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. diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml index 3c88a31b303..c785e99f763 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml @@ -295,6 +295,13 @@ id: SmallGyroscopeNfsdUnanchored parent: SmallGyroscopeSecurityUnanchored suffix: Unanchored, NFSD + components: + - type: Sprite + scale: 0.8, 0.8 + sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi + snapCardinals: true + - type: Machine + board: SmallGyroscopeMachineCircuitboard - type: entity id: SmallGyroscope diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 303f69fced9..5b15ce884d9 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -122,7 +122,7 @@ # NFSD - Evidence - type: entity - id: LockernfsdEvidence + id: LockerNfsdEvidence parent: LockerBaseSecure name: nfsd evidence locker components: @@ -150,7 +150,7 @@ # NFSD Copper - type: entity - id: LockernfsdCopper + id: LockerNfsdCopper parent: LockerBaseSecure name: nfsd cadet locker components: @@ -178,7 +178,7 @@ # NFSD Silver - type: entity - id: LockernfsdSilver + id: LockerNfsdSilver parent: LockerBaseSecure name: nfsd deputy locker components: @@ -206,7 +206,7 @@ # NFSD Brigmedic - type: entity - id: LockernfsdBrigmedic + id: LockerNfsdBrigmedic parent: LockerBaseSecure name: nfsd brigmedic locker components: @@ -234,7 +234,7 @@ # NFSD Gold - Sergeant - type: entity - id: LockernfsdSergeant + id: LockerNfsdSergeant parent: LockerBaseSecure name: nfsd sergeant locker components: @@ -262,7 +262,7 @@ # NFSD Gold - Bailiff - type: entity - id: LockernfsdBailiff + id: LockerNfsdBailiff parent: LockerBaseSecure name: nfsd bailiff locker components: @@ -290,7 +290,7 @@ # NFSD Sheriff - type: entity - id: LockernfsdSheriff + id: LockerNfsdSheriff parent: LockerBaseSecure name: nfsd sheriff's locker components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index b13a97536e6..5679150b0ff 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -163,7 +163,7 @@ - type: entity parent: CrateSecgear - id: CrateNFSDBrigmedic + id: CrateNfsdBrigmedic name: brigmedic crate components: - type: Icon @@ -175,7 +175,7 @@ - type: entity parent: CrateSecgear - id: CrateNFSDSecure1 + id: CrateNfsdSecure1 name: nfsd crate components: - type: Icon @@ -187,7 +187,7 @@ - type: entity parent: CrateSecgear - id: CrateNFSDSecure2 + id: CrateNfsdSecure2 name: nfsd crate components: - type: Icon