Clean Up Jobs (#6210)

* Cleaned up old borg spawns since they can choose a chassis now. Moved and/or renamed some nyano assets in the DV namespace

* Neat new MARK feature

* Mapper input

* Applied objectively-bad YAML property ordering

Resources/Locale/en-US/_DV/job/job-names.ftl

@@ -72,12 +72,10 @@ job-title-admeme-overwriting = Overwriting
 job-title-admeme-adding = Adding
 
 # Role timers
-JobMedicalBorg = Medical Cyborg
 JobCourier = Courier
 JobChiefJustice = Chief Justice
 JobClerk = Clerk
 JobProsecutor = Prosecutor
-JobSecurityBorg = Security Cyborg
 JobRoboticist = Roboticist
 JobCargoAssistant = Cargo Assistant
 JobZookeeper = Zookeeper

Resources/Migrations/deltaMigrations.yml

@@ -247,3 +247,7 @@ PaperStickyNoteStackBlue : PaperStickyNoteStackFilledBlue
 
 # 2026-06-09
 BoxPerformer: BoxPerformerDV
+
+# 2026-07-04
+SpawnPointMedicalBorg: SpawnPointBorg
+SpawnPointSecurityBorg: SpawnPointBorg

Resources/Prototypes/Maps/byoin.yml

@@ -57,8 +57,7 @@
             ForensicMantis: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
           #Silicon
-            MedicalBorg: [ 1, 1 ]
+            Borg: [ 2, 2 ]
-            Borg: [ 1, 1 ]
           #security
             Warden: [ 1, 1 ]
             Detective: [ 1, 1 ]

Resources/Prototypes/Maps/glacier.yml

@@ -54,7 +54,6 @@
           Psychologist: [ 1, 1 ]
           MedicalDoctor: [ 2, 3 ]
           MedicalIntern: [ 2, 2 ]
-          MedicalBorg: [ 1, 1 ]
           Surgeon: [ 1, 2 ]
         #science
           ResearchDirector: [ 1, 1 ]

Resources/Prototypes/Maps/submarine.yml

@@ -79,5 +79,4 @@
             Lawyer: [ 2, 2 ]
           #Synthetics
             StationAi: [ 1, 1]
-            Borg: [ 2, 4 ]
+            Borg: [ 2, 3 ]
-            MedicalBorg: [ 2, 2 ]

Resources/Prototypes/Maps/terra.yml

@@ -68,7 +68,7 @@
             Zookeeper: [ 1, 1 ]
           #science
             Chaplain: [ 1, 1 ]
-            Borg: [ 3, 3 ]
+            Borg: [ 2, 3 ]
             ForensicMantis: [ 1, 1 ]
             ResearchAssistant: [ 2, 4 ]
             ResearchDirector: [ 1, 1 ]

Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml

@@ -1,63 +0,0 @@
-- type: entity
-  id: SpawnPointGladiator
-  parent: SpawnPointJobBase
-  name: gladiator
-  components:
-  - type: SpawnPoint
-    job_id: Gladiator
-  - type: Sprite
-    layers:
-      - state: green
-      - sprite: _DV/Markers/jobs.rsi
-        state: nyanogladiator
-
-- type: entity
-  id: SpawnPointPrisoner
-  parent: SpawnPointJobBase
-  name: prisoner
-  components:
-  - type: SpawnPoint
-    job_id: Prisoner
-  - type: Sprite
-    layers:
-      - state: green
-      - state: prisoner
-
-- type: entity
-  id: SpawnPointPrisonGuard
-  parent: SpawnPointJobBase
-  name: prison guard
-  components:
-  - type: SpawnPoint
-    job_id: PrisonGuard
-  - type: Sprite
-    layers:
-      - state: green
-      - sprite: _DV/Markers/jobs.rsi
-        state: nyanoprisonguard
-
-- type: entity
-  id: SpawnPointMartialArtist
-  parent: SpawnPointJobBase
-  name: martial artist
-  components:
-  - type: SpawnPoint
-    job_id: MartialArtist
-  - type: Sprite
-    layers:
-      - state: green
-      - sprite: _DV/Markers/jobs.rsi
-        state: nyanomartialartist
-
-- type: entity
-  id: SpawnPointForensicMantis
-  parent: SpawnPointJobBase
-  name: psionic mantis # DeltaV - Rename Forensic Mantis to Psionic Mantis
-  components:
-  - type: SpawnPoint
-    job_id: ForensicMantis
-  - type: Sprite
-    layers:
-      - state: green
-      - sprite: _DV/Markers/jobs.rsi
-        state: nyanomantis

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml

@@ -3,7 +3,7 @@
   name: job-name-gladiator
   description: job-description-gladiator
   playTimeTracker: JobGladiator
-  startingGear: NyanoGladiatorGear
+  startingGear: gladiatorGear
   alwaysUseSpawner: true
   canBeAntag: false
   icon: "JobIconGladiator"
@@ -16,7 +16,7 @@
       time: 21600
 
 - type: startingGear
-  id: NyanoGladiatorGear
+  id: gladiatorGear
   equipment:
     id: GladiatorPDA
     ears: ClothingHeadsetPrison

Resources/Prototypes/Nyanotrasen/StatusIcon/job.yml

@@ -1,31 +0,0 @@
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconGladiator
-  icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
-    state: nyanoGladiator
-  jobName: job-name-gladiator
-
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconPrisonGuard
-  icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
-    state: nyanoPrisonGuard
-  jobName: job-name-prison-guard
-
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconMartialArtist
-  icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
-    state: nyanoMartialArtist
-  jobName: job-name-martialartist
-
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconForensicMantis
-  icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
-    state: nyanoMantis
-  jobName: job-name-mantis

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -115,7 +115,6 @@
   - Psychologist
   - Paramedic
   # BEGIN DeltaV Med Jobs
-  - MedicalBorg
   - Surgeon
   # END DeltaV
 
@@ -135,7 +134,6 @@
   # BEGIN DeltaV Sec Jobs
   - Brigmedic
   - PrisonGuard
-  - SecurityBorg
   - RoleLaika 
   - RoleK9Officer
   # END DeltaV
@@ -165,10 +163,6 @@
   roles:
   - Borg
   - StationAi
-  # BEGIN DeltaV Silicon Jobs
-  - MedicalBorg
-  - SecurityBorg
-  # END DeltaV
   primary: false # DeltaV - removed from primary dept
 
 # DeltaV - get rid of 'station-specific' as a department. All of these

Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml

@@ -1,21 +1,71 @@
 - type: entity
-  id: SpawnPointMedicalBorg
   parent: SpawnPointJobBase
-  name: medical cyborg
+  id: SpawnPointGladiator
+  name: gladiator
   components:
   - type: SpawnPoint
-    job_id: MedicalBorg
+    job_id: Gladiator
   - type: Sprite
     layers:
-    - state: green
+      - state: green
-    - sprite: Mobs/Silicon/chassis.rsi
+      - sprite: &job-rsi-dv _DV/Markers/jobs.rsi
-      state: medical
+        state: gladiator
-    - sprite: Mobs/Silicon/chassis.rsi
-      state: medical_e
 
 - type: entity
-  id: SpawnPointChiefJustice
   parent: SpawnPointJobBase
+  id: SpawnPointPrisoner
+  name: prisoner
+  components:
+  - type: SpawnPoint
+    job_id: Prisoner
+  - type: Sprite
+    layers:
+      - state: green
+      - state: prisoner
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointPrisonGuard
+  name: prison guard
+  components:
+  - type: SpawnPoint
+    job_id: PrisonGuard
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: *job-rsi-dv
+        state: prisonguard
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointMartialArtist
+  name: martial artist
+  components:
+  - type: SpawnPoint
+    job_id: MartialArtist
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: *job-rsi-dv
+        state: martialartist
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointForensicMantis
+  name: psionic mantis # DeltaV - Rename Forensic Mantis to Psionic Mantis
+  components:
+  - type: SpawnPoint
+    job_id: ForensicMantis
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: *job-rsi-dv
+        state: psionicmantis
+
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointChiefJustice
   name: chiefjustice
   components:
   - type: SpawnPoint
@@ -23,12 +73,12 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: _DV/Markers/jobs.rsi
+    - sprite: *job-rsi-dv
       state: chiefjustice
 
 - type: entity
-  id: SpawnPointClerk
   parent: SpawnPointJobBase
+  id: SpawnPointClerk
   name: clerk
   components:
   - type: SpawnPoint
@@ -36,12 +86,12 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: _DV/Markers/jobs.rsi
+    - sprite: *job-rsi-dv
       state: clerk
 
 - type: entity
-  id: SpawnPointProsecutor
   parent: SpawnPointJobBase
+  id: SpawnPointProsecutor
   name: prosecutor
   components:
   - type: SpawnPoint
@@ -49,12 +99,12 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: _DV/Markers/jobs.rsi
+    - sprite: *job-rsi-dv
       state: prosecutor
 
 - type: entity
-  id: SpawnPointCourier
   parent: SpawnPointJobBase
+  id: SpawnPointCourier
   name: courier
   components:
   - type: SpawnPoint
@@ -62,24 +112,9 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: _DV/Markers/jobs.rsi
+    - sprite: *job-rsi-dv
       state: courier
 
-- type: entity
-  id: SpawnPointSecurityBorg
-  parent: SpawnPointJobBase
-  name: security cyborg
-  components:
-  - type: SpawnPoint
-    job_id: SecurityBorg
-  - type: Sprite
-    layers:
-    - state: green
-    - sprite: _DV/Mobs/Silicon/chassis.rsi
-      state: security
-    - sprite: _DV/Mobs/Silicon/chassis.rsi
-      state: security_e
-
 - type: entity
   parent: SpawnPointJobBase
   id: SpawnPointRoboticist
@@ -90,7 +125,7 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: _DV/Markers/jobs.rsi
+    - sprite: *job-rsi-dv
       state: roboticist
 
 - type: entity
@@ -103,7 +138,7 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: _DV/Markers/jobs.rsi
+    - sprite: *job-rsi-dv
       state: cargoassistant
 
 - type: entity
@@ -116,12 +151,12 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: _DV/Markers/jobs.rsi
+    - sprite: *job-rsi-dv
       state: surgeon
 
 - type: entity
-  id: SpawnPointBoxer
   parent: SpawnPointJobBase
+  id: SpawnPointBoxer
   name: boxer
   components:
   - type: SpawnPoint
@@ -132,8 +167,8 @@
       - state: boxer
 
 - type: entity
-  id: SpawnPointZookeeper
   parent: SpawnPointJobBase
+  id: SpawnPointZookeeper
   name: zookeeper
   components:
   - type: SpawnPoint

Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml

@@ -1,6 +1,6 @@
 # If an ID contains sprite component changes, put it here. Otherwise, put it in identification_cards_alt.yml
 
-# Command
+# MARK: Command
 - type: entity
   parent: IDCardStandard
   id: ChiefJusticeIDCard
@@ -19,7 +19,7 @@
   - type: PresetIdCard
     job: ChiefJustice
 
-# Security and Prisoners
+# MARK: Security and Prisoners
 - type: entity
   parent: IDCardStandard
   id: PrisonGuardIDCard
@@ -33,8 +33,8 @@
     - state: stripe_bottom
       color: &color-security-bottom "#262626"
     - sprite: *icon-rsi-dv
-      offset:
+      offset: *icon-offset
-      state: nyanoPrisonGuard
+      state: PrisonGuard
   - type: PresetIdCard
     job: PrisonGuard
 
@@ -42,7 +42,7 @@
   parent: IDCardStandard
   id: PrisonerJobIDCard # Not to be confused with genpop prisoner ids
   name: prisoner ID card
-  suffix: Job
+  suffix: DeltaV job
   components:
   - type: Sprite
     layers:
@@ -63,11 +63,29 @@
     - state: orange
     - sprite: *icon-rsi-dv
       offset: *icon-offset
-      state: nyanoGladiator
+      state: Gladiator
   - type: PresetIdCard
     job: Gladiator
 
-# Cargo / Logistics
+- type: entity
+  parent: IDCardStandard
+  id: K9OfficerIDCard
+  name: K9 officer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: SecurityK9Officer
+  - type: PresetIdCard
+    job: RoleK9Officer
+
+# MARK: Cargo / Logistics
 
 - type: entity
   parent: IDCardStandard
@@ -83,7 +101,7 @@
       color: &color-supply-bottom "#5b4523"
     - sprite: *icon-rsi-dv
       offset: *icon-offset
-      state: nyanoMailCarrier
+      state: MailCarrier
   - type: PresetIdCard
     job: Courier
 
@@ -105,7 +123,7 @@
   - type: PresetIdCard
     job: CargoAssistant
 
-# Medical
+# MARK: Medical
 
 - type: entity
   parent: MedicalIDCard
@@ -126,7 +144,7 @@
     jobTitle: job-name-surgeon
     jobIcon: JobIconSurgeon
 
-# Science / Epi
+# MARK: Science / Epi
 
 - type: entity
   parent: IDCardStandard
@@ -142,7 +160,7 @@
       color: &color-science-bottom "#652368"
     - sprite: *icon-rsi-dv
       offset: *icon-offset
-      state: nyanoMantis
+      state: PsionicMantis
   - type: PresetIdCard
     job: ForensicMantis
 
@@ -164,7 +182,7 @@
   - type: PresetIdCard
     job: Roboticist
 
-# Justice
+# MARK: Justice
 
 - type: entity
   parent: IDCardStandard
@@ -202,7 +220,7 @@
   - type: PresetIdCard
     job: Prosecutor
 
-# Service
+# MARK: Service
 
 - type: entity
   parent: BartenderIDCard
@@ -216,7 +234,7 @@
     tags:
     - DoorBumpOpener
 
-# Other
+# MARK: Other
 
 - type: entity
   parent: IDCardStandard
@@ -228,11 +246,11 @@
     - state: default
     - sprite: *icon-rsi-dv
       offset: *icon-offset
-      state: nyanoMartialArtist
+      state: MartialArtist
   - type: PresetIdCard
     job: MartialArtist
 
-# Admemes and all that
+# MARK: Admemes and all that
 
 - type: entity
   parent: IDCardStandard
@@ -302,7 +320,8 @@
     categories:
     - Debug
 
-# CentComm
+
+# MARK: CentComm / SRT
 
 - type: entity
   parent: IDCardStandard
@@ -324,27 +343,6 @@
   - type: PresetIdCard
     job: CentralCommandIntern
 
-# Security K9 Officer
-- type: entity
-  parent: IDCardStandard
-  id: K9OfficerIDCard
-  name: K9 officer ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: stripe_top
-      color: *color-security-top
-    - state: stripe_bottom
-      color: *color-security-bottom
-    - sprite: *icon-rsi-dv
-      offset: *icon-offset
-      state: SecurityK9Officer
-  - type: PresetIdCard
-    job: RoleK9Officer
-
-# SRT
-
 - type: entity
   parent: IDCardStandard
   id: CentcomIDCardSRT

Resources/Prototypes/_DV/Roles/Jobs/Medical/medical_borg.yml

@@ -1,16 +0,0 @@
-- type: job
-  id: MedicalBorg
-  name: job-name-medical-borg
-  description: job-description-medical-borg
-  playTimeTracker: JobMedicalBorg
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 60h
-    - !type:DepartmentTimeRequirement
-      department: Medical
-      time: 6h
-  canBeAntag: false
-  icon: JobIconMedicalBorg
-  supervisors: job-supervisors-cmo
-  jobEntity: PlayerBorgMedical
-  applyTraits: false

Resources/Prototypes/_DV/Roles/Jobs/Security/securityborg.yml

@@ -1,16 +0,0 @@
-- type: job
-  id: SecurityBorg
-  name: job-name-security-borg
-  description: job-description-security-borg
-  playTimeTracker: JobSecurityBorg
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 60h
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 20h
-  canBeAntag: false
-  icon: JobIconSecurityBorg
-  supervisors: job-supervisors-everyone
-  jobEntity: PlayerBorgSecurity
-  applyTraits: false

Resources/Prototypes/_DV/Roles/play_time_trackers.yml

@@ -1,9 +1,6 @@
 - type: playTimeTracker
   id: JobBrigmedic
 
-- type: playTimeTracker
-  id: JobMedicalBorg
-
 - type: playTimeTracker
   id: JobChiefJustice
 
@@ -16,9 +13,6 @@
 - type: playTimeTracker
   id: JobCourier
 
-- type: playTimeTracker
-  id: JobSecurityBorg
-
 - type: playTimeTracker
   id: JobRoboticist
 

Resources/Prototypes/_DV/StatusIcon/job.yml

@@ -1,24 +1,48 @@
 - type: jobIcon
   parent: JobIcon
-  id: JobIconMedicalBorg
+  id: JobIconGladiator
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: &icon-rsi-dv /Textures/_DV/Interface/Misc/job_icons.rsi
-    state: MedicalBorg
+    state: Gladiator
-  jobName: job-name-medical-borg
+  jobName: job-name-gladiator
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconPrisonGuard
+  icon:
+    sprite: *icon-rsi-dv
+    state: PrisonGuard
+  jobName: job-name-prison-guard
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconMartialArtist
+  icon:
+    sprite: *icon-rsi-dv
+    state: MartialArtist
+  jobName: job-name-martialartist
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconForensicMantis
+  icon:
+    sprite: *icon-rsi-dv
+    state: PsionicMantis
+  jobName: job-name-mantis
 
 - type: jobIcon
   parent: JobIcon
   id: JobIconCourier
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
-    state: nyanoMailCarrier
+    state: MailCarrier
   jobName: job-name-courier
 
 - type: jobIcon
   parent: JobIcon
   id: JobIconChiefJustice
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
     state: ChiefJustice
   jobName: job-name-chief-justice
 
@@ -26,7 +50,7 @@
   parent: JobIcon
   id: JobIconClerk
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
     state: Clerk
   jobName: job-name-clerk
 
@@ -34,23 +58,15 @@
   parent: JobIcon
   id: JobIconProsecutor
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
     state: Prosecutor
   jobName: job-name-prosecutor
 
-- type: jobIcon
-  parent: JobIcon
-  id: JobIconSecurityBorg
-  icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
-    state: SecurityBorg
-  jobName: job-name-security-borg
-
 - type: jobIcon
   parent: JobIcon
   id: JobIconCargoAssistant
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
     state: CargoAssistant
   jobName: job-name-cargo-assistant
 
@@ -58,23 +74,22 @@
   parent: JobIcon
   id: JobIconSurgeon
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
     state: Surgeon
 
 - type: jobIcon
   parent: JobIcon
   id: JobIconSecurityK9Officer
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
     state: SecurityK9Officer
   jobName: role-name-k9-officer
 
-# CentComm
+# MARK: CentComm
-
 - type: jobIcon
   parent: JobIcon
   id: JobIconCentCommIntern
   icon:
-    sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
+    sprite: *icon-rsi-dv
     state: CentcommIntern
   jobName: job-name-centcomintern

Resources/Prototypes/_DV/whitelist_tiers.yml

@@ -21,7 +21,6 @@
     - Detective
     - PrisonGuard
     - Prosecutor
-    - SecurityBorg
     - SecurityCadet
     - SecurityOfficer
 

Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, Surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security cards modified by TJohnson. nyanoMantis Prisoner and Prosecutor made by BoxfulOfSoup (Github). CentcommIntern Modified by @Stxcking (github)| Hitman icon by stormyatt(gituhb). SecurityK9Officer by BarryNorfolk (Github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, martialartist, gladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), CargoAssistant recoloured from MedicalIntern by Radezolid, Surgeon by Janet Blackquill <uhhadd@gmail.com> 2024. Security cards modified by TJohnson. psionicmantis Prisoner and Prosecutor made by BoxfulOfSoup (Github). CentcommIntern Modified by @Stxcking (github)| Hitman icon by stormyatt(gituhb). SecurityK9Officer by BarryNorfolk (Github)",
     "size": {
         "x": 8,
         "y": 8
@@ -11,22 +11,19 @@
             "name": "Chaplain"
         },
         {
-            "name": "nyanoGladiator"
+            "name": "Gladiator"
         },
         {
-            "name": "nyanoPrisonGuard"
+            "name": "PrisonGuard"
         },
         {
-            "name": "nyanoMailCarrier"
+            "name": "MailCarrier"
         },
         {
-            "name": "nyanoMartialArtist"
+            "name": "MartialArtist"
         },
         {
-            "name": "nyanoMantis"
+            "name": "PsionicMantis"
-        },
-        {
-            "name": "MedicalBorg"
         },
         {
             "name": "ChiefJustice"
@@ -40,9 +37,6 @@
         {
             "name": "Lawyer"
         },
-        {
-            "name": "SecurityBorg"
-        },
         {
             "name": "CargoAssistant"
         },

Resources/Textures/_DV/Markers/jobs.rsi/meta.json

@@ -14,22 +14,22 @@
             "name": "clerk"
         },
         {
-            "name": "nyanogladiator"
+            "name": "gladiator"
         },
         {
-            "name": "nyanoprisonguard"
+            "name": "prisonguard"
         },
         {
             "name": "prosecutor"
         },
         {
-            "name": "nyanomailcarrier"
+            "name": "mailcarrier"
         },
         {
-            "name": "nyanomartialartist"
+            "name": "martialartist"
         },
         {
-            "name": "nyanomantis"
+            "name": "psionicmantis"
         },
         {
             "name": "salvagespecialist"