Migrated ERT and pet playtimes to job roles.

2025-12-26 14:13:58 -06:00 · 2025-12-26 14:13:58 -06:00 · 360ab9f648
parent 4a5764d672
commit 360ab9f648
20 changed files with 180 additions and 258 deletions
--- a/Resources/Locale/en-US/_DV/job/job-description.ftl
+++ b/Resources/Locale/en-US/_DV/job/job-description.ftl
@ -10,3 +10,11 @@ job-description-cargo-assistant = Learn the basics of the logistics department,
 job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge.
 job-description-mime-delta = Entertain the crew while remaining silent, and engage with light rivalry with the clown.
 job-description-assistant = Get your space legs, assist people, ask a Command member to give you a job.
+
+# I dont know if these will ever be visible but I'll include them anyways.
+role-description-laika = "Bark! Bark! Grrr!"
+role-description-silvia = "Hiss!"
+role-description-ifrit = "Burn baby, burn!"
+role-description-carpy = "Grrr!"
+role-description-shiva = "Hsssss!"
+role-description-pun-pun = "Ook!"
--- a/Resources/Locale/en-US/_DV/job/job-names.ftl
+++ b/Resources/Locale/en-US/_DV/job/job-names.ftl
@ -77,3 +77,18 @@ JobProsecutor = Prosecutor
 JobSecurityBorg = Security Cyborg
 JobRoboticist = Roboticist
 JobCargoAssistant = Cargo Assistant
+
+# Pet Roles
+RoleLaika = Laika
+RoleSilvia = Silvia
+RoleIfrit = Ifrit
+RoleCarpy = Carpy
+RoleShiva = Shiva
+RolePunPun = Pun Pun
+
+role-name-laika = Laika
+role-name-silvia = Silvia
+role-name-ifrit = Ifrit
+role-name-carpy = Carpy
+role-name-shiva = Shiva
+role-name-pun-pun = Pun Pun
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@ -115,12 +115,6 @@
    rules: ghost-role-information-loneop-rules
    mindRoles:
    - MindRoleLoneops
-    #requirements: # DeltaV
-    #- !type:OverallPlaytimeRequirement
-    #  time: 48h
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 10h
  - type: Sprite
    sprite: Markers/jobs.rsi
    layers:
@ -317,9 +311,6 @@
    - MindRoleWizard
    raffle:
      settings: default
-    #requirements:
-    #- !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
-    #  time: 25h
  - type: Sprite
    sprite: Markers/jobs.rsi
    layers:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@ -705,10 +705,7 @@
    name: ghost-role-information-Shiva-name
    description: ghost-role-information-Shiva-description
    rules: ghost-role-information-Shiva-rules
-    #requirements: # Delta V - No raiders # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 14400 # DeltaV - 4 hours
+    job: RoleShiva # DeltaV - controls the playtime requirement, no raiders
  - type: GhostTakeoverAvailable # DeltaV
  - type: InteractionPopup
    successChance: 0.5 # spider is mean
@ -899,10 +896,7 @@
    name: ghost-role-information-punpun-name
    description: ghost-role-information-punpun-description
    rules: ghost-role-information-nonantagonist-rules
-    #requirements: # Delta V - No raiders
-    #- !type:RoleTimeRequirement
-    #  role: JobBartender
-    #  time: 14400 # Delta V - 4 hours
+    job: RolePunPun
  - type: GhostTakeoverAvailable
  - type: Butcherable
    butcheringType: Spike
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@ -99,15 +99,6 @@
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
      rules: ghost-role-information-nonantagonist-rules
-      # Begin DeltaV additions
-      #requirements: # TODO: October
-      #- !type:DepartmentTimeRequirement
-      #  department: Security
-      #  time: 54000 #15 hrs
-      #- !type:DepartmentTimeRequirement
-      #  department: Command
-      #  time: 14400 #4 hrs
-      # End DeltaV additions
      raffle:
        settings: short
      job: ERTLeader
@ -198,15 +189,6 @@
      name: ghost-role-information-ert-chaplain-name
      description: ghost-role-information-ert-chaplain-description
      rules: ghost-role-information-nonantagonist-rules
-      # Begin DeltaV additions
-      #requirements: # TODO: October
-      #- !type:DepartmentTimeRequirement
-      #  department: Security
-      #  time: 18000 #5 hrs
-      #- !type:DepartmentTimeRequirement
-      #  department: Epistemics
-      #  time: 36000 #10 hrs
-      # End DeltaV additions
      raffle:
        settings: short
      job: ERTChaplain
@ -274,15 +256,6 @@
      name: ghost-role-information-ert-janitor-name
      description: ghost-role-information-ert-janitor-description
      rules: ghost-role-information-nonantagonist-rules
-      # Begin DeltaV additions
-      #requirements: # TODO: October
-      #- !type:DepartmentTimeRequirement
-      #  department: Security
-      #  time: 18000 #5 hrs
-      #- !type:RoleTimeRequirement
-      #  role: JobJanitor
-      #  time: 18000 #5 hrs
-      # End DeltaV additions
      raffle:
        settings: short
      job: ERTJanitor
@ -349,15 +322,6 @@
      name: ghost-role-information-ert-engineer-name
      description: ghost-role-information-ert-engineer-description
      rules: ghost-role-information-nonantagonist-rules
-      # Begin DeltaV additions
-      # requirements: # TODO: October
-      # - !type:DepartmentTimeRequirement
-      #   department: Security
-      #   time: 18000 #5 hrs
-      # - !type:DepartmentTimeRequirement
-      #   department: Engineering
-      #   time: 36000 #10 hrs
-      # End DeltaV additions
      raffle:
        settings: short
      job: ERTEngineer
@ -424,12 +388,6 @@
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
      rules: ghost-role-information-nonantagonist-rules
-      # Begin DeltaV additions
-      # requirements: # TODO: October
-      # - !type:DepartmentTimeRequirement
-      #   department: Security
-      #   time: 54000 #15 hrs
-      # End DeltaV additions
      raffle:
        settings: short
      job: ERTSecurity
@ -519,15 +477,6 @@
      name: ghost-role-information-ert-medical-name
      description: ghost-role-information-ert-medical-description
      rules: ghost-role-information-nonantagonist-rules
-      # Begin DeltaV additions
-      # requirements: # TODO: October
-      # - !type:DepartmentTimeRequirement
-      #   department: Security
-      #   time: 18000 #5 hrs
-      # - !type:DepartmentTimeRequirement
-      #   department: Medical
-      #   time: 36000 #10 hrs
-      # End DeltaV additions
      raffle:
        settings: short
      job: ERTMedical
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@ -12,7 +12,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Security
-      time: 21600
+      time: 6h
  special:
  - !type:AddImplantSpecial
    implants: [ TrackingImplant ]
--- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
@ -8,6 +8,13 @@
  icon: "JobIconNanotrasen"
  supervisors: job-supervisors-centcom
  canBeAntag: false
+  requirements: # DeltaV - Playtime requirements
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 10h
+  - !type:DepartmentTimeRequirement
+    department: Medical
+    time: 5h
  accessGroups:
  - AllAccess
  access:
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@ -9,6 +9,13 @@
  icon: "JobIconNanotrasen"
  supervisors: job-supervisors-centcom
  canBeAntag: false
+  requirements: # DeltaV - Playtime requirement
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 15h
+  - !type:DepartmentTimeRequirement
+    department: Command
+    time: 4h
  accessGroups:
  - AllAccess
  access:
@ -110,6 +117,13 @@
  icon: "JobIconNanotrasen"
  supervisors: job-supervisors-centcom
  canBeAntag: false
+  requirements: # DeltaV - Playtime requirement
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 5h
+  - !type:DepartmentTimeRequirement
+    department: Epistemics
+    time: 5h
  accessGroups:
  - AllAccess
  access:
@ -204,6 +218,13 @@
  icon: "JobIconNanotrasen"
  supervisors: job-supervisors-centcom
  canBeAntag: false
+  requirements: # DeltaV - Playtime requirements
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 5h
+  - !type:DepartmentTimeRequirement
+    department: Engineering
+    time: 5h
  accessGroups:
  - AllAccess
  access:
@ -287,6 +308,10 @@
  icon: "JobIconNanotrasen"
  supervisors: job-supervisors-centcom
  canBeAntag: false
+  requirements: # DeltaV - Playtime requirements
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 15h
  accessGroups:
  - AllAccess
  access:
@ -388,6 +413,13 @@
  icon: "JobIconNanotrasen"
  supervisors: job-supervisors-centcom
  canBeAntag: false
+  requirements: # DeltaV - Playtime requirements
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 5h
+  - !type:DepartmentTimeRequirement
+    department: Medical
+    time: 10h
  accessGroups:
  - AllAccess
  access:
@ -463,6 +495,13 @@
  icon: "JobIconNanotrasen"
  supervisors: job-supervisors-centcom
  canBeAntag: false
+  requirements: # DeltaV - Playtime requirements
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 5h
+  - !type:RoleTimeRequirement
+    role: JobJanitor
+    time: 2h
  accessGroups:
  - AllAccess
  access:
--- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml
@ -50,18 +50,6 @@
    rules: ghost-role-information-listeningop-rules
    mindRoles:
    - MindRoleListeningPost
-    #requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this.
-    #- !type:OverallPlaytimeRequirement
-    #  time: 72h
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 11.1h
-    #- !type:DepartmentTimeRequirement
-    #  department: Civilian
-    #  time: 11.1h
-    #- !type:DepartmentTimeRequirement
-    #  department: Command
-    #  time: 11.1h

 - type: entity
  categories: [ HideSpawnMenu, Spawner ]
@ -173,12 +161,7 @@
    name: ghost-role-information-ifritDV-name
    description: ghost-role-information-ifritDV-description
    rules: ghost-role-information-ifritDV-rules
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Epistemics
-    #  time: 14400 # 4 hours
-    #- !type:OverallPlaytimeRequirement
-    #  time: 48h
+    job: RoleIfrit # controls the playtime requirement
    mindRoles:
    - MindRoleGhostRoleFamiliar
    raffle:
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/familiars.yml
@ -107,10 +107,7 @@
    allowSpeech: true
    name: "Ifrit"
    description: ghost-role-information-ifritDV-description
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Epistemics
-    #  time: 14400 # DeltaV - 4 hours
+    job: RoleIfrit

 - type: entity
  parent: WelderExperimental
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml
@ -31,10 +31,7 @@
    allowMovement: true
    name: "Laika"
    description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders."
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 14400 # DeltaV - 4 hours
+    job: RoleLaika # determines the playtime requirement
  - type: GhostTakeoverAvailable
  - type: InteractionPopup
    successChance: 1
@ -103,10 +100,7 @@
    allowMovement: true
    name: "Carpy the Legal Carp"
    description: "The real brains behind the Justice department. Your honour my client is not fishy!"
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Justice
-    #  time: 3600 # 1 hours
+    job: RoleCarpy
  - type: GhostTakeoverAvailable

 - type: entity
@ -220,10 +214,7 @@
      name: ghost-role-information-silvia-name
      description: ghost-role-information-silvia-description
      rules: ghost-role-information-silvia-rules
-      #requirements: #No raiders # TODO: October
-      #- !type:DepartmentTimeRequirement
-      #  department: Medical
-      #  time: 14400 #4 hours
+      job: RoleSilvia # determines the playtime requirement
    - type: GhostTakeoverAvailable
    - type: InteractionPopup
      successChance: 0.65
--- a/Resources/Prototypes/_DV/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/humanoid.yml
@ -3,7 +3,7 @@
 - type: entity
  id: RandomHumanoidSpawnerERTLeaderAmber
  name: ERT leader
-  suffix: ERTRole, Amber
+  suffix: DeltaV, Amber, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -27,13 +27,6 @@
    rules: ghost-role-information-nonantagonist-rules
    raffle:
      settings: short
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 54000 #15 hrs
-    #- !type:DepartmentTimeRequirement
-    #  department: Command
-    #  time: 14400 #4 hrs
    job: ERTLeader
  - type: Loadout
    prototypes: [ ERTLeaderGearAmber ]
@ -48,7 +41,7 @@
  parent: RandomHumanoidSpawnerERTLeaderAmber
  id: RandomHumanoidSpawnerERTLeaderRed
  name: ERT leader
-  suffix: ERTRole, Red
+  suffix: DeltaV, Red, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -60,20 +53,6 @@
  parent: ERTLeaderAmber
  id: ERTLeaderRed
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-leader-name
-    description: ghost-role-information-ert-leader-description
-    rules: ghost-role-information-nonantagonist-rules
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 54000 #15 hrs
-    #- !type:DepartmentTimeRequirement
-    #  department: Command
-    #  time: 14400 #4 hrs
-    raffle:
-      settings: short
-    job: ERTLeader
  - type: Loadout
    prototypes: [ ERTLeaderGearRed ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -81,7 +60,7 @@
 - type: entity
  parent: RandomHumanoidSpawnerERTLeaderAmber
  id: RandomHumanoidSpawnerERTLeaderGamma
-  suffix: ERTRole, Gamma
+  suffix: DeltaV, Gamma, ERTRole
  components:
  - type: RandomHumanoidSpawner
    settings: ERTLeaderGamma
@ -93,13 +72,6 @@
  parent: ERTLeaderAmber
  id: ERTLeaderGamma
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-leader-name
-    description: ghost-role-information-ert-leader-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTLeader
  - type: Loadout
    prototypes: [ ERTLeaderGearGamma ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -110,7 +82,7 @@
  parent: RandomHumanoidSpawnerERTLeaderAmber
  id: RandomHumanoidSpawnerERTChaplainAmber
  name: ERT chaplain
-  suffix: ERTRole, Amber
+  suffix: DeltaV, Amber, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -132,13 +104,6 @@
    name: ghost-role-information-ert-chaplain-name
    description: ghost-role-information-ert-chaplain-description
    rules: ghost-role-information-nonantagonist-rules
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 18000 #5 hrs
-    #- !type:DepartmentTimeRequirement
-    #  department: Epistemics
-    #  time: 36000 #10 hrs
    raffle:
      settings: short
    job: ERTChaplain
@ -155,7 +120,7 @@
  parent: RandomHumanoidSpawnerERTChaplainAmber
  id: RandomHumanoidSpawnerERTChaplainRed
  name: ERT chaplain
-  suffix: ERTRole, Red
+  suffix: DeltaV, Red, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -167,13 +132,6 @@
  parent: ERTChaplainAmber
  id: ERTChaplainRed
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-chaplain-name
-    description: ghost-role-information-ert-chaplain-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTChaplain
  - type: Loadout
    prototypes: [ ERTChaplainGearRed ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -183,7 +141,7 @@
  parent: RandomHumanoidSpawnerERTChaplainAmber
  id: RandomHumanoidSpawnerERTChaplainGamma
  name: ERT chaplain
-  suffix: ERTRole, Gamma
+  suffix: DeltaV, Gamma, ERTRole
  components:
  - type: Sprite
    sprite: _DV/Markers/jobs.rsi
@ -195,13 +153,6 @@
  parent: ERTChaplainAmber
  id: ERTChaplainGamma
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-chaplain-name
-    description: ghost-role-information-ert-chaplain-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTChaplain
  - type: Loadout
    prototypes: [ ERTChaplainGearGamma ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -213,7 +164,7 @@
  parent: RandomHumanoidSpawnerERTLeaderAmber
  id: RandomHumanoidSpawnerERTJanitorAmber
  name: ERT janitor
-  suffix: ERTRole, Amber
+  suffix: DeltaV, Amber, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -234,13 +185,7 @@
    name: ghost-role-information-ert-janitor-name
    description: ghost-role-information-ert-janitor-description
    rules: ghost-role-information-nonantagonist-rules
-    #requirements: # TODO: October
-    # !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 18000 #5 hrs
-    #- !type:RoleTimeRequirement
-    #  role: JobJanitor
-    #  time: 18000 #5 hrs
+
    raffle:
      settings: short
    job: ERTJanitor
@ -257,7 +202,7 @@
  parent: RandomHumanoidSpawnerERTJanitorAmber
  id: RandomHumanoidSpawnerERTJanitorRed
  name: ERT janitor
-  suffix: ERTRole, Red
+  suffix: DeltaV, Red, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -284,7 +229,7 @@
  parent: RandomHumanoidSpawnerERTJanitorAmber
  id: RandomHumanoidSpawnerERTJanitorGamma
  name: ERT janitor
-  suffix: ERTRole, Gamma
+  suffix: DeltaV, Gamma, ERTRole
  components:
  - type: Sprite
    sprite: _DV/Markers/jobs.rsi
@ -313,7 +258,7 @@
  parent: RandomHumanoidSpawnerERTLeaderAmber
  id: RandomHumanoidSpawnerERTEngineerAmber
  name: ERT engineer
-  suffix: ERTRole, Amber
+  suffix: DeltaV, Amber, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -334,13 +279,6 @@
    name: ghost-role-information-ert-engineer-name
    description: ghost-role-information-ert-engineer-description
    rules: ghost-role-information-nonantagonist-rules
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 18000 #5 hrs
-    #- !type:DepartmentTimeRequirement
-    #  department: Engineering
-    #  time: 36000 #10 hrs
    raffle:
      settings: short
    job: ERTEngineer
@ -357,7 +295,7 @@
  parent: RandomHumanoidSpawnerERTEngineerAmber
  id: RandomHumanoidSpawnerERTEngineerRed
  name: ERT engineer
-  suffix: ERTRole, Red
+  suffix: DeltaV, Red, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -369,13 +307,6 @@
  parent: ERTEngineerAmber
  id: ERTEngineerRed
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-engineer-name
-    description: ghost-role-information-ert-engineer-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTEngineer
  - type: Loadout
    prototypes: [ ERTEngineerGearRed ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -384,7 +315,7 @@
  parent: RandomHumanoidSpawnerERTEngineerAmber
  id: RandomHumanoidSpawnerERTEngineerGamma
  name: ERT engineer
-  suffix: ERTRole, Gamma
+  suffix: DeltaV, Gamma, ERTRole
  components:
  - type: Sprite
    sprite: _DV/Markers/jobs.rsi
@ -396,13 +327,6 @@
  parent: ERTEngineerAmber
  id: ERTEngineerGamma
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-engineer-name
-    description: ghost-role-information-ert-engineer-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTEngineer
  - type: Loadout
    prototypes: [ ERTEngineerGearGamma ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -413,7 +337,7 @@
  parent: RandomHumanoidSpawnerERTLeaderAmber
  id: RandomHumanoidSpawnerERTSecurityAmber
  name: ERT security
-  suffix: ERTRole, Amber
+  suffix: DeltaV, Amber, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -434,10 +358,6 @@
    name: ghost-role-information-ert-security-name
    description: ghost-role-information-ert-security-description
    rules: ghost-role-information-nonantagonist-rules
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 54000 #15 hrs
    raffle:
      settings: short
    job: ERTSecurity
@ -454,7 +374,7 @@
  parent: RandomHumanoidSpawnerERTSecurityAmber
  id: RandomHumanoidSpawnerERTSecurityRed
  name: ERT security
-  suffix: ERTRole, Red
+  suffix: DeltaV, Red, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -466,13 +386,6 @@
  parent: ERTSecurityAmber
  id: ERTSecurityRed
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-security-name
-    description: ghost-role-information-ert-security-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTSecurity
  - type: Loadout
    prototypes: [ ERTSecurityGearRed ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -480,7 +393,7 @@
 - type: entity
  parent: RandomHumanoidSpawnerERTSecurityAmber
  id: RandomHumanoidSpawnerERTSecurityGamma
-  suffix: ERTRole, Gamma
+  suffix: DeltaV, Gamma, ERTRole
  components:
  - type: Sprite
    sprite: _DV/Markers/jobs.rsi
@ -492,13 +405,6 @@
  parent: ERTSecurityAmber
  id: ERTSecurityGamma
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-security-name
-    description: ghost-role-information-ert-security-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTSecurity
  - type: Loadout
    prototypes: [ ERTSecurityGearGamma ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -509,7 +415,7 @@
  parent: RandomHumanoidSpawnerERTLeaderAmber
  id: RandomHumanoidSpawnerERTMedicalAmber
  name: ERT medic
-  suffix: ERTRole, Amber
+  suffix: DeltaV, Amber, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -530,13 +436,6 @@
    name: ghost-role-information-ert-medical-name
    description: ghost-role-information-ert-medical-description
    rules: ghost-role-information-nonantagonist-rules
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 18000 #5 hrs
-    #- !type:DepartmentTimeRequirement
-    #  department: Medical
-    #  time: 36000 #10 hrs
    raffle:
      settings: short
    job: ERTMedical
@ -553,7 +452,7 @@
  parent: RandomHumanoidSpawnerERTMedicalAmber
  id: RandomHumanoidSpawnerERTMedicalRed
  name: ERT medic
-  suffix: ERTRole, Red
+  suffix: DeltaV, Red, ERTRole
  components:
  - type: Sprite
    sprite: Markers/jobs.rsi
@ -565,13 +464,6 @@
  parent: ERTMedicalAmber
  id: ERTMedicalRed
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-medical-name
-    description: ghost-role-information-ert-medical-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTMedical
  - type: Loadout
    prototypes: [ ERTMedicalGearRed ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -580,7 +472,7 @@
  parent: RandomHumanoidSpawnerERTMedicalAmber
  id: RandomHumanoidSpawnerERTMedicalGamma
  name: ERT medic
-  suffix: ERTRole, Gamma
+  suffix: DeltaV, Gamma, ERTRole
  components:
  - type: Sprite
    sprite: _DV/Markers/jobs.rsi
@ -592,13 +484,6 @@
  parent: ERTMedicalAmber
  id: ERTMedicalGamma
  components:
-  - type: GhostRole
-    name: ghost-role-information-ert-medical-name
-    description: ghost-role-information-ert-medical-description
-    rules: ghost-role-information-nonantagonist-rules
-    raffle:
-      settings: short
-    job: ERTMedical
  - type: Loadout
    prototypes: [ ERTMedicalGearGamma ]
    roleLoadout: [ RoleSurvivalEVA ]
@ -608,15 +493,8 @@
 - type: randomHumanoidSettings
  parent: CBURNAgent
  id: CBURNAgentDeltaV
+  suffix: DeltaV, ERTRole
  components:
  - type: Loadout
    prototypes: [CBURNGearDeltaV]
-    roleLoadout: [ RoleSurvivalEVA ]
-  - type: GhostRole
-    #requirements: # TODO: October
-    #- !type:DepartmentTimeRequirement
-    #  department: Security
-    #  time: 36000 # 10 hrs
-    #- !type:DepartmentTimeRequirement
-    #  department: Medical
-    #  time: 18000 # 5 hrs
+    roleLoadout: [ RoleSurvivalEVA ]
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@ -27,7 +27,7 @@
  suffix: Human, HostageOps
  components:
  - type: GhostRole
-    #requirements: # TODO: October
+    #requirements: # TODO: If this is ever enabled, move this to an antag or job prototype, since thats where playtime requirements are validated
    #- !type:OverallPlaytimeRequirement
    #  time: 24h
    #- !type:DepartmentTimeRequirement
--- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml
+++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml
@ -18,7 +18,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobPsychologist
-      time: 14400 # 4 hours psychologist
+      time: 4h

 - type: loadout
  id: SocialWorkerPDA
@ -29,7 +29,7 @@
    requirement:
      !type:DepartmentTimeRequirement
      department: Civilian
-      time: 14400 # 4 hours service
+      time: 4h

 # Head
 - type: loadout
--- a/Resources/Prototypes/_DV/Roles/Antags/fugitive.yml
+++ b/Resources/Prototypes/_DV/Roles/Antags/fugitive.yml
@ -3,11 +3,10 @@
  name: roles-antag-fugitive-name
  antagonist: true
  objective: roles-antag-fugitive-objective
-  # keep these in sync with the spawner
  requirements:
  - !type:DepartmentTimeRequirement
    department: Security
-    time: 3600 # 1 hour
+    time: 1h

 - type: startingGear
  id: FugitiveGear
--- a/Resources/Prototypes/_DV/Roles/Antags/listening_post.yml
+++ b/Resources/Prototypes/_DV/Roles/Antags/listening_post.yml
@ -3,7 +3,6 @@
  name: roles-antag-listening-post-name
  antagonist: true
  objective: roles-antag-listening-post-objective
-  # keep these in sync with the spawner
  requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this.
  - !type:OverallPlaytimeRequirement
    time: 72h
--- a/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml
@ -6,7 +6,7 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Medical
-      time: 28800
+      time: 8h
  startingGear: SurgeonGear
  icon: JobIconSurgeon
  supervisors: job-supervisors-cmo
--- a/Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml
@ -0,0 +1,75 @@
+# Ensure that all setPreference are set to false here. Otherwise, they appear on the job select screen.
+# These are for ghost role play timers anyways
+
+- type: job
+  id: RoleLaika
+  name: role-name-laika
+  description: role-description-laika
+  setPreference: false
+  canBeAntag: false
+  playTimeTracker: Laika
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 4h
+
+- type: job
+  id: RoleShiva
+  name: role-name-shiva
+  description: role-description-shiva
+  setPreference: false
+  canBeAntag: false
+  playTimeTracker: Shiva
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 4h
+
+- type: job
+  id: RoleSilvia
+  name: role-name-silvia
+  description: role-description-silvia
+  setPreference: false
+  canBeAntag: false
+  playTimeTracker: Silvia
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Medical
+    time: 4h
+
+- type: job
+  id: RoleIfrit
+  name: role-name-ifrit
+  description: role-description-ifrit
+  setPreference: false
+  canBeAntag: false
+  playTimeTracker: Ifrit
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Epistemics
+    time: 4h
+  - !type:OverallPlaytimeRequirement
+    time: 48h
+
+- type: job
+  id: RoleCarpy
+  name: role-name-carpy
+  description: role-description-carpy
+  setPreference: false
+  canBeAntag: false
+  playTimeTracker: Carpy
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Justice
+    time: 1h
+
+- type: job
+  id: RolePunPun
+  name: role-name-pun-pun
+  description: role-description-pun-pun
+  setPreference: false
+  playTimeTracker: Pun Pun
+  requirements:
+  - !type:RoleTimeRequirement
+    role: JobBartender
+    time: 1h
--- a/Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Security/brigmedic.yml
@ -6,10 +6,10 @@
  requirements:
    - !type:DepartmentTimeRequirement
      department: Medical
-      time: 21600 # 6 hrs
+      time: 6h
    - !type:RoleTimeRequirement # DeltaV - JobSecurityOfficer time requirement
      role: JobSecurityOfficer
-      time: 21600 # DeltaV - 6 hrs
+      time: 6h
  startingGear: CorpsmanGear
  icon: "JobIconBrigmedic"
  supervisors: job-supervisors-hos
--- a/Resources/Prototypes/_Mono/CorticalBorer/cortical_borer_species.yml
+++ b/Resources/Prototypes/_Mono/CorticalBorer/cortical_borer_species.yml
@ -121,9 +121,6 @@
    name: cortical-borer-ghostrole-name
    description: cortical-borer-ghostrole-desc
    rules: ghost-role-information-freeagent-rules
-    #requirements:
-    #- !type:OverallPlaytimeRequirement
-    #  time: 10h
    mindRoles:
    - MindRoleGhostRoleFreeAgent
  - type: GhostRoleMobSpawner