From ad67cb9f80f8b16eed531ffef69a7739030cee1c Mon Sep 17 00:00:00 2001 From: eddiedoesGIT Date: Thu, 22 Aug 2024 22:07:34 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BE=D0=BF=D0=B8=D1=88=D1=83=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml | 3 +++ .../Roles/Jobs/Engineering/technical_assistant.yml | 6 +----- Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml | 5 ----- .../Prototypes/Roles/Jobs/Science/research_assistant.yml | 5 ----- Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml | 4 ---- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 655e103bca2..7f110bf485d 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: 14400 # ADT-PlaytimeRequirement = 4 hrs startingGear: CargoTechGear icon: "JobIconCargoTechnician" supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index d978d985d64..bbb5b8fafe6 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -5,11 +5,7 @@ playTimeTracker: JobTechnicalAssistant requirements: - !type:OverallPlaytimeRequirement - time: 3600 #1 hr - - !type:DepartmentTimeRequirement - department: Engineering - time: 36000 #10 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at engineering! + time: 14400 # ADT-PlaytimeRequirement = 4 hrs startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 92c362a545e..5819b5d3acf 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -3,11 +3,6 @@ name: job-name-intern description: job-description-intern playTimeTracker: JobMedicalIntern - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 36000 #10 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index e88f106f388..928c316cbc1 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -3,11 +3,6 @@ name: job-name-research-assistant description: job-description-research-assistant playTimeTracker: JobResearchAssistant - requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 36000 #10 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index b5c613793a0..5097daf1d74 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -6,10 +6,6 @@ requirements: - !type:OverallPlaytimeRequirement time: 36000 #10 hrs # Corvax-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 72000 #20 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security From 21cf13e42618164d33de621fa14518a095cc7f83 Mon Sep 17 00:00:00 2001 From: eddiedoesGIT Date: Thu, 22 Aug 2024 23:32:48 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20ADT-Tweak=20=D0=BA=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=BC=20requirements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Roles/Jobs/Engineering/technical_assistant.yml | 7 +++++++ Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml | 7 +++++++ .../Prototypes/Roles/Jobs/Science/research_assistant.yml | 7 +++++++ .../Prototypes/Roles/Jobs/Security/security_cadet.yml | 6 ++++++ 4 files changed, 27 insertions(+) diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index bbb5b8fafe6..5b7ebf687fa 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -6,6 +6,13 @@ requirements: - !type:OverallPlaytimeRequirement time: 14400 # ADT-PlaytimeRequirement = 4 hrs +# ADT-Tweak + # - !type:DepartmentTimeRequirement + # department: Engineering + # time: 36000 #10 hrs # Corvax-RoleTime + # inverted: true # stop playing intern if you're good at engineering! + # time: 14400 # ADT-PlaytimeRequirement = 4 hrs +# ADT-Tweak startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 5819b5d3acf..73ce04ba68b 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -3,6 +3,13 @@ name: job-name-intern description: job-description-intern playTimeTracker: JobMedicalIntern +# ADT-Tweak + # requirements: + # - !type:DepartmentTimeRequirement + # department: Medical + # time: 36000 #10 hrs # Corvax-RoleTime + # inverted: true # stop playing intern if you're good at med! +# ADT-Tweak startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 928c316cbc1..f41c8b005f3 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -3,6 +3,13 @@ name: job-name-research-assistant description: job-description-research-assistant playTimeTracker: JobResearchAssistant +# ADT-Tweak + # requirements: + # - !type:DepartmentTimeRequirement + # department: Science + # time: 36000 #10 hrs # Corvax-RoleTime + # inverted: true # stop playing intern if you're good at science! +# ADT-Tweak startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 5097daf1d74..2a4f24ceffb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -6,6 +6,12 @@ requirements: - !type:OverallPlaytimeRequirement time: 36000 #10 hrs # Corvax-RoleTime +# ADT-Tweak + # - !type:DepartmentTimeRequirement + # department: Security + # time: 72000 #20 hrs # Corvax-RoleTime + # inverted: true # stop playing intern if you're good at security! +# ADT-Tweak startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security