new-frontiers-14 · Salvantrix · Feb 27, 2024 · Feb 27, 2024 · Feb 28, 2024 · Feb 28, 2024
diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
@@ -0,0 +1,34 @@
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconGladiator
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: nyanoGladiator
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconPrisonGuard
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: nyanoPrisonGuard
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconMailCarrier
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: nyanoMailCarrier
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconMartialArtist
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: nyanoMartialArtist
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconForensicMantis
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: nyanoMantis
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
@@ -374,3 +374,17 @@
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Visitor
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconStc
+  icon:
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
+    state: spacetrafficcontrol
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconSecurityGuard
+  icon:
+    sprite: /Textures/_NF/Interface/Misc/job_icons.rsi
+    state: stationguard
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -113,3 +113,117 @@
 #        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
   - type: AccessReader
 #    access: [["Captain"], ["Pilot"]]
+
+#Cadet hardsuit
+- type: entity
+  id: SuitStorageCadet
+  parent: SuitStorageBase
+  suffix: NFSDCadet
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitNfsdBronze # Frontier
+        - id: ClothingMaskBreathMedicalSecurity 
+        - id: JetpackSecurityFilled
+        - id: HandheldGPSBasic
+        - id: ClothingShoesBootsMagNfsd # Frontier
+  - type: AccessReader
+    access: [["Security"]]
+
+#Deputy hardsuit
+- type: entity
+  id: SuitStorageDeputy
+  parent: SuitStorageBase
+  suffix: NFSDDeputy
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitNfsdSilver # Frontier
+        - id: ClothingMaskBreathMedicalSecurity 
+        - id: JetpackSecurityFilled
+        - id: HandheldGPSBasic
+        - id: ClothingShoesBootsMagNfsd # Frontier
+  - type: AccessReader
+    access: [["Security"]]
+
+#Brigmed hardsuit
+- type: entity
+  id: SuitStorageBrigmed
+  parent: SuitStorageBase
+  suffix: NFSDBrigMedic
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitNfsdBrigMed # Frontier
+        - id: ClothingMaskBreathMedicalSecurity 
+        - id: JetpackSecurityFilled
+        - id: HandheldGPSBasic
+        - id: ClothingShoesBootsMagNfsd # Frontier
+  - type: AccessReader
+    access: [["Security"]]
+
+#Sergeant hardsuit
+- type: entity
+  id: SuitStorageSergeant
+  parent: SuitStorageBase
+  suffix: NFSDSergeant
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitNfsdGold # Frontier
+        - id: ClothingMaskBreathMedicalSecurity 
+        - id: JetpackSecurityFilled
+        - id: HandheldGPSBasic
+        - id: ClothingShoesBootsMagNfsd # Frontier
+  - type: AccessReader
+    access: [["Security"]]
+
+#Bailiff hardsuit
+- type: entity
+  id: SuitStorageBailiff
+  parent: SuitStorageBase
+  suffix: NFSDBailiff
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitNfsdGold # Frontier
+        - id: ClothingMaskBreathMedicalSecurity 
+        - id: JetpackSecurityFilled
+        - id: HandheldGPSBasic
+        - id: ClothingShoesBootsMagNfsd # Frontier
+  - type: AccessReader
+    access: [["Security"]]
+
+#Sheriff hardsuit
+- type: entity
+  id: SuitStorageSheriff
+  parent: SuitStorageBase
+  suffix: NFSDSheriff
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitNfsdSheriff # Frontier
+        - id: ClothingMaskBreathMedicalSecurity 
+        - id: JetpackSecurityFilled
+        - id: HandheldGPSBasic
+        - id: ClothingShoesBootsMagNfsd # Frontier
+  - type: AccessReader
+    access: [["Security"]]
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
@@ -136,3 +136,33 @@
 - type: entity
   id: SuitStorageWallmountClown
   parent: [SuitStorageWallmount, SuitStorageClown]
+
+#NFSDCadet
+- type: entity
+  id: SuitStorageWallmountCadet
+  parent: [SuitStorageWallmount, SuitStorageCadet]
+
+#NFSDDeputy
+- type: entity
+  id: SuitStorageWallmountDeputy
+  parent: [SuitStorageWallmount, SuitStorageDeputy]
+
+#NFSDBrigmed
+- type: entity
+  id: SuitStorageWallmountBrigmed
+  parent: [SuitStorageWallmount, SuitStorageBrigmed]
+
+#NFSDSergeant
+- type: entity
+  id: SuitStorageWallmountSergeant
+  parent: [SuitStorageWallmount, SuitStorageSergeant]
+
+#NFSDBailiff
+- type: entity
+  id: SuitStorageWallmountBailiff
+  parent: [SuitStorageWallmount, SuitStorageBailiff]
+
+#NFSDSheriff
+- type: entity
+  id: SuitStorageWallmountSheriff
+  parent: [SuitStorageWallmount, SuitStorageSheriff]
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml
@@ -38,7 +38,7 @@
       collection: CatMeows
 
 - type: entity
-  parent: ClothingBackpackSecurityFilled
+  parent: ClothingBackpackOfficerFilled
   id: ClothingBackpacknfsdFilled
   name: nfsd backpack
   description: A backpack for Deputy Sheriff.

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
@@ -26,7 +26,7 @@
     sprite: _NF/Clothing/Back/Duffels/pilot.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffelSecurityFilled
+  parent: ClothingBackpackDuffelOfficerFilled
   id: ClothingBackpackDuffelnfsdFilled
   name: nfsd duffel
   description: A duffelbag produced for a Deputy Sheriff.

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml
@@ -26,7 +26,7 @@
     sprite: _NF/Clothing/Back/Satchels/pilot.rsi
 
 - type: entity
-  parent: ClothingBackpackSatchelSecurityFilled
+  parent: ClothingBackpackSatchelOfficerFilled
   id: ClothingBackpackSatchelnfsdFilled
   name: nfsd satchel
   description: A satchel produced for a Deputy Sheriff.

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
@@ -45,7 +45,7 @@
     sprite: _NF/Clothing/Ears/Headsets/pilot.rsi
 
 - type: entity
-  parent: ClothingHeadsetAlt
+  parent: ClothingHeadsetAltSecurity
   id: ClothingHeadsetAltNFSDgreen
   name: nfsd over-ear headset
   components:
@@ -55,7 +55,7 @@
     sprite: _NF/Clothing/Ears/Headsets/nfsd_h_green.rsi
 
 - type: entity
-  parent: ClothingHeadsetAlt
+  parent: ClothingHeadsetAltSecurity
   id: ClothingHeadsetAltNFSDbrown
   name: nfsd over-ear headset
   components:

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -184,3 +184,15 @@
     sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi
   - type: Clothing
     sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi
+
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndieReverseEngineered
+  id: ClothingHeadHelmetHardsuitNfsdExperimental
+  noSpawn: true
+  name: nfsd experimental hardsuit helmet
+  description: An experimental nfsd hardsuit helmet.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
@@ -142,7 +142,7 @@
   parent: ClothingHeadBase
   id: ClothingHeadHatNfsdBeretGreen
   name: nfsd beret
-  description: a blue beret produced for deputy sheriff's.
+  description: a green beret produced for deputy sheriff's.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Head/Hats/nfsd_beret_green.rsi

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -225,3 +225,16 @@
     sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitNfsdBrigmed
+
+- type: entity
+  parent: ClothingOuterHardsuitSyndieReverseEngineered
+  id: ClothingOuterHardsuitNfsdExperimental
+  name: an experimental nfsd hardsuit
+  description: An experimental nfsd hardsuit, never before seen!
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitNfsdExperimental
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
@@ -81,3 +81,13 @@
   components:
     - type: PriorityDock
       tag: DockTransit
+
+- type: entity
+  parent: AirlockNFSDGlass
+  id: AirlockNFSDGlassLocked
+  suffix: NFSD, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"]]
+  - type: Wires
+    layoutId: AirlockSecurity
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -16,3 +16,15 @@
     sprite: _NF/Structures/Doors/Airlocks/Glass/mercenary.rsi
   - type: PaintableAirlock
     group: Glass
+
+#Glass
+- type: entity
+  parent: AirlockGlass
+  id: AirlockNFSDGlass
+  suffix: NFSD
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Doors/Airlocks/Glass/nfsd.rsi
+  - type: PaintableAirlock
+    department: Security
+    group: Glass
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml
@@ -10,7 +10,7 @@
     - !type:OverallPlaytimeRequirement
       time: 36000 # Frontier - 10 hrs
   startingGear: BrigmedicGear
-  icon: "JobIconBrigmedic"
+  icon: "JobIconBrigmedic" # Frontier
   supervisors: job-supervisors-hos
   canBeAntag: false
   access:

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml
@@ -22,7 +22,7 @@
   weight: 10
   startingGear: HoSGear
   alwaysUseSpawner: true
-  icon: "JobIconHeadOfSecurity"
+  icon: "JobIconHeadOfSecurity" # Frontier
   requireAdminNotify: true
   supervisors: job-supervisors-hop # Frontier
   whitelistRequired: true

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml
@@ -11,7 +11,7 @@
       time: 36000 # Frontier - 10 hrs
       inverted: true # stop playing intern if you're good at security!
   startingGear: SecurityCadetGear
-  icon: "JobIconSecurityCadet"
+  icon: "JobIconSecurityCadet" # Frontier
   supervisors: job-supervisors-hos # Frontier
   canBeAntag: false
   access:

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml
@@ -7,7 +7,7 @@
     - !type:OverallPlaytimeRequirement
       time: 36000 # Frontier - 10 hrs
   startingGear: SecurityOfficerGear
-  icon: "JobIconSecurityOfficer"
+  icon: "JobIconSecurityOfficer" # Frontier
   supervisors: job-supervisors-hos
   canBeAntag: false
   access:

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml
@@ -17,7 +17,7 @@
       department: Security
       time: 72000 # 20 hrs
   startingGear: SeniorOfficerGear
-  icon: "JobIconSeniorOfficer"
+  icon: "JobIconSeniorOfficer" # Frontier
   supervisors: job-supervisors-hos
   canBeAntag: false
   access:

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml
@@ -10,7 +10,7 @@
       role: JobSecurityOfficer
       time: 36000 # Frontier - 10 hrs
   startingGear: WardenGear
-  icon: "JobIconWarden"
+  icon: "JobIconWarden" # Frontier
   supervisors: job-supervisors-hos
   canBeAntag: false
   access:
@@ -37,7 +37,7 @@
     eyes: ClothingEyesGlassesNFSD # Frontier
     outerClothing: ClothingOuterCoatNfsdFormal # Frontier
     id: NfsdBailiff # Frontier
-    ears: ClothingHeadsetAltNFSDgreen # Frontierr
+    ears: ClothingHeadsetAltNFSDgreen # Frontier
     belt: ClothingBeltNfsdWebbingFilled # Frontier
     pocket1: WeaponPistolMk58Nonlethal
     pocket2: HoloprojectorSecurity # Frontier