diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index b7e8744c6ad..b03dd8abad6 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -5,20 +5,9 @@ playTimeTracker: JobQuartermaster antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - # - !type:RoleTimeRequirement #DeltaV - # role: JobCargoTechnician - # time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobSalvageSpecialist - time: 10800 #3 hrs - - !type:RoleTimeRequirement # DeltaV - Courier role time requirement - role: JobMailCarrier - time: 7200 # 2 hours - !type:DepartmentTimeRequirement department: Logistics # DeltaV - Logistics Department replacing Cargo - time: 43200 #DeltaV 12 hours - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 3600 #DeltaV 1 hour weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index f2f7c016412..1fd35653c9f 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -4,12 +4,6 @@ description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons - requirements: - - !type:DepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - time: 21600 #DeltaV 6 hrs - # - !type:OverallPlaytimeRequirement #DeltaV - # time: 36000 #10 hrs icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 8f6f9fc7de2..8af3f2ee92e 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -3,10 +3,6 @@ name: job-name-bartender description: job-description-bartender playTimeTracker: JobBartender - requirements: - - !type:DepartmentTimeRequirement - department: Civilian - time: 3600 #DeltaV startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 7f16cf16447..3ee426d8f6b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -3,10 +3,6 @@ name: job-name-chaplain description: job-description-chaplain playTimeTracker: JobChaplain - requirements: - - !type:DepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 14400 #DeltaV 4 hours startingGear: ChaplainGear icon: "JobIconChaplain" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 6ae2310474d..41889701052 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -3,10 +3,6 @@ name: job-name-chef description: job-description-chef playTimeTracker: JobChef - requirements: - - !type:DepartmentTimeRequirement - department: Civilian - time: 3600 #DeltaV 1 hour startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop @@ -17,10 +13,10 @@ extendedAccess: - Hydroponics - Bar #Nyano - Summary: After this line, Professional Che is a component to be added. Very important. - special: + special: - !type:AddComponentSpecial components: - - type: ProfessionalChef #Nyano - End Summary. + - type: ProfessionalChef #Nyano - End Summary. - type: startingGear id: ChefGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 49e3cc91a7f..b221bd0b252 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -3,9 +3,6 @@ name: job-name-clown description: job-description-clown playTimeTracker: JobClown - requirements: - - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 7200 #2 hrs startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop @@ -23,7 +20,7 @@ Piercing: 4 groups: Burn: 3 -# DeltaV - Commenting out the clown snore sound because I am not fond of it (it makes me itchy and feral). By "I", I mean Leonardo_DaBepis. +# DeltaV - Commenting out the clown snore sound because I am not fond of it (it makes me itchy and feral). By "I", I mean Leonardo_DaBepis. # - type: SleepEmitSound # snore: /Audio/Voice/Misc/silly_snore.ogg # interval: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index b67275c9930..087479abd31 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -4,12 +4,6 @@ description: job-description-lawyer playTimeTracker: JobLawyer antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access - requirements: - - !type:OverallPlaytimeRequirement - 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 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 536c8635d1b..654bf2031d0 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -3,9 +3,6 @@ name: job-name-librarian description: job-description-librarian playTimeTracker: JobLibrarian - requirements: - - !type:OverallPlaytimeRequirement #DeltaV - time: 3600 # 1 hr startingGear: LibrarianGear icon: "JobIconLibrarian" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 8da2c34231b..3675306091a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -3,9 +3,6 @@ name: job-name-mime description: job-description-mime playTimeTracker: JobMime - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 # DeltaV - 2 hours startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index f873ec5fe8c..36d8839529a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -3,9 +3,6 @@ name: job-name-musician description: job-description-musician playTimeTracker: JobMusician - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 # DeltaV - 2 hours startingGear: MusicianGear icon: "JobIconMusician" supervisors: job-supervisors-hire diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index c21fafbdaa9..7ee1076a8b9 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -3,9 +3,6 @@ name: job-name-serviceworker description: job-description-serviceworker playTimeTracker: JobServiceWorker - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 # DeltaV - 2 hours 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 905121dbf8e..14ec96f4e2f 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,25 +6,22 @@ requirements: - !type:DepartmentTimeRequirement department: Logistics # DeltaV - Logistics Department replacing Cargo - time: 18000 # DeltaV - 5 hours + time: 3600 # 1 hour - !type:DepartmentTimeRequirement department: Engineering - time: 18000 # DeltaV - 5 hours + time: 3600 # 1 hour - !type:DepartmentTimeRequirement department: Medical - time: 18000 # DeltaV - 5 hours + time: 3600 # 1 hours - !type:DepartmentTimeRequirement department: Security - time: 18000 # DeltaV - 5 hours + time: 3600 # 1 hours - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 18000 # 5 hours + time: 3600 # 1 hours - !type:DepartmentTimeRequirement department: Command - time: 108000 # DeltaV - 30 hours - - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 108000 # 30 hours - - !type:WhitelistRequirement # DeltaV - Whitelist requirement + time: 3600 # 1 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 646ef2eb819..ac8e4bf3d4a 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -5,20 +5,9 @@ playTimeTracker: JobHeadOfPersonnel antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:RoleTimeRequirement - role: JobChef - time: 14400 # DeltaV - 4 hours - - !type:RoleTimeRequirement - role: JobBartender - time: 14400 # DeltaV - 4 hours - - !type:RoleTimeRequirement - role: JobJanitor - time: 14400 # DeltaV - 4 hours - !type:DepartmentTimeRequirement # DeltaV - Civilian dept time requirement department: Civilian - time: 72000 # 20 hours - - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement - time: 90000 # 25 hours + time: 3600 # 1 hour weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index a188e93388d..6371978425d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -4,10 +4,6 @@ description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit - requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 36000 # DeltaV - 10 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 644754750a7..bbf2f28d89b 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -4,15 +4,9 @@ description: job-description-ce playTimeTracker: JobChiefEngineer requirements: - - !type:RoleTimeRequirement - role: JobAtmosphericTechnician - time: 36000 # DeltaV - 10 hours -# - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement -# role: JobStationEngineer -# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 90000 # DeltaV - 25 hours + time: 3600 # DeltaV - 25 hours # - !type:OverallPlaytimeRequirement # time: 72000 # DeltaV - 20 hours weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index ba8a8f6acc8..2d7ac9c3e11 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -4,16 +4,6 @@ description: job-description-senior-engineer playTimeTracker: JobSeniorEngineer setPreference: false # DeltaV - Disable Senior Roles round start selection - requirements: - - !type:RoleTimeRequirement - role: JobAtmosphericTechnician - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobStationEngineer - time: 21600 #6 hrs - - !type:DepartmentTimeRequirement - department: Engineering - time: 216000 # 60 hrs startingGear: SeniorEngineerGear icon: "JobIconSeniorEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index ab62d69d501..7e685a33b52 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -4,10 +4,6 @@ description: job-description-engineer playTimeTracker: JobStationEngineer antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering - requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 14400 #4 hrs startingGear: StationEngineerGear icon: "JobIconStationEngineer" 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 e0b5a268ca2..116065f1fae 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -4,13 +4,6 @@ description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering - requirements: - - !type:OverallPlaytimeRequirement # DeltaV - to prevent griefers from taking the role. - time: 14400 # 4 hours - # - !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 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index d57fe982c57..bd0d7d2ad4a 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,10 +3,6 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 28800 # DeltaV - 8 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 aac50c526c9..07f35d2cd7c 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -7,17 +7,9 @@ playTimeTracker: JobChiefMedicalOfficer antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:RoleTimeRequirement - role: JobChemist - time: 14400 #DeltaV 4 hrs -# - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement -# role: JobMedicalDoctor -# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Medical - time: 43200 # DeltaV - 12 hours - - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours + time: 3600 # DeltaV - 12 hours weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index fbc6116f46b..b51337e89c7 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -3,10 +3,6 @@ name: job-name-doctor description: job-description-doctor playTimeTracker: JobMedicalDoctor - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 14400 #4 hrs startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 0166a3dfadb..affad1827e9 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 # 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 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index e4ae7a7dd50..69f90741c98 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -4,15 +4,6 @@ description: job-description-paramedic playTimeTracker: JobParamedic antagAdvantage: 2 # DeltaV - Reduced TC: External Access - requirements: - # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement - # role: JobMedicalDoctor - # time: 14400 #4 hrs - - !type:DepartmentTimeRequirement # DeltaV - Medical dept time requirement - department: Medical - time: 28800 # DeltaV - 8 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/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index 03473cc7cbc..e63b1a121be 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -4,16 +4,6 @@ description: job-description-senior-physician playTimeTracker: JobSeniorPhysician setPreference: false # DeltaV - Disable Senior Roles round start selection - requirements: - - !type:RoleTimeRequirement - role: JobChemist - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 21600 #6 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 216000 # 60 hrs startingGear: SeniorPhysicianGear icon: "JobIconSeniorPhysician" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index fe829110051..c3efd2a64ac 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -5,7 +5,7 @@ playTimeTracker: JobBorg requirements: - !type:OverallPlaytimeRequirement - time: 216000 #60 hrs + time: 3600 #60 hrs canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 19cf1419111..cb720531c24 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -7,9 +7,7 @@ requirements: - !type:DepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 54000 # DeltaV - 15 hours - - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours + time: 3600 # DeltaV - 15 hours weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index fe00a72abb1..248c0190927 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -3,10 +3,6 @@ name: job-name-scientist description: job-description-scientist playTimeTracker: JobScientist - requirements: - - !type:DepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 14400 #4 hrs startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 5010c7fb26f..ee63fa9b715 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -4,10 +4,6 @@ description: job-description-senior-researcher playTimeTracker: JobSeniorResearcher setPreference: false # DeltaV - Disable Senior Roles round start selection - requirements: - - !type:DepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 216000 #60 hrs startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index feef023b450..665d2e07f13 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -4,9 +4,8 @@ description: job-description-detective playTimeTracker: JobDetective requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 36000 # DeltaV - 10 hours + - !type:OverallPlaytimeRequirement + time: 3600 # DeltaV - 1 hour startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index a8b7013004e..97f1caa5501 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -4,18 +4,9 @@ description: job-description-hos playTimeTracker: JobHeadOfSecurity requirements: - - !type:RoleTimeRequirement - role: JobWarden - time: 14400 #DeltaV 4 hrs - # - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement - REIMPLEMENT WHEN MORE PEOPLE HAVE IT - # role: JobDetective - # time: 14400 #DeltaV 4 hrs - - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement - department: Command - time: 36000 # 10 hours - - !type:OverallPlaytimeRequirement - time: 90000 # DeltaV - 25 hours - - !type:WhitelistRequirement # DeltaV - Whitelist requirement + - !type:DepartmentTimeRequirement + department: Security + time: 3600 # 60 hrs weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 324b697baff..2dc344128f0 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -4,12 +4,8 @@ description: job-description-cadet playTimeTracker: JobSecurityCadet requirements: - - !type:OverallPlaytimeRequirement - time: 14400 # DeltaV - 4 hours -# - !type:DepartmentTimeRequirement # DeltaV - Removes time limit -# department: Security -# time: 54000 #15 hrs -# inverted: true # stop playing intern if you're good at security! + - !type:OverallPlaytimeRequirement + time: 3600 # DeltaV - 1 hour 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 695464e030f..64d290ff956 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -4,9 +4,8 @@ description: job-description-security playTimeTracker: JobSecurityOfficer requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 14400 # DeltaV - 4 hours + - !type:OverallPlaytimeRequirement + time: 3600 # DeltaV - 1 hour startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 99167b8cd41..4b78db87edc 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -5,18 +5,8 @@ playTimeTracker: JobSeniorOfficer setPreference: false # DeltaV - Disable Senior Roles round start selection requirements: - - !type:RoleTimeRequirement - role: JobWarden - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobDetective - time: 7200 #2 hrs - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 21600 #6 hrs - - !type:DepartmentTimeRequirement - department: Security - time: 216000 # 60 hrs + - !type:OverallPlaytimeRequirement + time: 3600 # DeltaV - 1 hour startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 3b7697cb680..9f94f14743f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,13 +4,8 @@ description: job-description-warden playTimeTracker: JobWarden requirements: - - !type:RoleTimeRequirement # DeltaV - JobSecurityOfficer time requirement. Make them experienced in proper officer work. - role: JobSecurityOfficer - time: 43200 # DeltaV - 12 hrs - - !type:RoleTimeRequirement # DeltaV - JobDetective time requirement. Give them an understanding of basic forensics. - role: JobDetective - time: 14400 # DeltaV - 4 hours - - !type:WhitelistRequirement # DeltaV - Whitelist requirement + - !type:OverallPlaytimeRequirement + time: 3600 # DeltaV - 1 hour startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index ea2faf14467..d80b33402cd 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -3,9 +3,6 @@ name: job-name-boxer description: job-description-boxer playTimeTracker: JobBoxer - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 #DeltaV 2 hours startingGear: BoxerGear icon: "JobIconBoxer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 7687049b685..6073dfa98b5 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -3,12 +3,6 @@ name: job-name-psychologist description: job-description-psychologist playTimeTracker: JobPsychologist - requirements: - - !type:OverallPlaytimeRequirement - time: 36000 #DeltaV 10 hours - - !type:DepartmentTimeRequirement - department: Medical - time: 14400 #DeltaV 4 hrs startingGear: PsychologistGear icon: "JobIconPsychologist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index 6f7093f3ae5..603c0a7608f 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -3,9 +3,6 @@ name: job-name-reporter description: job-description-reporter playTimeTracker: JobReporter - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 #DeltaV 2 hours startingGear: ReporterGear icon: "JobIconReporter" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 04d10513331..7bf1ff772a9 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -3,9 +3,6 @@ name: job-name-zookeeper description: job-description-zookeeper playTimeTracker: JobZookeeper - requirements: - - !type:OverallPlaytimeRequirement - time: 7200 #DeltaV 2 hours startingGear: ZookeeperGear icon: "JobIconZookeeper" supervisors: job-supervisors-hop