From 5fdc54d24d22bef3dad8de8a404acc56aeb10537 Mon Sep 17 00:00:00 2001 From: RealJosephStalin Date: Mon, 7 Oct 2024 18:53:16 -0400 Subject: [PATCH] Fix roletime reqs --- Resources/Prototypes/Roles/Antags/ninja.yml | 3 --- Resources/Prototypes/Roles/Antags/nukeops.yml | 21 ------------------ .../Prototypes/Roles/Antags/revolutionary.yml | 6 ----- Resources/Prototypes/Roles/Antags/traitor.yml | 3 --- Resources/Prototypes/Roles/Antags/zombie.yml | 3 --- .../Roles/Jobs/Civilian/bartender.yml | 4 ---- .../Roles/Jobs/Civilian/chaplain.yml | 3 --- .../Prototypes/Roles/Jobs/Civilian/chef.yml | 4 ---- .../Prototypes/Roles/Jobs/Civilian/clown.yml | 3 --- .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 5 +---- .../Roles/Jobs/Civilian/librarian.yml | 5 ++--- .../Prototypes/Roles/Jobs/Civilian/mime.yml | 3 --- .../Roles/Jobs/Civilian/musician.yml | 3 --- .../Roles/Jobs/Civilian/service_worker.yml | 3 --- .../Prototypes/Roles/Jobs/Command/captain.yml | 22 ++----------------- .../Roles/Jobs/Command/head_of_personnel.yml | 14 +----------- .../Engineering/atmospheric_technician.yml | 5 ++--- .../Roles/Jobs/Engineering/chief_engineer.yml | 13 ++--------- .../Jobs/Engineering/station_engineer.yml | 4 ---- .../Jobs/Engineering/technical_assistant.yml | 7 ------ .../Prototypes/Roles/Jobs/Medical/chemist.yml | 4 ---- .../Jobs/Medical/chief_medical_officer.yml | 11 +--------- .../Roles/Jobs/Medical/medical_doctor.yml | 4 ---- .../Roles/Jobs/Medical/medical_intern.yml | 5 ----- .../Roles/Jobs/Medical/paramedic.yml | 9 -------- .../Prototypes/Roles/Jobs/Science/borg.yml | 2 +- .../Roles/Jobs/Science/research_assistant.yml | 5 ----- .../Roles/Jobs/Science/research_director.yml | 7 ++---- .../Roles/Jobs/Science/roboticist.yml | 4 ---- .../Roles/Jobs/Science/scientist.yml | 4 ---- .../Roles/Jobs/Security/detective.yml | 5 ++--- .../Roles/Jobs/Security/head_of_security.yml | 11 +--------- .../Roles/Jobs/Security/security_cadet.yml | 6 +---- .../Roles/Jobs/Security/security_officer.yml | 5 ++--- .../Prototypes/Roles/Jobs/Security/warden.yml | 8 ++----- .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 3 --- .../Roles/Jobs/Wildcards/psychologist.yml | 5 +---- .../Roles/Jobs/Wildcards/reporter.yml | 3 --- .../Roles/Jobs/Wildcards/zookeeper.yml | 3 --- 39 files changed, 23 insertions(+), 215 deletions(-) diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml index fd8a79ad25..a7492bd1b1 100644 --- a/Resources/Prototypes/Roles/Antags/ninja.yml +++ b/Resources/Prototypes/Roles/Antags/ninja.yml @@ -4,6 +4,3 @@ antagonist: true setPreference: false objective: roles-antag-space-ninja-objective - requirements: - - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 259200 # DeltaV - 72 hours diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 5fa3f27cac..63d859ec93 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -4,12 +4,6 @@ antagonist: true setPreference: true objective: roles-antag-nuclear-operative-objective - requirements: - - !type:CharacterOverallTimeRequirement - min: 108000 # DeltaV - 30 hours - - !type:CharacterDepartmentTimeRequirement # DeltaV - Security dept time requirement - department: Security - min: 36000 # DeltaV - 10 hours - type: antag id: NukeopsMedic @@ -17,12 +11,6 @@ antagonist: true setPreference: true objective: roles-antag-nuclear-operative-agent-objective - requirements: - - !type:CharacterOverallTimeRequirement - min: 108000 # DeltaV - 30 hours - - !type:CharacterDepartmentTimeRequirement # DeltaV - Medical dept time requirement - department: Medical - min: 36000 # DeltaV - 10 hours - type: antag id: NukeopsCommander @@ -30,15 +18,6 @@ antagonist: true setPreference: true objective: roles-antag-nuclear-operative-commander-objective - requirements: - - !type:CharacterOverallTimeRequirement - min: 216000 # DeltaV - 60 hours - - !type:CharacterDepartmentTimeRequirement # DeltaV - Security dept time requirement - department: Security - min: 36000 # DeltaV - 10 hours - - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement - department: Command - min: 36000 # DeltaV - 10 hours #Lone Operative Gear - type: startingGear diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index cc551fc467..c5e6cb8149 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -4,12 +4,6 @@ antagonist: true setPreference: true objective: roles-antag-rev-head-objective - requirements: - - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 172800 # DeltaV - 48 hours - - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement - department: Command - min: 36000 # DeltaV - 10 hours - type: antag id: Rev diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index fec2280ddc..a4e1fe8d10 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -4,6 +4,3 @@ antagonist: true setPreference: true objective: roles-antag-syndicate-agent-objective - requirements: - - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 86400 # DeltaV - 24 hours diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml index 5ec90f6816..2ba5640891 100644 --- a/Resources/Prototypes/Roles/Antags/zombie.yml +++ b/Resources/Prototypes/Roles/Antags/zombie.yml @@ -4,9 +4,6 @@ antagonist: true setPreference: true objective: roles-antag-initial-infected-objective - requirements: - - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 43200 # DeltaV - 12 hours - type: antag id: Zombie diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 85a86dabce..8af3f2ee92 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:CharacterDepartmentTimeRequirement - department: Civilian - min: 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 d4f8bdb067..44fdd47d21 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -4,9 +4,6 @@ description: job-description-chaplain playTimeTracker: JobChaplain requirements: - - !type:CharacterDepartmentTimeRequirement - department: Epistemics # Chaplain is now one of the station's "Crew-Aligned Wizards" - min: 14400 # 4 hours - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 0837f1f390..4188970105 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:CharacterDepartmentTimeRequirement - department: Civilian - min: 3600 #DeltaV 1 hour 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 141f4d39b7..be7d5c87b2 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:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 7200 #2 hrs 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 b8e37c2beb..da54e23753 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -6,10 +6,7 @@ antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access requirements: - !type:CharacterOverallTimeRequirement - min: 36000 # 10 hrs - - !type:CharacterDepartmentTimeRequirement # DeltaV - Security dept time requirement - department: Security - min: 14400 # 4 hours + min: 60 startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-cj # Delta V - Change supervisor to chief justice diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 8552073dcc..82fcef4661 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -4,9 +4,8 @@ description: job-description-librarian playTimeTracker: JobLibrarian requirements: - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 14400 + - !type:CharacterOverallTimeRequirement + min: 60 - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index c7c659bc53..2c60a71f45 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:CharacterOverallTimeRequirement - min: 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 28f9c597e5..36d8839529 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:CharacterOverallTimeRequirement - min: 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 8bfd05ad01..7ee1076a8b 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:CharacterOverallTimeRequirement - min: 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 6c4743c8b3..d02dfff605 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,26 +4,8 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: - - !type:CharacterDepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - min: 18000 # DeltaV - 5 hours - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 18000 # DeltaV - 5 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 18000 # DeltaV - 5 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 18000 # DeltaV - 5 hours - - !type:CharacterDepartmentTimeRequirement # DeltaV - Epistemics dept time requirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 18000 # 5 hours - - !type:CharacterDepartmentTimeRequirement - department: Command - min: 108000 # DeltaV - 30 hours - - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 108000 # 30 hours + - !type:CharacterOverallTimeRequirement + min: 60 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 878b184b8b..2f3b7f9c56 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -5,20 +5,8 @@ playTimeTracker: JobHeadOfPersonnel antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobChef - min: 14400 # DeltaV - 4 hours - - !type:CharacterPlaytimeRequirement - tracker: JobBartender - min: 14400 # DeltaV - 4 hours - - !type:CharacterPlaytimeRequirement - tracker: JobJanitor - min: 14400 # DeltaV - 4 hours - - !type:CharacterDepartmentTimeRequirement # DeltaV - Civilian dept time requirement - department: Civilian - min: 72000 # 20 hours - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement - min: 90000 # 25 hours + min: 60 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 1a6ddbc0c4..e0f8ea79f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -5,9 +5,8 @@ playTimeTracker: JobAtmosphericTechnician antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit requirements: - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 36000 # DeltaV - 10 hours + - !type:CharacterOverallTimeRequirement + min: 60 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 2690b9ba01..666ca5042c 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -4,17 +4,8 @@ description: job-description-ce playTimeTracker: JobChiefEngineer requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 36000 # DeltaV - 10 hours -# - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement -# role: JobStationEngineer -# time: 21600 #6 hrs - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 90000 # DeltaV - 25 hours -# - !type:OverallPlaytimeRequirement -# time: 72000 # DeltaV - 20 hours + - !type:CharacterOverallTimeRequirement + min: 60 # DeltaV - 25 hours weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index dc59004519..7e685a33b5 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:CharacterDepartmentTimeRequirement - department: Engineering - min: 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 668af72751..116065f1fa 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:CharacterOverallTimeRequirement # DeltaV - to prevent griefers from taking the role. - min: 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 66466352cb..50ea396219 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:CharacterDepartmentTimeRequirement - department: Medical - min: 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 b132729432..2ca1c48ad1 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -7,17 +7,8 @@ playTimeTracker: JobChiefMedicalOfficer antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 14400 #DeltaV 4 hrs -# - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement -# role: JobMedicalDoctor -# time: 21600 #6 hrs - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 43200 # DeltaV - 12 hours - !type:CharacterOverallTimeRequirement - min: 72000 # DeltaV - 20 hours + min: 60 # DeltaV - 20 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 627b0e17dc..0946b6ba20 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:CharacterDepartmentTimeRequirement - department: Medical - min: 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 003eab22d2..983712d3a9 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 0937a4627a..18ecce1cc1 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:CharacterDepartmentTimeRequirement # DeltaV - Medical dept time requirement - department: Medical - min: 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/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index 456a761dba..b025892817 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:CharacterOverallTimeRequirement - min: 216000 #60 hrs + min: 60 #One minute canBeAntag: false icon: JobIconBorg supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 4d4038d7c0..20bbe131bb 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 # 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 diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 46d91ee00e..13768b4ca1 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -5,13 +5,10 @@ playTimeTracker: JobResearchDirector antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - - !type:CharacterDepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 54000 # DeltaV - 15 hours - !type:CharacterOverallTimeRequirement - min: 72000 # DeltaV - 20 hours + min: 60 # Not DeltaV - One minute - !type:CharacterLogicOrRequirement - requirements: + requirements: # Idk I just left this in - !type:CharacterSpeciesRequirement inverted: true species: diff --git a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml index 1d2434a4e0..88f5b8e915 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml @@ -3,10 +3,6 @@ name: job-name-roboticist description: job-description-roboticist playTimeTracker: JobRoboticist - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 14400 # 4 hours - same as scientist startingGear: RoboticistGear icon: "JobIconRoboticist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 2d91e0e6ef..248c019092 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:CharacterDepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 14400 #4 hrs startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 861088b5e5..42610efd07 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:CharacterDepartmentTimeRequirement - department: Security - min: 36000 # DeltaV - 10 hours + - !type:CharacterOverallTimeRequirement + min: 60 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 8f3959d630..f072cfbdb8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -4,17 +4,8 @@ description: job-description-hos playTimeTracker: JobHeadOfSecurity requirements: - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 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:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement - department: Command - min: 36000 # 10 hours - !type:CharacterOverallTimeRequirement - min: 90000 # DeltaV - 25 hours + min: 60 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 0b28af7850..d5ed655a6f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,11 +5,7 @@ playTimeTracker: JobSecurityCadet requirements: - !type:CharacterOverallTimeRequirement - min: 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! + min: 60 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 b81cef667e..1ef9194e63 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:CharacterDepartmentTimeRequirement - department: Security - min: 14400 # DeltaV - 4 hours + - !type:CharacterOverallTimeRequirement + min: 60 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 6e80286fb1..101ef27c74 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,12 +4,8 @@ description: job-description-warden playTimeTracker: JobWarden requirements: - - !type:CharacterPlaytimeRequirement # DeltaV - JobSecurityOfficer time requirement. Make them experienced in proper officer work. - tracker: JobSecurityOfficer - min: 43200 # DeltaV - 12 hrs - - !type:CharacterPlaytimeRequirement # DeltaV - JobDetective time requirement. Give them an understanding of basic forensics. - tracker: JobDetective - min: 14400 # DeltaV - 4 hours + - !type:CharacterOverallTimeRequirement + min: 60 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 33def38bb0..d80b33402c 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:CharacterOverallTimeRequirement - min: 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 a2974c6eb7..6347236c01 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -5,10 +5,7 @@ playTimeTracker: JobPsychologist requirements: - !type:CharacterOverallTimeRequirement - min: 36000 #DeltaV 10 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 14400 #DeltaV 4 hrs + min: 60 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 ad810e970e..603c0a7608 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:CharacterOverallTimeRequirement - min: 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 1686e3290f..7bf1ff772a 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:CharacterOverallTimeRequirement - min: 7200 #DeltaV 2 hours startingGear: ZookeeperGear icon: "JobIconZookeeper" supervisors: job-supervisors-hop