From b4d99b1c141ea663a8a5a5bab49f700aea7254e9 Mon Sep 17 00:00:00 2001 From: Lye Date: Wed, 17 Jul 2024 23:04:00 +0100 Subject: [PATCH 1/3] role depts and some role reqs changed for PS14 --- Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml | 2 +- .../Roles/Jobs/SP14/Guards/chief-custodial-officer.yml | 7 ++++--- Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml | 2 +- .../Prototypes/Roles/Jobs/SP14/Guards/prison_officer.yml | 2 +- .../Prototypes/Roles/Jobs/SP14/Guards/rookie_officer.yml | 2 +- Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml | 8 ++++---- .../Prototypes/Roles/Jobs/SP14/Infirmary/chemist.yml | 2 +- .../Roles/Jobs/SP14/Infirmary/infirmary_doctor.yml | 6 +++--- .../Roles/Jobs/SP14/Infirmary/medical_director.yml | 2 +- .../Prototypes/Roles/Jobs/SP14/Inmate/prison_chef.yml | 2 +- .../Roles/Jobs/SP14/Maintenance/maintenance_worker.yml | 8 +++++++- .../Roles/Jobs/SP14/SPCargo/sp_quartermaster.yml | 2 +- .../Roles/Jobs/SP14/SPCommand/welfare_officer.yml | 6 +++--- 13 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 1ab77dbae5..05477f6655 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -1,4 +1,4 @@ -- type: job + - type: job id: Chaplain name: job-name-chaplain description: job-description-chaplain diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Guards/chief-custodial-officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/chief-custodial-officer.yml index 3a1f053317..2a30257e6e 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Guards/chief-custodial-officer.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Guards/chief-custodial-officer.yml @@ -5,13 +5,14 @@ playTimeTracker: JobChiefCustodialOfficer requirements: - !type:RoleTimeRequirement - role: JobWarden + role: JobInspector time: 10800 #3 hrs + #replaced warden req considering warden now ranked higher - !type:RoleTimeRequirement - role: JobSecurityOfficer + role: JobPrisonOfficer time: 36000 #10 hrs - !type:DepartmentTimeRequirement - department: Security + department: SPSecurity time: 108000 # 30 hrs - !type:OverallPlaytimeRequirement time: 144000 #40 hrs diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml index 74e76345e0..e5da61d66a 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Guards/inspector.yml @@ -6,7 +6,7 @@ weight: -10 requirements: - !type:DepartmentTimeRequirement - department: Security + department: SPSecurity time: 54000 # 15 hours startingGear: InspectorGear icon: "JobIconDetective" diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Guards/prison_officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/prison_officer.yml index aae389c4fd..888f284bc2 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Guards/prison_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Guards/prison_officer.yml @@ -6,7 +6,7 @@ weight: 10 requirements: - !type:DepartmentTimeRequirement - department: Security + department: SPSecurity time: 36000 #10 hrs startingGear: PrisonOfficerGear icon: "JobIconSecurityOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Guards/rookie_officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/rookie_officer.yml index d110c5162e..c1115b631a 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Guards/rookie_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Guards/rookie_officer.yml @@ -7,7 +7,7 @@ - !type:OverallPlaytimeRequirement time: 18000 #5 hrs - !type:DepartmentTimeRequirement - department: Security + department: SPSecurity time: 36000 #10 hrs inverted: true # stop playing intern if you're good at security! startingGear: RookieGear diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml b/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml index 2c74a21fa3..e01d0bf9ad 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Guards/sp-warden.yml @@ -5,16 +5,16 @@ playTimeTracker: JobSPWarden requirements: - !type:DepartmentTimeRequirement - department: Engineering + department: Maintenance time: 54000 # 15 hours - !type:DepartmentTimeRequirement - department: Medical + department: SPMedical time: 54000 # 15 hours - !type:DepartmentTimeRequirement - department: Security + department: SPSecurity time: 108000 # 30 hrs - !type:DepartmentTimeRequirement - department: Command + department: SPCommand time: 54000 # 15 hours weight: 40 startingGear: SPWardenGear diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/chemist.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/chemist.yml index b7a606a88d..9d437fedcf 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/chemist.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSPChemist requirements: - !type:DepartmentTimeRequirement - department: Medical + department: SPMedical time: 14400 #4 hrs startingGear: SPChemistGear icon: "JobIconChemist" diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/infirmary_doctor.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/infirmary_doctor.yml index a8392818b4..fcfac6d0c1 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/infirmary_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/infirmary_doctor.yml @@ -4,9 +4,9 @@ description: job-description-infirmary-doctor playTimeTracker: JobInfirmaryDoctor requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 14400 #4 hrs + - !type:OverallPlaytimeRequirement + time: 18000 #5 hrs + # replaced med time with overall time considering no learner med role, if med intern reimplimented this can be reverted startingGear: InfirmaryDoctor icon: "JobIconMedicalDoctor" supervisors: job-supervisors-md diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml index 2d8ef94621..ac74196440 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Infirmary/medical_director.yml @@ -11,7 +11,7 @@ role: JobInfirmaryDoctor time: 21600 #6 hrs - !type:DepartmentTimeRequirement - department: Medical + department: SPMedical time: 36000 #10 hrs - !type:OverallPlaytimeRequirement time: 144000 #40 hrs diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Inmate/prison_chef.yml b/Resources/Prototypes/Roles/Jobs/SP14/Inmate/prison_chef.yml index 95b3c99eba..3a746732a6 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Inmate/prison_chef.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Inmate/prison_chef.yml @@ -5,7 +5,7 @@ playTimeTracker: JobPrisonChef requirements: - !type:DepartmentTimeRequirement - department: Civilian + department: Inmate # makes more sense then civ for an inmate role time: 1800 startingGear: SPChefGear icon: "JobIconPrisonChef" diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml index 40d9b9185b..bfb16bbc27 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml @@ -4,6 +4,12 @@ description: job-description-maintenance-worker weight: 1 playTimeTracker: JobMaintenanceWorker + requirements: + # added intern cap + - !type:DepartmentTimeRequirement + department: Maintenance + time: 36000 #10 hrs + inverted: true # stop playing intern if you're good at maintenance! startingGear: MaintenanceWorkerGear icon: "JobIconJanitor" supervisors: job-supervisors-hom @@ -25,4 +31,4 @@ belt: ClothingBeltJanitorFilled #storage: #back: - #- Stuff \ No newline at end of file + #- Stuff diff --git a/Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_quartermaster.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_quartermaster.yml index 7939978eaf..a825ba9c5c 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/SPCargo/sp_quartermaster.yml @@ -8,7 +8,7 @@ role: JobSPCargoTechnician time: 21600 #6 hrs - !type:DepartmentTimeRequirement - department: Cargo + department: SPCargo time: 36000 #10 hours - !type:OverallPlaytimeRequirement time: 144000 #40 hrs diff --git a/Resources/Prototypes/Roles/Jobs/SP14/SPCommand/welfare_officer.yml b/Resources/Prototypes/Roles/Jobs/SP14/SPCommand/welfare_officer.yml index 4c6127fc54..f9c4103098 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/SPCommand/welfare_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/SPCommand/welfare_officer.yml @@ -8,13 +8,13 @@ department: Maintenance time: 36000 # 10 hours - !type:DepartmentTimeRequirement - department: Medical + department: SPMedical time: 36000 # 10 hours - !type:DepartmentTimeRequirement - department: Security + department: SPSecurity time: 36000 # 10 hrs - !type:DepartmentTimeRequirement - department: Command + department: SPCommand time: 36000 # 10 hours weight: 30 startingGear: WOGear From 7fa81f6678c68a4ccea29d8bc0a26f64acc8e3c9 Mon Sep 17 00:00:00 2001 From: Truoizys <153248924+Truoizys@users.noreply.github.com> Date: Thu, 18 Jul 2024 09:29:06 +0100 Subject: [PATCH 2/3] Update chaplain.yml fixed changes causing crash. --- Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 05477f6655..1ab77dbae5 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -1,4 +1,4 @@ - - type: job +- type: job id: Chaplain name: job-name-chaplain description: job-description-chaplain From a6bed70304f07a220640b82880df1800407b555a Mon Sep 17 00:00:00 2001 From: Truoizys <153248924+Truoizys@users.noreply.github.com> Date: Thu, 18 Jul 2024 09:34:06 +0100 Subject: [PATCH 3/3] Removed playtime cap because janitors are important members of our station maintworkers double up as janitors so having them around is more useful than intern roles --- .../Roles/Jobs/SP14/Maintenance/maintenance_worker.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml index bfb16bbc27..1359a60662 100644 --- a/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/SP14/Maintenance/maintenance_worker.yml @@ -4,12 +4,6 @@ description: job-description-maintenance-worker weight: 1 playTimeTracker: JobMaintenanceWorker - requirements: - # added intern cap - - !type:DepartmentTimeRequirement - department: Maintenance - time: 36000 #10 hrs - inverted: true # stop playing intern if you're good at maintenance! startingGear: MaintenanceWorkerGear icon: "JobIconJanitor" supervisors: job-supervisors-hom