From 78e69a68b9dd25bb1e6f387cdd1cf1f00733e7c7 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Mon, 19 Aug 2024 16:29:24 -0700 Subject: [PATCH] ifdstnfixi osnareubqkar meatns --- .../DeltaV/Entities/Markers/Spawners/ghost_roles.yml | 9 ++++++--- .../Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml | 3 ++- Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml | 3 ++- .../DeltaV/Roles/Jobs/Medical/medical_borg.yml | 3 ++- .../Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml | 6 ++++-- .../Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml | 3 ++- .../Nyanotrasen/Roles/Jobs/Security/prisonguard.yml | 3 ++- .../Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml | 3 ++- .../Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml | 3 ++- .../Roles/Jobs/Service/chief_service_supervisor.yml | 3 ++- 10 files changed, 26 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml index a3ce3d73c9..42dd8a7fa0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml @@ -35,13 +35,16 @@ - !type:CharacterOverallTimeRequirement min: 259200 # 72 hours - !type:CharacterDepartmentRequirement - department: Security + departments: + - Security min: 40000 # 11.1 hours - !type:CharacterDepartmentRequirement - department: Civilian + departments: + - Civilian min: 40000 # 11.1 hours - !type:CharacterDepartmentRequirement - department: Command + departments: + - Command min: 40000 # 11.1 hours - type: GhostRoleMobSpawner prototype: MobHumanSyndicateListener diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml index 212d390eed..d40a72167f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml @@ -107,7 +107,8 @@ allowSpeech: true requirements: - !type:CharacterDepartmentRequirement - department: Epistemics + departments: + - Epistemics min: 14400 # DeltaV - 4 hours - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml index 4e69de81a7..ee3fcc5e9d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml @@ -33,7 +33,8 @@ description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders." requirements: - !type:CharacterDepartmentRequirement - department: Security + departments: + - Security min: 14400 # DeltaV - 4 hours - type: GhostTakeoverAvailable - type: InteractionPopup diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml index 65d8829490..d26ebc37af 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml @@ -8,7 +8,8 @@ - !type:CharacterOverallTimeRequirement min: 216000 #60 hrs - !type:CharacterDepartmentRequirement - department: Medical + departments: + - Medical min: 21600 #6 hrs canBeAntag: false icon: JobIconMedicalBorg diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index b277099d24..d5b79517a6 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -6,10 +6,12 @@ setPreference: false # Parkstation-Playtime requirements: - !type:CharacterDepartmentRequirement - department: Medical + departments: + - Medical min: 21600 # 6 hrs - !type:CharacterDepartmentRequirement - department: Security + departments: + - Security min: 18000 # 4 hrs startingGear: CorpsmanGear icon: "JobIconBrigmedic" diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 1d945c089e..2f0aee9df2 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -8,7 +8,8 @@ - !type:CharacterOverallTimeRequirement min: 18000 - !type:CharacterDepartmentRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science + departments: + - Epistemics # DeltaV - Epistemics Department replacing Science min: 3600 startingGear: ForensicMantisGear icon: "JobIconForensicMantis" diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index 8cac6aac60..6e8650731e 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -7,7 +7,8 @@ - !type:CharacterOverallTimeRequirement min: 18000 - !type:CharacterDepartmentRequirement - department: Security + departments: + - Security min: 14400 startingGear: PrisonGuardGear alwaysUseSpawner: true diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml index 20259e52f2..306b94d8b8 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -12,7 +12,8 @@ # whitelistRequired: true requirements: - !type:CharacterDepartmentRequirement - department: Security + departments: + - Security min: 21600 special: - !type:AddComponentSpecial diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 57cb5e1618..c02c65731e 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -11,7 +11,8 @@ supervisors: job-supervisors-security requirements: - !type:CharacterDepartmentRequirement - department: Security + departments: + - Security min: 21600 - type: startingGear diff --git a/Resources/Prototypes/Parkstation/Roles/Jobs/Service/chief_service_supervisor.yml b/Resources/Prototypes/Parkstation/Roles/Jobs/Service/chief_service_supervisor.yml index 267ef1c1a6..c5bf8bfb78 100644 --- a/Resources/Prototypes/Parkstation/Roles/Jobs/Service/chief_service_supervisor.yml +++ b/Resources/Prototypes/Parkstation/Roles/Jobs/Service/chief_service_supervisor.yml @@ -5,7 +5,8 @@ playTimeTracker: JobChiefServiceSupervisor requirements: - !type:CharacterDepartmentRequirement - department: Civilian + departments: + - Civilian min: 21600 - !type:CharacterOverallTimeRequirement min: 86400