From 8b1ee412d2d22e2a6afa90f243e4a1918b7db2ef Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 25 Sep 2023 19:41:30 +0200 Subject: [PATCH 01/13] hos --- .../Roles/Jobs/Security/head_of_security.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 7b70149d961..a5f481718ef 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,15 +6,21 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 10800 #3 hrs - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 36000 #10 hrs + time: 36000 # DeltaV - 10 hours time requirement +# - !type:RoleTimeRequirement # DeltaV - No SecurityOfficer time requirement +# role: JobSecurityOfficer +# time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security - time: 108000 # 30 hrs + time: 36000 # DeltaV - 10 hours time requirement + - !type:DepartmentTimeRequirement # DeltaV - Command time requirement + department: Command + time: 36000 #10hrs + - !type:RoleTimeRequirement # DeltaV - Lawyer time requirement + role: JobLawyer + time: 14400 #4hrs - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 144000 #40 hrs weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" From 4a57971c252eee8cef92c2dc5bfae4168dc85800 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 25 Sep 2023 19:54:44 +0200 Subject: [PATCH 02/13] Security Detective stays the same --- .../Roles/Jobs/Security/head_of_security.yml | 10 +++++----- .../Roles/Jobs/Security/security_cadet.yml | 10 +++++----- .../Roles/Jobs/Security/security_officer.yml | 4 +++- Resources/Prototypes/Roles/Jobs/Security/warden.yml | 12 +++++++++--- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index a5f481718ef..3924c339765 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,17 +6,17 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 36000 # DeltaV - 10 hours time requirement -# - !type:RoleTimeRequirement # DeltaV - No SecurityOfficer time requirement + time: 36000 # DeltaV - 10 hours +# - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement # role: JobSecurityOfficer # time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security - time: 36000 # DeltaV - 10 hours time requirement - - !type:DepartmentTimeRequirement # DeltaV - Command time requirement + time: 36000 # DeltaV - 10 hours + - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement department: Command time: 36000 #10hrs - - !type:RoleTimeRequirement # DeltaV - Lawyer time requirement + - !type:RoleTimeRequirement # DeltaV - Lawyer role time requirement role: JobLawyer time: 14400 #4hrs - !type:OverallPlaytimeRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index b58009ae86e..c70d622766c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,11 +5,11 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs - - !type:DepartmentTimeRequirement - department: Security - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at security! + time: 18000 # DeltaV - 5 hours +# - !type:DepartmentTimeRequirement # DeltaV - Removes time limit +# department: Security +# time: 54000 #15 hrs +# inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index e38256b8a1c..34c5932c740 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,7 +6,9 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 36000 #10 hrs + time: 18000 # DeltaV - 5 hours + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 18000 # 5 hours startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 53ba868dcf9..e2ea1ba76c1 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,9 +4,15 @@ description: job-description-warden playTimeTracker: JobWarden requirements: - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 36000 #10 hrs +# - !type:RoleTimeRequirement # DeltaV - No SecurityOfficer time requirement +# role: JobSecurityOfficer +# time: 36000 #10 hrs + - !type:DepartmentTimeRequirement # DeltaV - Security time requirement + department: Security + time: 36000 # 10 hours + - !type:RoleTimeRequirement # DeltaV - Prisoner time requirement + role: JobPrisoner + time: 3600 # 1 hour startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos From cbe9b599459f28e171dbe13730a60e4fb2a94314 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 25 Sep 2023 20:26:07 +0200 Subject: [PATCH 03/13] Medical --- .../Roles/Jobs/Medical/chief_medical_officer.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index d9083d2c8a6..f6ba424d5ce 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -9,14 +9,14 @@ - !type:RoleTimeRequirement role: JobChemist time: 10800 #3 hrs - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 21600 #6 hrs +# - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement +# role: JobMedicalDoctor +# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Medical - time: 36000 #10 hrs + time: 43200 # DeltaV - 12 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 72000 # DeltaV - 20 hours weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" From 600a3208c378c441a4c1cd96b986c4c9a6834356 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 25 Sep 2023 20:58:26 +0200 Subject: [PATCH 04/13] Engineer is engihere --- .../Jobs/Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 5c3f42693a4..3a10b43c868 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: 54000 # 15 hrs + time: 14400 # DeltaV - 4 hours startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 713117b10b4..8532fafd724 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,15 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobStationEngineer - time: 21600 #6 hrs + time: 14400 # DeltaV - 4 hours +# - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement +# role: JobStationEngineer +# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 36000 #10 hrs + time: 28800 # DeltaV - 8 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 72000 # DeltaV - 20 hours weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" From af1de4be8d2279353f5279403ddd2d19d948c9f2 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 25 Sep 2023 21:15:54 +0200 Subject: [PATCH 05/13] command + hol --- .../Roles/Jobs/Cargo/quartermaster.yml | 3 +++ .../Prototypes/Roles/Jobs/Command/captain.yml | 13 ++++++++---- .../Roles/Jobs/Command/head_of_personnel.yml | 20 +++++++++++++------ .../Roles/Jobs/Security/head_of_security.yml | 6 +++--- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c1eef300abc..c9c68d42f2b 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -10,6 +10,9 @@ - !type:RoleTimeRequirement role: JobSalvageSpecialist time: 10800 #3 hrs + - !type:RoleTimeRequirement # DeltaV - Courrier role time requirement + role: JobMailCarrier + time: 7200 # 2 hours - !type:DepartmentTimeRequirement department: Cargo time: 36000 #10 hours diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index e2956aa3947..5a804452b8f 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,16 +6,21 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # 15 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Medical - time: 54000 # 15 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hours + time: 18000 # DeltaV - 5 hours + - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement + department: Epistemics + time: 18000 # 5 hours - !type:DepartmentTimeRequirement department: Command - time: 54000 # 15 hours + time: 108000 # DeltaV - 30 hours + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 108000 # 30 hours weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index eda1b25f927..451ced93d95 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,16 +6,24 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 36000 # 10 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Medical - time: 36000 # 10 hours + time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hrs - - !type:DepartmentTimeRequirement - department: Command - time: 36000 # 10 hours + time: 18000 # DeltaV - 5 hours + - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement + department: Epistemics + time: 18000 # 5 hours +# - !type:DepartmentTimeRequirement +# department: Command +# time: 36000 # 10 hours + - !type:DepartmentTimeRequirement # DeltaV - Civilian dept time requirement + department: Civilian + time: 10800 # 3 hours + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 72000 # 20 hours weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 3924c339765..5d06a3e0705 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -15,12 +15,12 @@ time: 36000 # DeltaV - 10 hours - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement department: Command - time: 36000 #10hrs + time: 36000 # 10 hours - !type:RoleTimeRequirement # DeltaV - Lawyer role time requirement role: JobLawyer - time: 14400 #4hrs + time: 14400 # 4 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 54000 # DeltaV - 15 hours weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" From 7159e3d7561a159849ffc6ae95367fc1cd5d6e71 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 25 Sep 2023 21:40:00 +0200 Subject: [PATCH 06/13] Civilians --- Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml | 6 +++--- Resources/Prototypes/Roles/Jobs/Civilian/chef.yml | 6 +++--- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 4 ++-- Resources/Prototypes/Roles/Jobs/Civilian/mime.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 33d988749a7..29973510662 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -4,9 +4,9 @@ description: job-description-bartender playTimeTracker: JobBartender requirements: - - !type:DepartmentTimeRequirement - department: Civilian - time: 1800 +# - !type:DepartmentTimeRequirement # DeltaV - No Civilian dept time requirement +# department: Civilian +# time: 1800 startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index ff9a0ab477e..755e152dabd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -4,9 +4,9 @@ description: job-description-chef playTimeTracker: JobChef requirements: - - !type:DepartmentTimeRequirement - department: Civilian - time: 1800 +# - !type:DepartmentTimeRequirement # DeltaV - No Civilian dept time requirement +# department: Civilian +# time: 1800 startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 34a3ac74ac3..22e2387d412 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -4,8 +4,8 @@ description: job-description-lawyer playTimeTracker: JobLawyer requirements: - - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs +# - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement +# time: 36000 # 10 hrs startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index aafa07be793..94f711223d5 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -4,8 +4,8 @@ description: job-description-mime playTimeTracker: JobMime requirements: - - !type:OverallPlaytimeRequirement - time: 14400 #4 hrs +# - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement +# time: 14400 #4 hrs startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop From 869fea0697d53689bc11d38441002e5576317b97 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 25 Sep 2023 22:16:30 +0200 Subject: [PATCH 07/13] Lawyer requires 4 hours of sec --- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 22e2387d412..ea8f29dcd69 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -6,6 +6,9 @@ requirements: # - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement # time: 36000 # 10 hrs + - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement + department: Security + time: 14400 # 4 hours startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-hop From 3979842431e22123f2dbc7ea468de39dc867668d Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 18:03:57 +0200 Subject: [PATCH 08/13] Mysta times for RD --- Resources/Prototypes/Roles/Jobs/Science/research_director.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b5ad3292e90..786c624b0af 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,9 +6,9 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 36000 #10 hrs + time: 43200 # DeltaV - 12 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 72000 # DeltaV - 20 hours weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" From 94b306637abca8bfa65c67f00271081cd1529060 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 19:46:29 +0200 Subject: [PATCH 09/13] Changes after request --- .../Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/bartender.yml | 6 +++--- Resources/Prototypes/Roles/Jobs/Civilian/chef.yml | 6 +++--- Resources/Prototypes/Roles/Jobs/Civilian/clown.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 4 ++-- Resources/Prototypes/Roles/Jobs/Civilian/mime.yml | 4 ++-- .../Jobs/Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/technical_assistant.yml | 10 +++++----- Resources/Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- .../Roles/Jobs/Medical/chief_medical_officer.yml | 2 +- .../Roles/Jobs/Medical/medical_intern.yml | 10 +++++----- .../Prototypes/Roles/Jobs/Medical/paramedic.yml | 13 ++++++++----- .../Roles/Jobs/Science/research_assistant.yml | 10 +++++----- .../Prototypes/Roles/Jobs/Security/detective.yml | 2 +- 14 files changed, 41 insertions(+), 35 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c9c68d42f2b..16026d75f51 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -22,7 +22,7 @@ startingGear: QuartermasterGear icon: "JobIconQuarterMaster" supervisors: job-supervisors-captain - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Cargo - Salvage diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 29973510662..33d988749a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -4,9 +4,9 @@ description: job-description-bartender playTimeTracker: JobBartender requirements: -# - !type:DepartmentTimeRequirement # DeltaV - No Civilian dept time requirement -# department: Civilian -# time: 1800 + - !type:DepartmentTimeRequirement + department: Civilian + time: 1800 startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 755e152dabd..ff9a0ab477e 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -4,9 +4,9 @@ description: job-description-chef playTimeTracker: JobChef requirements: -# - !type:DepartmentTimeRequirement # DeltaV - No Civilian dept time requirement -# department: Civilian -# time: 1800 + - !type:DepartmentTimeRequirement + department: Civilian + time: 1800 startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 23c70d79cc5..8a232c4faa4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -3,6 +3,9 @@ name: job-name-clown description: job-description-clown playTimeTracker: JobClown + requirements: + - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement + time: 60 # 1/120th hour 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 ea8f29dcd69..760382bc895 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -4,8 +4,8 @@ description: job-description-lawyer playTimeTracker: JobLawyer requirements: -# - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement -# time: 36000 # 10 hrs + - !type:OverallPlaytimeRequirement + time: 36000 # 10 hrs - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement department: Security time: 14400 # 4 hours diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 94f711223d5..8ef2edad87e 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -4,8 +4,8 @@ description: job-description-mime playTimeTracker: JobMime requirements: -# - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement -# time: 14400 #4 hrs + - !type:OverallPlaytimeRequirement + time: 7200 # DeltaV - 2 hours startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 3a10b43c868..f14de8f0f77 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: 14400 # DeltaV - 4 hours + time: 28800 # DeltaV - 8 hours 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 0127be9cca6..592b89947f0 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -4,14 +4,14 @@ description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at engineering! + # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit + # department: Engineering + # time: 54000 #15 hrs + # inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Maintenance - Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index a8bd80cf6e3..72a5f47be7c 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: 14400 #4 hrs + time: 21600 # DeltaV - 6 hours 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 f6ba424d5ce..e4ae9d32d3e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -22,7 +22,7 @@ icon: "JobIconChiefMedicalOfficer" requireAdminNotify: true supervisors: job-supervisors-captain - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Medical - Command diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 1b4ef7523c8..19e1f5088cf 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -4,14 +4,14 @@ description: job-description-intern playTimeTracker: JobMedicalIntern requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 54000 # 15 hrs - inverted: true # stop playing intern if you're good at med! + # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit + # department: Medical + # time: 54000 # 15 hrs + # inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Medical - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 70af27a9948..32ae97e25a5 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -4,11 +4,14 @@ description: job-description-paramedic playTimeTracker: JobParamedic requirements: - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 14400 #4 hrs - - !type:OverallPlaytimeRequirement - time: 54000 # 15 hrs + # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement + # role: JobMedicalDoctor + # time: 14400 #4 hrs + - !type:DepartmentTimeRequirement # DeltaV - Medical dept time requirement + department: Medical + time: 14400 # DeltaV - 4 hours + # - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement + # time: 54000 # 15 hrs 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 03ef192be0b..d569fe3b45a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -4,14 +4,14 @@ description: job-description-research-assistant playTimeTracker: JobResearchAssistant requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 54000 #15 hrs - inverted: true # stop playing intern if you're good at science! + # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit + # department: Science + # time: 54000 #15 hrs + # inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Research - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 00c971c2c69..9b6f0eebde7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hours + time: 36000 # DeltaV - 10 hours startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos From aecb3f8680c8f0f872cb122688db5f6c12ae3312 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 19:54:22 +0200 Subject: [PATCH 10/13] buh --- Resources/Prototypes/Roles/Jobs/Civilian/clown.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 8a232c4faa4..de9ff94d644 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -5,7 +5,7 @@ playTimeTracker: JobClown requirements: - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 60 # 1/120th hour + time: 60 # 60 seconds startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop From d62d16c6b90fe4a9e29f8316c44cd2d217eee01d Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 20:07:57 +0200 Subject: [PATCH 11/13] Epistemics isn't real --- Resources/Prototypes/Roles/Jobs/Command/captain.yml | 2 +- Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 5a804452b8f..2b0d3d28739 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -14,7 +14,7 @@ department: Security time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement - department: Epistemics + department: Science time: 18000 # 5 hours - !type:DepartmentTimeRequirement department: Command diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 451ced93d95..1404b6c2183 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -14,7 +14,7 @@ department: Security time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement - department: Epistemics + department: Science time: 18000 # 5 hours # - !type:DepartmentTimeRequirement # department: Command From 07a6bc33bc7c756f3d81b28152c14184a3058d4b Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 15:47:04 +0200 Subject: [PATCH 12/13] I don't want to set the world on fire~ I just want to start a flame in your heart --- Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 1404b6c2183..e1e784fc815 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -29,7 +29,7 @@ icon: "JobIconHeadOfPersonnel" requireAdminNotify: true supervisors: job-supervisors-captain - canBeAntag: false + canBeAntag: true # DeltaV - Can be antagonist access: - Command - HeadOfPersonnel From 99d5827a20a0a0f25db2ac697b4af6191835878a Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Thu, 28 Sep 2023 16:14:12 +0200 Subject: [PATCH 13/13] antagAdvantage for certain roles --- Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml | 1 + Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 1 + Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 1 + Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 1 + .../Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml | 1 + Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml | 1 + .../Prototypes/Roles/Jobs/Engineering/technical_assistant.yml | 1 + .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml | 1 + Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml | 1 + Resources/Prototypes/Roles/Jobs/Science/research_director.yml | 1 + 11 files changed, 11 insertions(+) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index e199f168a2e..cca7d90db56 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -3,6 +3,7 @@ name: job-name-cargotech description: job-description-cargotech playTimeTracker: JobCargoTechnician + antagAdvantage: 2 # DeltaV - Reduced TC: External Access 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 16026d75f51..cf1103c963a 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -3,6 +3,7 @@ name: job-name-qm description: job-description-qm playTimeTracker: JobQuartermaster + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:RoleTimeRequirement role: JobCargoTechnician diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 924357bf53b..59010954db1 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,6 +3,7 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist + antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons requirements: - !type:DepartmentTimeRequirement department: Cargo diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 760382bc895..a45d6025989 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -3,6 +3,7 @@ name: job-name-lawyer description: job-description-lawyer playTimeTracker: JobLawyer + antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access requirements: - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index e1e784fc815..fcf48344eb6 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -3,6 +3,7 @@ name: job-name-hop description: job-description-hop playTimeTracker: JobHeadOfPersonnel + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:DepartmentTimeRequirement department: Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index f14de8f0f77..c044af0ede6 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -3,6 +3,7 @@ name: job-name-atmostech description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician + antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit requirements: - !type:DepartmentTimeRequirement department: Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index c77f79ccfcd..40f0b4c0caf 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -3,6 +3,7 @@ name: job-name-engineer description: job-description-engineer playTimeTracker: JobStationEngineer + antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: - !type:DepartmentTimeRequirement department: Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 592b89947f0..c6fbc4c8b06 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -3,6 +3,7 @@ name: job-name-technical-assistant description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant + antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering requirements: # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit # department: Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index e4ae9d32d3e..6ead08c972f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -5,6 +5,7 @@ name: job-name-cmo description: job-description-cmo playTimeTracker: JobChiefMedicalOfficer + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:RoleTimeRequirement role: JobChemist diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 32ae97e25a5..a229635153f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -3,6 +3,7 @@ name: job-name-paramedic description: job-description-paramedic playTimeTracker: JobParamedic + antagAdvantage: 2 # DeltaV - Reduced TC: External Access requirements: # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement # role: JobMedicalDoctor diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 786c624b0af..150a7848506 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -3,6 +3,7 @@ name: job-name-rd description: job-description-rd playTimeTracker: JobResearchDirector + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:DepartmentTimeRequirement department: Science