new-frontiers-14 · Salvantrix · Feb 27, 2024 · Feb 27, 2024 · Feb 28, 2024 · Feb 28, 2024
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -145,6 +145,7 @@
       - id: DoorRemoteSecurity  # Frontier
       - id: SecurityTechFabCircuitboard # Frontier
       - id: BaseSecurityUplinkRadioSheriff # Frontier
+      - id: ClothingNeckNfsdBadgeHoS # Frontier
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -155,6 +155,7 @@
       - id: DoorRemoteSecurity  # Frontier
       - id: SecurityTechFabCircuitboard # Frontier
       - id: BaseSecurityUplinkRadioSheriff # Frontier
+      - id: ClothingNeckNfsdBadgeHoS # Frontier
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -169,6 +169,7 @@
       - id: DoorRemoteSecurity  # Frontier
       - id: SecurityTechFabCircuitboard # Frontier
       - id: BaseSecurityUplinkRadioSheriff # Frontier
+      - id: ClothingNeckNfsdBadgeHoS # Frontier
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -191,3 +191,15 @@
     contents:
     - id: FoodShakerSalt
     - id: FoodShakerPepper
+
+- type: entity
+  id: ClothingNeckMantleSheriffFilled
+  parent: ClothingNeckMantleSheriff
+  suffix: Filled
+  components:
+   - type: StorageFill
+     contents:
+     - id: CigarGold
+       amount: 4
+     - id: FlippoEngravedLighter
+       amount: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
@@ -2,10 +2,18 @@
   id: ClothingShoesBootsCombatFilled
   parent: ClothingShoesBootsCombat
   suffix: Filled
-
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - CombatKnife
 
 - type: entity
   id: ClothingShoesBootsMercenaryFilled # Frontier - Merc to Mercenary
-  parent: ClothingShoesBootsMercenary
+  parent: ClothingShoesBootsMercenary # Frontier - Merc to Mercenary
   suffix: Filled
-
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - KukriKnife
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -445,6 +445,8 @@
     layers:
     - state: default
     - state: idbrigmedic
+  - type: PresetIdCard
+    job: Brigmedic
 
 - type: entity
   parent: IDCardStandard
@@ -848,3 +850,5 @@
     layers:
     - state: default
     - state: idseniorofficer
+  - type: PresetIdCard
+    job: SeniorOfficer
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml b/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml
@@ -1,42 +0,0 @@
-- type: job
-  id: Detective
-  name: job-name-detective
-  description: job-description-detective
-  playTimeTracker: JobDetective
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 36000 # Frontier - 10 hrs
-  startingGear: DetectiveGear
-  icon: "JobIconDetective"
-  supervisors: job-supervisors-hos
-  canBeAntag: false
-  access:
-  - Security
-  - Brig
-  - Maintenance
-  - Service
-  - Detective
-  - External # Frontier
-  - Mercenary # Frontier
-  - Captain # Frontier
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, TrackingImplant ]
-
-- type: startingGear
-  id: DetectiveGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitDetective
-    outerClothing: ClothingOuterVestDetective
-    back: ClothingBackpackFilledDetective
-    shoes: ClothingShoesBootsJack
-    eyes: ClothingEyesGlassesSunglasses
-    head: ClothingHeadHatFedoraBrown
-    id: DetectivePDA
-    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltHolsterFilled
-    gloves: ClothingHandsGlovesCombat # Frontier
-  innerClothingSkirt: ClothingUniformJumpskirtDetective
-  satchel: ClothingBackpackSatchelFilledDetective
-  duffelbag: ClothingBackpackDuffelFilledDetective
-  messenger: ClothingBackpackMessengerSecurityFilledDetective # Frontier

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
@@ -85,8 +85,8 @@
   parent: JobIcon
   id: JobIconSecurityOfficer
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: SecurityOfficer
+    sprite: _NF/Interface/Misc/job_icons.rsi
+    state: nfsddeputy
 
 - type: statusIcon
   parent: JobIcon
@@ -225,15 +225,15 @@
   parent: JobIcon
   id: JobIconHeadOfSecurity
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: HeadOfSecurity
+    sprite: _NF/Interface/Misc/job_icons.rsi
+    state: nfsdsheriff
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBrigmedic
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: Brigmedic
+    sprite: _NF/Interface/Misc/job_icons.rsi
+    state: nfsdbrigmed
 
 - type: statusIcon
   parent: JobIcon
@@ -260,8 +260,8 @@
   parent: JobIcon
   id: JobIconWarden
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: Warden
+    sprite: _NF/Interface/Misc/job_icons.rsi
+    state: nfsdbailiff
 
 - type: statusIcon
   parent: JobIcon
@@ -323,8 +323,8 @@
   parent: JobIcon
   id: JobIconSecurityCadet
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: SecurityCadet
+    sprite: _NF/Interface/Misc/job_icons.rsi
+    state: nfsdcadet
 
 - type: statusIcon
   parent: JobIcon
@@ -351,8 +351,8 @@
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
-    sprite: /Textures/Interface/Misc/job_icons.rsi
-    state: SeniorOfficer
+    sprite: _NF/Interface/Misc/job_icons.rsi
+    state: nfsdsergeant
 
 - type: statusIcon
   parent: JobIcon

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml
@@ -13,3 +13,36 @@
       - id: RemoteSignaller
       - id: InflatableWallStack5
       - id: InflatableDoorStack1
+
+- type: entity
+  id: ClothingBeltNfsdFilled
+  parent: [ClothingBeltNfsd, ClothingBeltSecurityFilled]
+
+- type: entity
+  id: ClothingBeltNfsdWebbingFilledBrigmedic
+  parent: ClothingBeltNfsdWebbing
+  suffix: Filled, Brigmedic
+  components:
+  - type: StorageFill
+    contents:
+      - id: Brutepack
+        amount: 2
+      - id: Ointment
+        amount: 1
+      - id: Bloodpack
+        amount: 1
+      - id: Gauze
+      - id: EmergencyMedipen #You never know what people are going to latejoin into
+
+- type: entity
+  id: ClothingBeltNfsdWebbingFilled
+  parent: ClothingBeltNfsdWebbing
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: GrenadeFlashBang
+      - id: TearGasGrenade
+      - id: Stunbaton
+      - id: Handcuffs
+      - id: Handcuffs
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml
@@ -1,14 +1,15 @@
 - type: entity
   id: ClothingShoesBootsMagCombatFilled
-  parent: ClothingShoesBootsMagCombat
-  suffix: Filled
+  parent: [ClothingShoesBootsMagCombat, ClothingShoesBootsCombatFilled]
 
 - type: entity
-  id: ClothingShoesBootsMagMercenaryFilled
-  parent: ClothingShoesBootsMagMercenary
-  suffix: Filled
+  id: ClothingShoesBootsMagNfsdFilled
+  parent: [ClothingShoesBootsMagNfsd, ClothingShoesBootsCombatFilled]
 
 - type: entity
   id: ClothingShoesBootsMagPirateFilled
-  parent: ClothingShoesBootsMagPirate
-  suffix: Filled
+  parent: [ClothingShoesBootsMagPirate, ClothingShoesBootsCombatFilled]
+
+- type: entity
+  id: ClothingShoesBootsMagMercenaryFilled
+  parent: [ClothingShoesBootsMagMercenary, ClothingShoesBootsMercenaryFilled]