From 7c432b09e1d7c371c77ca8284cb457efc3b546c6 Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Sun, 18 Jun 2023 16:53:05 -0500
Subject: [PATCH] update command role requirements (#17366)

* update role requirements

* add 6 hr overall requirement for mime

I keep seeing mimes that don't know the controls, specifically how to use other chat channels, like emoting.

* fix wrong prototype

* split to part 2

* fix engi belts

this is a pain
---
 .../Roles/Jobs/Cargo/quartermaster.yml        |  9 +++---
 .../Prototypes/Roles/Jobs/Civilian/lawyer.yml |  2 +-
 .../Prototypes/Roles/Jobs/Command/captain.yml | 29 ++++++++++++-------
 .../Roles/Jobs/Command/head_of_personnel.yml  | 11 +++----
 .../Roles/Jobs/Engineering/chief_engineer.yml |  9 +++---
 .../Jobs/Medical/chief_medical_officer.yml    | 10 +++++--
 .../Roles/Jobs/Science/research_director.yml  |  4 +--
 .../Roles/Jobs/Security/head_of_security.yml  | 12 +++++---
 8 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index a60bbe4e02..2ba7f3f91a 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -4,14 +4,15 @@
   description: job-description-qm
   playTimeTracker: JobQuartermaster
   requirements:
+    - !type:RoleTimeRequirement
+      role: JobCargoTechnician
+      time: 21600 #6 hrs
     - !type:RoleTimeRequirement
       role: JobSalvageSpecialist
-      time: 3600
+      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Cargo
-      time: 18000
-    - !type:OverallPlaytimeRequirement
-      time: 108000
+      time: 108000 # 30 hrs
   weight: 10
   startingGear: QuartermasterGear
   icon: "QuarterMaster"
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 92becdd8c3..11c71fdf04 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -24,4 +24,4 @@
     right hand: BriefcaseBrownFilled
   innerclothingskirt: ClothingUniformJumpskirtLawyerBlack
   satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
\ No newline at end of file
+  duffelbag: ClothingBackpackDuffelFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index d06a97c7c5..ccca88d3cd 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -4,17 +4,24 @@
   description: job-description-captain
   playTimeTracker: JobCaptain
   requirements:
-    - !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 18000
-    - !type:DepartmentTimeRequirement
-      department: Medical
-      time: 18000
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 18000
-    - !type:OverallPlaytimeRequirement
-      time: 108000
+    - !type:RoleTimeRequirement
+      role: JobHeadOfPersonnel
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobHeadOfSecurity
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobChiefMedicalOfficer
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobChiefEngineer
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobResearchDirector
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobQuartermaster
+      time: 21600 #6 hrs
   weight: 20
   startingGear: CaptainGear
   icon: "Captain"
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 6a2275601b..954c49a239 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -6,15 +6,16 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 3600
+      time: 54000 # 15 hrs
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 3600
+      time: 54000 # 15 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 3600
-    - !type:OverallPlaytimeRequirement
-      time: 108000
+      time: 54000 # 15 hrs
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 72000 # 20 hrs
   weight: 20
   startingGear: HoPGear
   icon: "HeadOfPersonnel"
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index 4e8494d6f5..461600d125 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -6,12 +6,13 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobAtmosphericTechnician
-      time: 3600
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobStationEngineer
+      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 18000
-    - !type:OverallPlaytimeRequirement
-      time: 108000
+      time: 108000 # 30 hrs
   weight: 10
   startingGear: ChiefEngineerGear
   icon: "ChiefEngineer"
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 61d0229bd9..22beedf860 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -6,11 +6,15 @@
   description: job-description-cmo
   playTimeTracker: JobChiefMedicalOfficer
   requirements:
+    - !type:RoleTimeRequirement
+      role: JobChemist
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobMedicalDoctor
+      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 18000
-    - !type:OverallPlaytimeRequirement
-      time: 108000
+      time: 108000 # 30 hrs
   weight: 10
   startingGear: CMOGear
   icon: "ChiefMedicalOfficer"
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index d3e54f579c..e7e3bf4a53 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -6,9 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 18000
-    - !type:OverallPlaytimeRequirement
-      time: 108000
+      time: 108000 # 30 hrs
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "ResearchDirector"
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index f31999d4f9..ce06affd7f 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -6,12 +6,16 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobWarden
-      time: 3600
+      time: 21600 #6 hrs
+    - !type:RoleTimeRequirement
+      role: JobDetective
+      time: 7200 #2 hrs
+    - !type:RoleTimeRequirement
+      role: JobSecurityOfficer
+      time: 36000 #10 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 18000
-    - !type:OverallPlaytimeRequirement
-      time: 108000
+      time: 108000 # 30 hrs
   weight: 10
   startingGear: HoSGear
   icon: "HeadOfSecurity"