diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index 60fc1834fb..602b2d36fd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobQuartermaster - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout @@ -53,7 +53,7 @@ - type: loadout id: QuartermasterMantle - equipment: + equipment: neck: ClothingNeckMantleQM effects: - !type:GroupLoadoutEffect diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index d9c4faed8c..d902481f9c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -5,7 +5,7 @@ requirement: !type:RoleTimeRequirement role: JobJanitor - time: 187200 #52 hrs (1 hour per week for 1 year) + time: 52h # 1 hour per week for 1 year # Head - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index edb9c8d1fc..1ed5e8aca0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobPassenger - time: 36000 #10 hrs, silly reward for people who play passenger a lot + time: 10h # silly reward for people who play passenger a lot # Head of Greytide (for grey mantle) - type: loadoutEffectGroup @@ -16,7 +16,7 @@ requirement: !type:RoleTimeRequirement role: JobPassenger - time: 72000 #20 hrs, fun mantle for the most experienced greytiders + time: 20h # fun mantle for the most experienced greytiders # Face - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 9043354a31..2951678968 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobCaptain - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 45223bea14..17a84b7386 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 72000 #20 hrs + time: 20h # Professional HoP Time - type: loadoutEffectGroup @@ -16,7 +16,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 54000 #15 hrs, special reward for HoP mains + time: 15h # special reward for HoP mains # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 13b72e0af4..55f184a168 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobChiefEngineer - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 82955fccfb..64bfe79a4d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -6,17 +6,17 @@ requirement: !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobStationEngineer - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Engineering - time: 216000 # 60 hrs + time: 60h # Head - type: startingGear diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index 43bbc42f46..1444247083 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobChiefMedicalOfficer - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index 3b43df4d4b..b5e5cc10e8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -6,17 +6,17 @@ requirement: !type:RoleTimeRequirement role: JobChemist - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobMedicalDoctor - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Medical - time: 216000 # 60 hrs + time: 60h # Other Timers @@ -27,7 +27,7 @@ requirement: !type:RoleTimeRequirement role: JobMedicalDoctor - time: 108000 #30 hrs + time: 30h # Head diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index 2e607aca69..3717c1c67c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobResearchDirector - time: 72000 #20 hrs + time: 20h # Head - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index e89802e9c1..080015f0da 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirement: !type:DepartmentTimeRequirement department: Science - time: 216000 #60 hrs + time: 60h # Head - type: startingGear diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 1f40d5e044..e85e1c8ccb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfSecurity - time: 72000 #20 hrs + time: 20h # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 6cc0dedf72..482e3ab896 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -6,12 +6,12 @@ requirement: !type:RoleTimeRequirement role: JobWarden - time: 21600 #6 hrs + time: 6h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Security - time: 216000 # 60 hrs + time: 60h #Security Star - type: loadoutEffectGroup @@ -21,7 +21,7 @@ requirement: !type:DepartmentTimeRequirement department: Security - time: 360000 #100 hrs + time: 100h # Head - type: loadout @@ -67,7 +67,7 @@ - type: loadout id: TrooperUniform - equipment: + equipment: jumpsuit: ClothingUniformSecurityTrooper - type: loadout diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml index 1ff3f1533e..8a474d359a 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobLibrarian - time: 3600 # 1 hour of being the biggest nerd on the station + time: 1h # for being the biggest nerd on the station - type: loadoutEffectGroup id: JensenTimer @@ -15,7 +15,7 @@ requirement: !type:DepartmentTimeRequirement department: Cargo - time: 36000 #10 hours of being a space trucker + time: 10h # 10 hours of being a space trucker # Basic options # Glasses @@ -41,4 +41,4 @@ - !type:GroupLoadoutEffect proto: JensenTimer equipment: - eyes: ClothingEyesGlassesJensen \ No newline at end of file + eyes: ClothingEyesGlassesJensen diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index ccaf3abe42..ad58f9c58d 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -6,7 +6,7 @@ requirement: !type:DepartmentTimeRequirement department: Command - time: 3600 # 1 hour + time: 1h # Flowers - type: loadout @@ -308,7 +308,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 10h storage: back: - TowelColorWhite @@ -320,7 +320,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 1800000 # 500hr + time: 500h storage: back: - TowelColorSilver @@ -332,7 +332,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 3600000 # 1000hr + time: 1000h storage: back: - TowelColorGold @@ -345,7 +345,7 @@ requirement: !type:DepartmentTimeRequirement department: Cargo - time: 360000 # 100hr + time: 100h storage: back: - TowelColorLightBrown @@ -358,7 +358,7 @@ requirement: !type:DepartmentTimeRequirement department: Civilian - time: 360000 # 100hr + time: 100h storage: back: - TowelColorGreen @@ -371,7 +371,7 @@ requirement: !type:DepartmentTimeRequirement department: Command - time: 360000 # 100hr + time: 100h storage: back: - TowelColorDarkBlue @@ -384,7 +384,7 @@ requirement: !type:DepartmentTimeRequirement department: Engineering - time: 360000 # 100hr + time: 100h storage: back: - TowelColorOrange @@ -397,7 +397,7 @@ requirement: !type:DepartmentTimeRequirement department: Medical - time: 360000 # 100hr + time: 100h storage: back: - TowelColorLightBlue @@ -410,7 +410,7 @@ requirement: !type:DepartmentTimeRequirement department: Science - time: 360000 # 100hr + time: 100h storage: back: - TowelColorPurple @@ -423,7 +423,7 @@ requirement: !type:DepartmentTimeRequirement department: Security - time: 360000 # 100hr + time: 100h storage: back: - TowelColorRed @@ -436,7 +436,7 @@ requirement: !type:RoleTimeRequirement role: JobPassenger - time: 360000 # 100hr + time: 100h storage: back: - TowelColorGray @@ -449,7 +449,7 @@ requirement: !type:RoleTimeRequirement role: JobChaplain - time: 360000 # 100hr + time: 100h storage: back: - TowelColorBlack @@ -462,7 +462,7 @@ requirement: !type:RoleTimeRequirement role: JobLibrarian - time: 360000 # 100hr + time: 100h storage: back: - TowelColorDarkGreen @@ -475,7 +475,7 @@ requirement: !type:RoleTimeRequirement role: JobLawyer - time: 360000 # 100hr + time: 100h storage: back: - TowelColorMaroon @@ -488,7 +488,7 @@ requirement: !type:RoleTimeRequirement role: JobClown - time: 360000 # 100hr + time: 100h storage: back: - TowelColorYellow @@ -501,7 +501,7 @@ requirement: !type:RoleTimeRequirement role: JobMime - time: 360000 # 100hr + time: 100h storage: back: - TowelColorMime diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 5e464c1116..e2018b91a6 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -6,7 +6,7 @@ objective: roles-antag-nuclear-operative-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h guides: [ NuclearOperatives ] - type: antag @@ -17,10 +17,10 @@ objective: roles-antag-nuclear-operative-agent-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h - !type:RoleTimeRequirement role: JobChemist - time: 10800 # 3h + time: 3h guides: [ NuclearOperatives ] - type: antag @@ -31,10 +31,10 @@ objective: roles-antag-nuclear-operative-commander-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h - !type:DepartmentTimeRequirement department: Security - time: 18000 # 5h + time: 5h # should be changed to nukie playtime when thats tracked (wyci) guides: [ NuclearOperatives ] diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index eeef73b2d5..172876040a 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -7,7 +7,7 @@ guides: [ Revolutionaries ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: antag id: Rev diff --git a/Resources/Prototypes/Roles/Antags/thief.yml b/Resources/Prototypes/Roles/Antags/thief.yml index 4b333ac495..740a7e217f 100644 --- a/Resources/Prototypes/Roles/Antags/thief.yml +++ b/Resources/Prototypes/Roles/Antags/thief.yml @@ -7,7 +7,7 @@ guides: [ Thieves ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: startingGear id: ThiefGear diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index 572adea1e4..edc130ef8b 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -7,7 +7,7 @@ guides: [ Traitors ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: antag id: TraitorSleeper @@ -18,7 +18,7 @@ guides: [ Traitors ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h # Syndicate Operative Outfit - Monkey - type: startingGear diff --git a/Resources/Prototypes/Roles/Antags/wizard.yml b/Resources/Prototypes/Roles/Antags/wizard.yml index 0ddf90ef2b..8ef9bda367 100644 --- a/Resources/Prototypes/Roles/Antags/wizard.yml +++ b/Resources/Prototypes/Roles/Antags/wizard.yml @@ -13,7 +13,7 @@ objective: roles-antag-wizard-objective # TODO: maybe give random objs and stationary ones from AntagObjectives and AntagRandomObjectives requirements: # I hate time locked roles but this should be enough time for someone to be acclimated - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 5h guides: [ Wizard ] # See wizard_startinggear for wiz start gear options diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml index 4629e6b509..fa6561aa5e 100644 --- a/Resources/Prototypes/Roles/Antags/zombie.yml +++ b/Resources/Prototypes/Roles/Antags/zombie.yml @@ -7,7 +7,7 @@ guides: [ Zombies ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h - type: antag id: Zombie diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 5a62c1dc8e..92b9b93671 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -6,13 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobCargoTechnician - time: 18000 #5 hrs + time: 5h - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 9000 #2.5 hrs + time: 2.5h - !type:DepartmentTimeRequirement department: Cargo - time: 36000 #10 hours + time: 10h 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 9bab10529b..7756f8dde9 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Cargo - time: 9000 # 2.5 hrs + time: 2.5h 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 8881fb0d41..2d32b87f68 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 #0.5 hr + time: 0.5h 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 fd3941d4e0..734f22597c 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 #0.5 hr + time: 0.5h 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 81c8b71050..11f07252a3 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -5,7 +5,7 @@ playTimeTracker: JobLawyer requirements: - !type:OverallPlaytimeRequirement - time: 9000 # 2.5 hrs + time: 2.5h 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 293df524e9..8ff045173d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMime requirements: - !type:OverallPlaytimeRequirement - time: 14400 #4 hrs + time: 4h startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index f98dac80ed..0c83971827 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 #0.5 hr + time: 0.5h 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 fa02e160a8..54251b263b 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,19 +6,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Medical - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Science - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Security - time: 14400 # 4 hours + time: 4h - !type:DepartmentTimeRequirement department: Command - time: 14400 # 4 hours + time: 4h 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 ac052e5cdf..4dfafb97d1 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,19 +6,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 9000 # 2.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Medical - time: 9000 # 2.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Science - time: 9000 # 2.5 hrs + time: 2.5h - !type:DepartmentTimeRequirement department: Security - time: 9000 # 2.5 hrs + time: 2.5h - !type:DepartmentTimeRequirement department: Command - time: 9000 # 2.5 hours + time: 2.5h weight: 20 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 5dda67f25d..20a6dc7ace 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: 9000 #2.5 hrs + time: 2.5h 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 264e31a3ae..561d026020 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,13 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 9000 #2.5 hrs + time: 2.5h - !type:RoleTimeRequirement role: JobStationEngineer - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Engineering - time: 36000 #10 hrs + time: 10h 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 c67e3067cb..c99140b095 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 9000 #2.5 hrs + time: 2.5h 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 24cef50e1a..afc0182c0f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -5,10 +5,10 @@ playTimeTracker: JobTechnicalAssistant requirements: - !type:OverallPlaytimeRequirement - time: 3600 #1 hr + time: 1h - !type:DepartmentTimeRequirement department: Engineering - time: 18000 #5 hrs + time: 5h inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index e14fbd5b84..784ba81403 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 18000 #5 hrs + time: 5h 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 b6698091df..f67041a713 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,13 +8,13 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 9000 #2.5 hrs + time: 2.5h - !type:RoleTimeRequirement role: JobMedicalDoctor - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Medical - time: 36000 #10 hrs + time: 10h 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 4b43df2004..a41e95d400 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 9000 #2.5 hrs + time: 2.5h 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 d313d12d9b..0517d318e1 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 18000 # 5 hrs + time: 5h inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 5526e63f24..da71ac0367 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 9000 #2.5 hrs + time: 2.5h 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 84ded8ed48..da84441e31 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -8,7 +8,7 @@ requirements: - !type:RoleTimeRequirement role: JobBorg - time: 18000 # 5 hrs + time: 5h canBeAntag: false icon: JobIconStationAi supervisors: job-supervisors-rd @@ -23,7 +23,7 @@ playTimeTracker: JobBorg requirements: - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs + time: 10h 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 e824368cb7..96b95c3d58 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 18000 #5 hrs + time: 5h inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index da41d9f3e0..a7b057dc1b 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,10 +6,10 @@ requirements: - !type:RoleTimeRequirement role: JobScientist - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Science - time: 36000 #10 hrs + time: 10h 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 e2e31f8dcf..5e8e1b6e14 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 9000 #2.5 hrs + time: 2.5h 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 e5c9fdf2dc..f59e1bf836 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 18000 #5 hrs + time: 5h 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 7db7429263..1f73f48988 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,16 +6,16 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 3600 #1 hr + time: 1h - !type:RoleTimeRequirement role: JobDetective - time: 3600 #1 hr, knowing how to use the tools is important + time: 1h # knowing how to use the tools is important - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hrs + time: 10h 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 cac79f4822..8dc5815fcf 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,10 +5,10 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs + time: 10h - !type:DepartmentTimeRequirement department: Security - time: 18000 #5 hrs + time: 5h inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 432c6b0d3c..141801e4ff 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 9000 #2.5 hrs + time: 2.5h 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 42964ee134..566b0da6d1 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -6,10 +6,10 @@ requirements: - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 18000 #5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Security - time: 36000 #10 hrs + time: 10h weight: 5 startingGear: WardenGear icon: "JobIconWarden" diff --git a/Resources/Prototypes/Roles/requirement_overrides.yml b/Resources/Prototypes/Roles/requirement_overrides.yml index 62041f42d7..752249e90b 100644 --- a/Resources/Prototypes/Roles/requirement_overrides.yml +++ b/Resources/Prototypes/Roles/requirement_overrides.yml @@ -4,13 +4,13 @@ Captain: - !type:DepartmentTimeRequirement department: Engineering - time: 3600 # 1 hours + time: 1h - !type:DepartmentTimeRequirement department: Medical - time: 3600 # 1 hours + time: 1h - !type:DepartmentTimeRequirement department: Security - time: 3600 # 1 hours + time: 1h - !type:DepartmentTimeRequirement department: Command - time: 3600 # 1 hour + time: 1h