new-frontiers-14 · Cheackraze · Jan 24, 2024 · Jan 10, 2024 · Jan 22, 2024 · Jan 22, 2024
diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl
@@ -1,3 +1,4 @@
 job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
-job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
 job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar.
+job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger.
+job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl
@@ -1,8 +1,10 @@
 job-name-mercenary = Mercenary
-job-name-stc = Station Traffic Controller
 job-name-pilot = Pilot
+job-name-security-guard = Security Guard
+job-name-stc = Station Traffic Controller
 
 # Role timers - Make these alphabetical or I cut you
 JobMercenary = Mercenary
-JobSTC = Station Traffic Controller
 JobPilot = Pilot
+JobSecurityGuard = Security Guard
+JobSTC = Station Traffic Controller
diff --git a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl
@@ -1,5 +1,3 @@
-id-card-access-level-frontier = Station Traffic Controller
-
-id-card-access-level-mercenary = Mercenary
-
+id-card-access-level-frontier = Frontier
 id-card-access-level-pilot = Pilot
+id-card-access-level-mercenary = Mercenary
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -16,6 +16,7 @@
 #    ParamedicPDA: 3 # Frontier
 #    ChemistryPDA: 3 # Frontier
 #    CMOPDA: 3 # Frontier
+    SecurityGuardPDA: 3 # Frontier
     SecurityPDA: 3 # Frontier
     BrigmedicPDA: 3 # Frontier
     WardenPDA: 3 # Frontier

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -795,8 +795,8 @@
       - ClothingUniformJumpskirtBrigmedic
       - ClothingUniformJumpsuitWarden
       - ClothingUniformJumpskirtWarden
-      - ClothingUniformJumpsuitSecStationGuard #Frontier
-      - ClothingUniformJumpskirtSecStationGuard #Frontier
+      - ClothingUniformJumpsuitSecGuard #Frontier
+      - ClothingUniformJumpskirtSecGuard #Frontier
       - ClothingOuterWinterCap
       - ClothingOuterWinterCE
       - ClothingOuterWinterCMO

diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -15,7 +15,7 @@
       time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 216000 # 60 hrs
+      time: 72000 # 20 hrs
   startingGear: SeniorOfficerGear
   icon: "JobIconSeniorOfficer"
   supervisors: job-supervisors-hos

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -33,9 +33,9 @@
   - MartialArtist
   - MailCarrier
   - Gladiator
-  - Mercenary ## NF Job below
-  - StationTrafficController
-
+  - Mercenary # Frontier
+  - Pilot # Frontier
+  - StationTrafficController # Frontier
 
 - type: department
   id: Command
@@ -89,6 +89,7 @@
   - PrisonGuard ##nyano
   - Prisoner ##nyano
   - Brigmedic
+  - SecurityGuard # Frontier
 
 - type: department
   id: Science

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -45,11 +45,11 @@
 
 - type: entity
   parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtSecStationGuard
-  name: station guard jumpskirt
-  description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business.
+  id: ClothingUniformJumpskirtSecGuard
+  name: security guard jumpskirt
+  description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi
+    sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi
   - type: Clothing
-    sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi
+    sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -45,14 +45,14 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ClothingUniformJumpsuitSecStationGuard
-  name: station guard jumpsuit
-  description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business.
+  id: ClothingUniformJumpsuitSecGuard
+  name: security guard jumpsuit
+  description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi
+    sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi
   - type: Clothing
-    sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi
+    sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi
 
 - type: entity
   parent: ClothingUniformBase

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -50,3 +50,11 @@
     sprite: _NF/Objects/Misc/id_cards.rsi
   - type: Item
     heldPrefix: silver
+
+- type: entity
+  parent: SecurityIDCard
+  id: SecurityGuardIDCard
+  name: security guard ID card
+  components:
+  - type: PresetIdCard
+    job: SecurityGuard
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
@@ -68,3 +68,17 @@
     accentVColor: "#A32D26"
   - type: Icon
     state: pda
+
+- type: entity
+  parent: SecurityPDA
+  id: SecurityGuardPDA
+  name: security guard PDA
+  description: Red to hide the stains of passenger blood.
+  components:
+  - type: Pda
+    id: SecurityGuardIDCard
+    state: pda-security
+  - type: PdaBorderColor
+    borderColor: "#A32D26"
+  - type: Icon
+    state: pda-security
diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
@@ -20,14 +20,15 @@
             Passenger: [ -1, -1 ]
             HeadOfPersonnel: [ 1, 1 ]
             HeadOfSecurity: [ 1, 1 ]
+            SecurityGuard: [ 1, 1 ]
             SeniorOfficer: [ 0, 0 ]
             Brigmedic: [ 0, 0 ]
             SecurityOfficer: [ 0, 0 ]
             SecurityCadet: [ 0, 0 ]
-            StationTrafficController: [ 0, 0 ]
+            StationTrafficController: [ 1, 1 ]
             Valet: [ 1, 1 ]
-            MailCarrier: [ 0, 0 ]
             Janitor: [ 1, 1 ]
+            MailCarrier: [ 1, 1 ]
 # Others:
             Borg: [ 0, 0 ]
             Musician: [ 0, 0 ]

diff --git a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml
@@ -23,3 +23,29 @@
     layers:
       - state: green
       - state: pilot
+
+- type: entity
+  id: SpawnPointStc
+  parent: SpawnPointJobBase
+  name: stc
+  components:
+  - type: SpawnPoint
+    job_id: Stc
+  - type: Sprite
+    sprite: _NF/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: stc
+
+- type: entity
+  id: SpawnPointSecurityGuard
+  parent: SpawnPointJobBase
+  name: security guard
+  components:
+  - type: SpawnPoint
+    job_id: SecurityGuard
+  - type: Sprite
+    sprite: _NF/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: securityguard
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml
@@ -10,15 +10,15 @@
   objectType: Item
 
 - type: latheRecipe
-  id: ClothingUniformJumpskirtSecStationGuard
-  result: ClothingUniformJumpskirtSecStationGuard
+  id: ClothingUniformJumpskirtSecGuard
+  result: ClothingUniformJumpskirtSecGuard
   completetime: 4
   materials:
     Cloth: 300
-    
+
 - type: latheRecipe
-  id: ClothingUniformJumpsuitSecStationGuard
-  result: ClothingUniformJumpsuitSecStationGuard
+  id: ClothingUniformJumpsuitSecGuard
+  result: ClothingUniformJumpsuitSecGuard
   completetime: 4
   materials:
     Cloth: 300
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
@@ -6,7 +6,10 @@
   startingGear: StcGear
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 10800
+      time: 72000 # 20 hrs
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 10800 # 3 hrs as sec
   canBeAntag: false
   icon: "JobIconStc" 
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml
@@ -0,0 +1,42 @@
+- type: job
+  id: SecurityGuard
+  name: job-name-security-guard
+  description: job-description-security-guard
+  playTimeTracker: JobSecurityGuard
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 36000 # Frontier - 10 hrs
+  startingGear: SecurityGuardGear
+  icon: "JobIconSecurityGuard"
+  supervisors: job-supervisors-hop # not hos
+  canBeAntag: false
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+  - External
+  - Mercenary # Frontier
+  - Captain # Frontier
+  - Frontier # Frontier
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant, TrackingImplant ]
+
+- type: startingGear
+  id: SecurityGuardGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSecGuard
+    back: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesLeather #ClothingShoesBootsCombatFilled
+    eyes: ClothingEyesGlassesSunglasses #ClothingEyesGlassesSecurity
+    head: ClothingHeadHatBeretSecurity #ClothingHeadHelmetBasic
+    outerClothing: ClothingOuterArmorBasic
+    id: SecurityGuardPDA
+    ears: ClothingHeadsetSecurity
+    belt: ClothingBeltSecurityFilled
+    pocket1: WeaponPistolMk58Nonlethal
+    gloves: ClothingHandsGlovesCombat # Frontier
+  innerClothingSkirt: ClothingUniformJumpskirtSecGuard
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml
@@ -2,7 +2,10 @@
   id: JobMercenary
 
 - type: playTimeTracker
-  id: JobStc
+  id: JobPilot
 
 - type: playTimeTracker
-  id: JobPilot
+  id: JobSecurityGuard
+
+- type: playTimeTracker
+  id: JobStc
diff --git a/Resources/Prototypes/_NF/StatusEffects/job.yml b/Resources/Prototypes/_NF/StatusEffects/job.yml
@@ -19,6 +19,13 @@
     sprite: _NF/Interface/Misc/job_icons.rsi
     state: Pilot
 
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconSecurityGuard
+  icon:
+    sprite: Interface/Misc/job_icons.rsi
+    state: SecurityOfficer
+
 - type: statusIcon
   parent: JobIcon
   id: JobIconStc

diff --git a/...ard.rsi/equipped-INNERCLOTHING-monkey.png → ...ard.rsi/equipped-INNERCLOTHING-monkey.png b/...ard.rsi/equipped-INNERCLOTHING-monkey.png → ...ard.rsi/equipped-INNERCLOTHING-monkey.png
diff --git a/...ationguard.rsi/equipped-INNERCLOTHING.png → ...rity_guard.rsi/equipped-INNERCLOTHING.png b/...ationguard.rsi/equipped-INNERCLOTHING.png → ...rity_guard.rsi/equipped-INNERCLOTHING.png
diff --git a/...pskirt/security_stationguard.rsi/icon.png → ...rms/Jumpskirt/security_guard.rsi/icon.png b/...pskirt/security_stationguard.rsi/icon.png → ...rms/Jumpskirt/security_guard.rsi/icon.png
diff --git a/...security_stationguard.rsi/inhand-left.png → ...pskirt/security_guard.rsi/inhand-left.png b/...security_stationguard.rsi/inhand-left.png → ...pskirt/security_guard.rsi/inhand-left.png
diff --git a/...ecurity_stationguard.rsi/inhand-right.png → ...skirt/security_guard.rsi/inhand-right.png b/...ecurity_stationguard.rsi/inhand-right.png → ...skirt/security_guard.rsi/inhand-right.png
diff --git a/...skirt/security_stationguard.rsi/meta.json → ...ms/Jumpskirt/security_guard.rsi/meta.json b/...skirt/security_stationguard.rsi/meta.json → ...ms/Jumpskirt/security_guard.rsi/meta.json
diff --git a/...ard.rsi/equipped-INNERCLOTHING-monkey.png → ...ard.rsi/equipped-INNERCLOTHING-monkey.png b/...ard.rsi/equipped-INNERCLOTHING-monkey.png → ...ard.rsi/equipped-INNERCLOTHING-monkey.png
diff --git a/...ationguard.rsi/equipped-INNERCLOTHING.png → ...rity_guard.rsi/equipped-INNERCLOTHING.png b/...ationguard.rsi/equipped-INNERCLOTHING.png → ...rity_guard.rsi/equipped-INNERCLOTHING.png
diff --git a/...mpsuit/security_stationguard.rsi/icon.png → ...orms/Jumpsuit/security_guard.rsi/icon.png b/...mpsuit/security_stationguard.rsi/icon.png → ...orms/Jumpsuit/security_guard.rsi/icon.png
diff --git a/...security_stationguard.rsi/inhand-left.png → ...mpsuit/security_guard.rsi/inhand-left.png b/...security_stationguard.rsi/inhand-left.png → ...mpsuit/security_guard.rsi/inhand-left.png
diff --git a/...ecurity_stationguard.rsi/inhand-right.png → ...psuit/security_guard.rsi/inhand-right.png b/...ecurity_stationguard.rsi/inhand-right.png → ...psuit/security_guard.rsi/inhand-right.png
diff --git a/...psuit/security_stationguard.rsi/meta.json → ...rms/Jumpsuit/security_guard.rsi/meta.json b/...psuit/security_stationguard.rsi/meta.json → ...rms/Jumpsuit/security_guard.rsi/meta.json
diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/meta.json b/Resources/Textures/_NF/Markers/jobs.rsi/meta.json
@@ -15,6 +15,12 @@
     },
     {
       "name": "pilot"
+    },
+    {
+      "name": "securityguard"
+    },
+    {
+      "name": "stc"
     }
   ]
 }
diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png b/Resources/Textures/_NF/Markers/jobs.rsi/securityguard.png
diff --git a/Resources/Textures/_NF/Markers/jobs.rsi/stc.png b/Resources/Textures/_NF/Markers/jobs.rsi/stc.png