From e735ad71bc1ebfc5d2efaf0c06f1ebc2ae384705 Mon Sep 17 00:00:00 2001 From: gogenych Date: Wed, 14 Aug 2024 13:46:46 +0300 Subject: [PATCH] =?UTF-8?q?SS220-RoleTime=20=E2=84=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Roles/Jobs/Cargo/cargo_technician.yml | 3 +++ .../Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 5 ++++- .../Roles/Jobs/Cargo/salvage_specialist.yml | 2 ++ Resources/Prototypes/Roles/Jobs/Civilian/clown.yml | 4 +++- .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 4 ++-- Resources/Prototypes/Roles/Jobs/Civilian/mime.yml | 4 +++- .../Roles/Jobs/Civilian/service_worker.yml | 3 +++ .../Prototypes/Roles/Jobs/Command/captain.yml | 2 +- .../Roles/Jobs/Command/head_of_personnel.yml | 3 +++ .../Jobs/Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/technical_assistant.yml | 2 +- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- .../Roles/Jobs/Medical/chief_medical_officer.yml | 3 +++ .../Roles/Jobs/Medical/medical_intern.yml | 2 +- .../Prototypes/Roles/Jobs/Medical/paramedic.yml | 2 +- .../Roles/Jobs/Science/research_assistant.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 3 +++ .../Roles/Jobs/Security/security_cadet.yml | 2 +- .../Prototypes/SS220/Roles/Jobs/security_pilot.yml | 2 +- .../Prototypes/SS220/Roles/Jobs/senior_sec.yml | 4 ++-- .../Prototypes/SS220/Roles/Jobs/senior_service.yml | 14 ++++++++++---- 21 files changed, 50 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 655e103bca25fc..9fa552b53a8542 100644 --- 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 index 8f64d1c60287bb..38e70c1f6e9ae2 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -7,8 +7,11 @@ - !type:DepartmentTimeRequirement department: Cargo time: 108000 # SS220-RoleTime + - !type:RoleTimeRequirement + role: SalvageSpecialist + time: 18000 # SS220-RoleTime №2 - !type:OverallPlaytimeRequirement - time: 180000 # SS220-RoleTime + time: 180000 # SS220-RoleTime - !type:AgeRequirement requiredAge: 20 - !type:SpeciesRequirement #SS220-jobbans begin diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 150938a05b45d6..fa500252ea265c 100644 --- 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 index d67c81fdef8bce..12b0c6c5932767 100644 --- 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 index 09cf08fb5852f3..c743b4761624f5 100644 --- 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 index 2d15247f1950e4..9b40373d5c78c1 100644 --- 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 index 1ccc8fada1e300..f9285302a0670e 100644 --- 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 index ee297bf8887ac9..b12d5e7f15d9db 100644 --- 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 index 81b91707581200..b8886727d08721 100644 --- 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 index f819dfc8a83f77..4072fc7c227607 100644 --- 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 index 87c9b0587d21e4..5e1e4639545a7f 100644 --- 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 index edde75e96749a1..5248a888ba49dd 100644 --- 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 index 59f87d46ef6e39..fb00c4e04b595a 100644 --- 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 index 9d683f2fa8ae50..fd73c518a30f41 100644 --- 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 index 64327448186745..78065950c7c751 100644 --- 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 index d522618bc1c69c..fd82928b846d50 100644 --- 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 index d6793919e60b06..6db44110954dc8 100644 --- 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 index 8b88733a14d52f..4070ae2b90a51b 100644 --- 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 index 4b677e38b91735..55fc0ac90a11bd 100644 --- 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 index 02e77924a14774..bf095d62b9b04d 100644 --- 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 index 9fcea673f5b406..a54339b70c802c 100644 --- 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 ч