From e29ee867c7d4e3884944fb32182faa6e0dbaad29 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Fri, 17 Jan 2025 01:54:00 -0400 Subject: [PATCH] Remove All Usages of DepartmentTimeRequirement (#1576) title --- .../Entities/Markers/Spawners/ghost_roles.yml | 12 ++++++------ .../DeltaV/Entities/Mobs/NPCs/familiars.yml | 4 ++-- .../Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml | 4 ++-- .../Jobs/Command/administrative_assistant.yml | 15 ++++++--------- .../DeltaV/Roles/Jobs/Medical/medical_borg.yml | 2 +- .../DeltaV/Roles/Jobs/Security/brigmedic.yml | 4 ++-- .../Entities/Markers/Spawners/ghost_roles.yml | 4 ++-- .../Roles/Jobs/Epistemics/forensicmantis.yml | 2 +- .../Roles/Jobs/Security/prisonguard.yml | 2 +- .../Roles/Jobs/Wildcards/gladiator.yml | 2 +- .../Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml | 2 +- .../Roles/Jobs/Command/blueshield_officer.yml | 6 +++--- .../Jobs/Command/nanotrasen_representative.yml | 2 +- 13 files changed, 29 insertions(+), 32 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml index 4bcca6ca675..6e9913aa116 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml @@ -30,15 +30,15 @@ requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this. - !type:CharacterOverallTimeRequirement min: 259200 # 72 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security - time: 40000 # 11.1 hours - - !type:DepartmentTimeRequirement + min: 40000 # 11.1 hours + - !type:CharacterDepartmentTimeRequirement department: Civilian - time: 40000 # 11.1 hours - - !type:DepartmentTimeRequirement + min: 40000 # 11.1 hours + - !type:CharacterDepartmentTimeRequirement department: Command - time: 40000 # 11.1 hours + min: 40000 # 11.1 hours - type: GhostRoleMobSpawner prototype: MobHumanSyndicateListener - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml index dcce764af2f..30b9ef682d8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml @@ -126,9 +126,9 @@ allowMovement: true allowSpeech: true requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Epistemics - time: 14400 # 4 hours + min: 14400 # 4 hours - type: entity parent: WelderExperimental diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml index 2d1a1d72c48..0e457fd3720 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml @@ -32,9 +32,9 @@ name: "Laika" description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders." requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security - time: 14400 # DeltaV - 4 hours + min: 14400 # DeltaV - 4 hours - type: GhostTakeoverAvailable - type: InteractionPopup successChance: 1 diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml index 1483d646605..d07a1b44979 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml @@ -4,25 +4,22 @@ description: job-description-admin-assistant playTimeTracker: JobAdminAssistant requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Engineering min: 10800 # 3 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Logistics min: 10800 # 3 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Medical min: 10800 # 3 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Civilian min: 10800 # 3 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security min: 10800 # 3 hours - - !type:DepartmentTimeRequirement - department: Justice - min: 10800 # 3 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Epistemics min: 10800 # 3 hours startingGear: AdminAssistantGear diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml index 18a4bbf3152..4c48ffd3761 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterOverallTimeRequirement min: 216000 #60 hrs - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Medical min: 21600 #6 hrs canBeAntag: false diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index 44f32ffc8d7..802ef248f2c 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -4,10 +4,10 @@ description: job-description-brigmedic playTimeTracker: JobBrigmedic requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Medical min: 21600 # 6 hrs - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security min: 18000 # 4 hrs startingGear: CorpsmanGear diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 3cc6d1e35e6..62b0e15b2cf 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -104,9 +104,9 @@ requirements: - !type:CharacterOverallTimeRequirement min: 172800 # DeltaV - 48 hours - - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement + - !type:CharacterDepartmentTimeRequirement # DeltaV - Security dept time requirement department: Security - time: 36000 # DeltaV - 10 hours + min: 36000 # DeltaV - 10 hours - type: Sprite sprite: Markers/jobs.rsi layers: diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 9c07338690c..6a143a78b11 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterOverallTimeRequirement min: 18000 - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science min: 3600 - !type:CharacterLogicOrRequirement diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index fec6ac685ed..b82178a936f 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -6,7 +6,7 @@ requirements: - !type:CharacterOverallTimeRequirement min: 18000 - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security min: 14400 startingGear: PrisonGuardGear diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml index 79ae853f9f1..b2d54651e47 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -11,7 +11,7 @@ setPreference: true # whitelistRequired: true requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security min: 21600 special: diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 4f5551a2b3e..e892a480413 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -10,7 +10,7 @@ icon: "JobIconPrisoner" supervisors: job-supervisors-security requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security min: 21600 special: diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml index 84a5907c5bc..19a75105bdf 100644 --- a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml @@ -4,13 +4,13 @@ description: "Act as a bodyguard and advisor for Command and CentCom VIPs." playTimeTracker: JobBlueshieldOfficer requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Command min: 54000 # 15 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Medical min: 54000 # 15 hours - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Security min: 54000 # 15 hours weight: 20 diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml index 47e31e43174..290a73e392c 100644 --- a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml +++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml @@ -4,7 +4,7 @@ description: "Represent NT, send reports back to them on the station's situation, inform the heads of anything CentCom orders them to do." playTimeTracker: JobNanotrasenRepresentative requirements: - - !type:DepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: Command min: 54000 # 15 hours weight: 20