Skip to content

Commit

Permalink
Merge branch 'arumoon-server' into mr0maks-server
Browse files Browse the repository at this point in the history
  • Loading branch information
AruMoon committed Jul 30, 2023
2 parents 58edbb2 + cabd7f4 commit 5c01a56
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
requirements:
- !type:RoleTimeRequirement
role: JobAtmosphericTechnician
time: 21600 #6 hrs
time: 14400 #4 hrs
- !type:RoleTimeRequirement
role: JobStationEngineer
time: 21600 #6 hrs
- !type:DepartmentTimeRequirement
department: Engineering
time: 216000 # 60 hrs
time: 54000 # 15 hrs
startingGear: SeniorEngineerGear
icon: "JobIconSeniorEngineer"
supervisors: job-supervisors-ce
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
requirements:
- !type:RoleTimeRequirement
role: JobChemist
time: 21600 #6 hrs
time: 14400 #4 hrs
- !type:RoleTimeRequirement
role: JobMedicalDoctor
time: 21600 #6 hrs
- !type:DepartmentTimeRequirement
department: Medical
time: 216000 # 60 hrs
time: 54000 # 15 hrs
startingGear: SeniorPhysicianGear
icon: "JobIconSeniorPhysician"
supervisors: job-supervisors-cmo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
requirements:
- !type:DepartmentTimeRequirement
department: Science
time: 216000 #60 hrs
time: 54000 #15 hrs
startingGear: SeniorResearcherGear
icon: "JobIconSeniorResearcher"
supervisors: job-supervisors-rd
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
requirements:
- !type:RoleTimeRequirement
role: JobWarden
time: 21600 #6 hrs
time: 14400 #4 hrs
- !type:RoleTimeRequirement
role: JobDetective
time: 7200 #2 hrs
- !type:RoleTimeRequirement
role: JobSecurityOfficer
time: 21600 #6 hrs
time: 14400 #4 hrs
- !type:DepartmentTimeRequirement
department: Security
time: 216000 # 60 hrs
time: 54000 # 15 hrs
startingGear: SeniorOfficerGear
icon: "JobIconSeniorOfficer"
supervisors: job-supervisors-hos
Expand Down

0 comments on commit 5c01a56

Please sign in to comment.