Prison-Station-14 · Truoizys · Jul 18, 2024 · Jul 17, 2024 · Jul 18, 2024 · Jul 18, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -25,4 +25,4 @@
     belt: ClothingBeltJanitorFilled
   #storage:
     #back:
-    #- Stuff
+    #- Stuff
diff --git 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
@@ -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