diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 481041948af..bac4efd482a 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -210,7 +210,7 @@ public static readonly CVarDef /// If roles should be restricted based on time. /// public static readonly CVarDef - GameRoleTimers = CVarDef.Create("game.role_timers", false, CVar.SERVER | CVar.REPLICATED); + GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED); /// /// Whether a random position offset will be applied to the station on roundstart. diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index f3b03ce7877..b3f5a83d7b0 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -3,16 +3,16 @@ name: job-name-qm description: job-description-qm playTimeTracker: JobQuartermaster - requirements: - - !type:RoleTimeRequirement - role: JobCargoTechnician - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobSalvageSpecialist - time: 21600 #6 hrs - - !type:DepartmentTimeRequirement - department: Cargo - time: 108000 # 30 hrs + # requirements: + # - !type:RoleTimeRequirement + # role: JobCargoTechnician + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobSalvageSpecialist + # time: 21600 #6 hrs + # - !type:DepartmentTimeRequirement + # department: Cargo + # time: 108000 # 30 hrs weight: 10 startingGear: QuartermasterGear icon: "QuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 3f23ca4c210..9251af9cf38 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,10 +3,10 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist - requirements: - - !type:DepartmentTimeRequirement - department: Cargo - time: 3600 + # requirements: + # - !type:DepartmentTimeRequirement + # department: Cargo + # time: 3600 icon: "ShaftMiner" 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 de08bbd18c4..631be9a51aa 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 + # department: Civilian + # time: 1800 startingGear: BartenderGear icon: "Bartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 22bfb78cd72..9d88ab3d733 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -3,10 +3,10 @@ name: job-name-chef description: job-description-chef playTimeTracker: JobChef - requirements: - - !type:DepartmentTimeRequirement - department: Civilian - time: 1800 + # requirements: + # - !type:DepartmentTimeRequirement + # department: Civilian + # time: 1800 startingGear: ChefGear icon: "Chef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index ccca88d3cd8..1a77e331020 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -3,25 +3,25 @@ name: job-name-captain description: job-description-captain playTimeTracker: JobCaptain - requirements: - - !type:RoleTimeRequirement - role: JobHeadOfPersonnel - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobHeadOfSecurity - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobChiefMedicalOfficer - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobChiefEngineer - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobResearchDirector - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobQuartermaster - time: 21600 #6 hrs + # requirements: + # - !type:RoleTimeRequirement + # role: JobHeadOfPersonnel + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobHeadOfSecurity + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobChiefMedicalOfficer + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobChiefEngineer + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobResearchDirector + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobQuartermaster + # time: 21600 #6 hrs weight: 20 startingGear: CaptainGear icon: "Captain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index b494f67483e..8b69ac3e72f 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -4,18 +4,8 @@ description: job-description-hop playTimeTracker: JobHeadOfPersonnel requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 54000 # 15 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 54000 # 15 hrs - - !type:DepartmentTimeRequirement - department: Security - time: 54000 # 15 hrs - - !type:DepartmentTimeRequirement - department: Command - time: 72000 # 20 hrs + - !type:OverallPlaytimeRequirement + time: 36000 weight: 20 startingGear: HoPGear icon: "HeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 75ec5e161d1..9b450204e4b 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -4,9 +4,9 @@ description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 3600 + # - !type:DepartmentTimeRequirement + # department: Engineering + # time: 3600 startingGear: AtmosphericTechnicianGear icon: "AtmosphericTechnician" 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 c81c19f7ded..aec8136e492 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -3,16 +3,16 @@ name: job-name-ce description: job-description-ce playTimeTracker: JobChiefEngineer - requirements: - - !type:RoleTimeRequirement - role: JobAtmosphericTechnician - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobStationEngineer - time: 21600 #6 hrs - - !type:DepartmentTimeRequirement - department: Engineering - time: 108000 # 30 hrs + # requirements: + # - !type:RoleTimeRequirement + # role: JobAtmosphericTechnician + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobStationEngineer + # time: 21600 #6 hrs + # - !type:DepartmentTimeRequirement + # department: Engineering + # time: 108000 # 30 hrs weight: 10 startingGear: ChiefEngineerGear icon: "ChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index fd48e33e0b9..bb617b7a697 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -3,10 +3,10 @@ name: job-name-engineer description: job-description-engineer playTimeTracker: JobStationEngineer - requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 1800 + # requirements: + # - !type:DepartmentTimeRequirement + # department: Engineering + # time: 1800 startingGear: StationEngineerGear icon: "StationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 23faec9a596..b76a59cf4db 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,10 +3,10 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 1800 + # requirements: + # - !type:DepartmentTimeRequirement + # department: Medical + # time: 1800 startingGear: ChemistGear icon: "Chemist" 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 22beedf8608..42b978e25a1 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -5,16 +5,16 @@ name: job-name-cmo description: job-description-cmo playTimeTracker: JobChiefMedicalOfficer - requirements: - - !type:RoleTimeRequirement - role: JobChemist - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 21600 #6 hrs - - !type:DepartmentTimeRequirement - department: Medical - time: 108000 # 30 hrs + # requirements: + # - !type:RoleTimeRequirement + # role: JobChemist + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobMedicalDoctor + # time: 21600 #6 hrs + # - !type:DepartmentTimeRequirement + # department: Medical + # time: 108000 # 30 hrs weight: 10 startingGear: CMOGear icon: "ChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 849ba9d0174..491379725de 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -3,10 +3,10 @@ name: job-name-doctor description: job-description-doctor playTimeTracker: JobMedicalDoctor - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 1800 + # requirements: + # - !type:DepartmentTimeRequirement + # department: Medical + # time: 1800 startingGear: DoctorGear icon: "MedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 327b6058021..cb2b981179f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -3,12 +3,12 @@ name: job-name-paramedic description: job-description-paramedic playTimeTracker: JobParamedic - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 9000 - - !type:OverallPlaytimeRequirement - time: 54000 + # requirements: + # - !type:DepartmentTimeRequirement + # department: Medical + # time: 9000 + # - !type:OverallPlaytimeRequirement + # time: 54000 startingGear: ParamedicGear icon: "Paramedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index e7e3bf4a536..cd3de122201 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -3,10 +3,10 @@ name: job-name-rd description: job-description-rd playTimeTracker: JobResearchDirector - requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 108000 # 30 hrs + # requirements: + # - !type:DepartmentTimeRequirement + # department: Science + # time: 108000 # 30 hrs weight: 10 startingGear: ResearchDirectorGear icon: "ResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index a60a0da64b5..fd0c00192dc 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -3,10 +3,10 @@ name: job-name-scientist description: job-description-scientist playTimeTracker: JobScientist - requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 1800 + # requirements: + # - !type:DepartmentTimeRequirement + # department: Science + # time: 1800 startingGear: ScientistGear icon: "Scientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index c5740b94124..c9b3aad9194 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: 7200 #2 hrs + - !type:OverallPlaytimeRequirement + time: 10800 #3 hr startingGear: DetectiveGear icon: "Detective" 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 50e59354985..e88de4091b5 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -4,18 +4,20 @@ description: job-description-hos playTimeTracker: JobHeadOfSecurity requirements: - - !type:RoleTimeRequirement - role: JobWarden - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobDetective - time: 7200 #2 hrs - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 36000 #10 hrs - - !type:DepartmentTimeRequirement - department: Security - time: 108000 # 30 hrs + - !type:OverallPlaytimeRequirement + time: 50400 + # - !type:RoleTimeRequirement + # role: JobWarden + # time: 21600 #6 hrs + # - !type:RoleTimeRequirement + # role: JobDetective + # time: 7200 #2 hrs + # - !type:RoleTimeRequirement + # role: JobSecurityOfficer + # time: 36000 #10 hrs + # - !type:DepartmentTimeRequirement + # department: Security + # time: 108000 # 30 hrs weight: 10 startingGear: HoSGear icon: "HeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 24a24844b8a..f56970ba398 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: 3600 #1 hr + - !type:OverallPlaytimeRequirement + time: 7200 #2 hr startingGear: SecurityOfficerGear icon: "SecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index a446c2d74c1..c0b3d05ec19 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,9 +4,8 @@ description: job-description-warden playTimeTracker: JobWarden requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 10800 + - !type:OverallPlaytimeRequirement + time: 14400 startingGear: WardenGear icon: "Warden" supervisors: job-supervisors-hos