SerbiaStrong-220 · gogenych · Aug 14, 2024 · Aug 14, 2024
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -3,6 +3,9 @@
   name: job-name-cargotech
   description: job-description-cargotech
   playTimeTracker: JobCargoTechnician
+   requirements:
+   - !type:OverallPlaytimeRequirement 
+      time: 3600 # SS220-RoleTime №2
   startingGear: CargoTechGear
   icon: "JobIconCargoTechnician"
   supervisors: job-supervisors-qm

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -7,6 +7,9 @@
     - !type:DepartmentTimeRequirement
       department: Cargo
       time: 108000 # SS220-RoleTime
+    - !type:RoleTimeRequirement
+      role: SalvageSpecialist
+      time: 18000 # SS220-RoleTime №2
     - !type:OverallPlaytimeRequirement
       time: 180000 # SS220-RoleTime
     - !type:AgeRequirement

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -7,6 +7,8 @@
     - !type:DepartmentTimeRequirement
       department: Cargo
       time: 36000 # SS220-RoleTime
+    - !type:OverallPlaytimeRequirement
+      time: 72000 # SS220-RoleTime №2
   icon: "JobIconShaftMiner"
   startingGear: SalvageSpecialistGear
   supervisors: job-supervisors-qm

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -6,7 +6,9 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Civilian
-      time: 18000 # SS220-RoleTime
+      time: 36000 # SS220-RoleTime №2
+    - !type:OverallPlaytimeRequirement
+       time: 72000 # SS220-RoleTime №2   
   startingGear: ClownGear
   icon: "JobIconClown"
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -5,8 +5,8 @@
   playTimeTracker: JobLawyer
   requirements:
     - !type:DepartmentTimeRequirement
-      department: Civilian
-      time: 72000 # SS220-RoleTime
+      department: Security
+      time: 36000 # SS220-RoleTime №2
   startingGear: LawyerGear
   setPreference: true # SS220 return-of-the-lawyer
   icon: "JobIconLawyer"

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -6,7 +6,9 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Civilian
-      time: 18000 # SS220-RoleTime
+      time: 36000 # SS220-RoleTime №2
+    - !type:OverallPlaytimeRequirement
+       time: 72000 # SS220-RoleTime №2  
   startingGear: MimeGear
   icon: "JobIconMime"
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -3,6 +3,9 @@
   name: job-name-serviceworker
   description: job-description-serviceworker
   playTimeTracker: JobServiceWorker
+   requirements:
+   - !type:OverallPlaytimeRequirement 
+     time: 3600 # SS220-RoleTime №2
   startingGear: ServiceWorkerGear
   icon: "JobIconServiceWorker"
   supervisors: job-supervisors-service

diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Command
-      time: 180000 # SS220-RoleTime
+      time: 288000 # SS220-RoleTime №2
     - !type:AgeRequirement
       requiredAge: 20
     - !type:SpeciesRequirement #SS220-jobbans begin

diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -6,6 +6,9 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 180000 # SS220-RoleTime
+    - !type:DepartmentTimeRequirement
+      department: Civilian
+      time: 72000 # SS220-RoleTime №2
     - !type:AgeRequirement
       requiredAge: 20
     - !type:SpeciesRequirement #SS220-jobbans begin

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 18000 # SS220-RoleTime
+      time: 36000 # SS220-RoleTime №2
   startingGear: AtmosphericTechnicianGear
   icon: "JobIconAtmosphericTechnician"
   supervisors: job-supervisors-ce

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobTechnicalAssistant
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 18000 # SS220-RoleTime
+      time: 3600 # SS220-RoleTime №2
   startingGear: TechnicalAssistantGear
   icon: "JobIconTechnicalAssistant"
   supervisors: job-supervisors-engineering

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 18000 # SS220-RoleTime
+      time: 36000 # SS220-RoleTime №2
   startingGear: ChemistGear
   icon: "JobIconChemist"
   supervisors: job-supervisors-cmo

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -9,6 +9,9 @@
     - !type:DepartmentTimeRequirement
       department: Medical
       time: 180000 # SS220-RoleTime
+    - !type:RoleTimeRequirement
+      role: Chemist
+      time: 18000 # SS220-RoleTime №2
     - !type:AgeRequirement
       requiredAge: 20
     - !type:SpeciesRequirement #SS220-jobbans begin

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobMedicalIntern
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 18000 # SS220-RoleTime
+      time: 3600 # SS220-RoleTime №2
   startingGear: MedicalInternGear
   icon: "JobIconMedicalIntern"
   supervisors: job-supervisors-medicine

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 36000 # SS220-RoleTime
+      time: 54000 # SS220-RoleTime №2
   startingGear: ParamedicGear
   icon: "JobIconParamedic"
   supervisors: job-supervisors-cmo

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobResearchAssistant
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 18000 # SS220-RoleTime
+      time: 3600 # SS220-RoleTime №2
   startingGear: ResearchAssistantGear
   icon: "JobIconResearchAssistant"
   supervisors: job-supervisors-science

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -7,6 +7,9 @@
     - !type:DepartmentTimeRequirement
       department: Security
       time: 180000 # SS220-RoleTime
+    - !type:RoleTimeRequirement
+      role: Warden
+      time: 43200 # SS220-RoleTime №2
     - !type:AgeRequirement
       requiredAge: 20
     - !type:SpeciesRequirement #SS220-jobbans begin

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobSecurityCadet
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 18000 # SS220-RoleTime
+      time: 36000 # SS220-RoleTime №2
     - !type:SpeciesRequirement #SS220-jobbans begin
       inverted: true
       species:

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml b/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 # SS220-RoleTime
+      time: 54000 # SS220-RoleTime №2
     - !type:SpeciesRequirement #SS220-jobbans begin
       inverted: true
       species:

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/senior_sec.yml b/Resources/Prototypes/SS220/Roles/Jobs/senior_sec.yml
@@ -8,8 +8,8 @@
       role: JobWarden
       time: 43200 #12 hrs
     - !type:RoleTimeRequirement
-      role: JobDetective
-      time: 15400 #4 hrs
+#      role: JobDetective # SS220-RoleTime №2
+#      time: 15400 #4 hrs # SS220-RoleTime №2
     - !type:RoleTimeRequirement
       role: JobSecurityOfficer
       time: 72000 #20 hrs

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/senior_service.yml b/Resources/Prototypes/SS220/Roles/Jobs/senior_service.yml
@@ -5,11 +5,17 @@
   playTimeTracker: JobSeniorService
   requirements:
     - !type:RoleTimeRequirement
-      role: JobServiceWorker
-      time: 43200 #12 ч
+      role: Janitor
+      time: 18000 # SS220-RoleTime №2
     - !type:RoleTimeRequirement
-      role: JobJanitor
-      time: 43200 #12 ч
+      role: Chef
+      time: 18000 # SS220-RoleTime №2
+    - !type:RoleTimeRequirement
+      role: Botanist
+      time: 18000 # SS220-RoleTime №2
+    - !type:RoleTimeRequirement
+      role: Bartender
+      time: 18000 # SS220-RoleTime №2
     - !type:DepartmentTimeRequirement
       department: Civilian
       time: 216000 # 60 ч