Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes Senior Roles #25

Merged
merged 12 commits into from
Sep 28, 2023
Merged

Removes Senior Roles #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f952124
comment out seniors
FluffiestFloof Sep 17, 2023
c50c8e8
Senior role can be late join
FluffiestFloof Sep 17, 2023
b3895c1
comment out seniors in maps proto
FluffiestFloof Sep 17, 2023
6c0544c
Merge branch 'master' into seniorbegone
FluffiestFloof Sep 18, 2023
1c53896
Update comments
FluffiestFloof Sep 18, 2023
fee3dd6
Merge branch 'master' into seniorbegone
Colin-Tel Sep 19, 2023
20e9678
Merge branch 'master' into seniorbegone
FluffiestFloof Sep 21, 2023
9d38c75
Merge branch 'master' into seniorbegone
FluffiestFloof Sep 25, 2023
2c3c825
Merge branch 'master' into seniorbegone
FluffiestFloof Sep 27, 2023
4aac88a
Europa lost its seniors
FluffiestFloof Sep 27, 2023
ed5d99e
Merge branch 'master' into seniorbegone
FluffiestFloof Sep 28, 2023
3fc312d
Merge branch 'master' into seniorbegone
Colin-Tel Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Resources/Locale/en-US/job/job-supervisors.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ job-supervisors-cmo = the chief medical officer
job-supervisors-rd = the research director
job-supervisors-qm = the head of logistics
job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer
job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer
job-supervisors-security = security officers, the senior officer, the warden, and the head of security
job-supervisors-science = scientists, the senior researcher, and the research director
job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
job-supervisors-medicine = medical doctors, chemists, and the chief medical officer
job-supervisors-security = security officers, the warden, and the head of security
job-supervisors-science = scientists, and the research director
job-supervisors-hire = whoever hires you
job-supervisors-everyone = absolutely everyone
10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/aspid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 2, 2 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
StationEngineer: [ 2, 3 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Paramedic: [ 1, 1 ]
Chemist: [ 1, 2 ]
MedicalDoctor: [ 3, 3 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 3, 4 ]
ResearchAssistant: [ 4, 4 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 3, 4 ]
SecurityCadet: [ 4, 4 ]
Expand All @@ -65,4 +65,4 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]

10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/bagel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 3, 3 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 2, 3 ]
MedicalDoctor: [ 2, 2 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 4, 4 ]
ResearchAssistant: [ 4, 4 ]
ResearchAssistant: [ 4, 4 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
SecurityOfficer: [ 3, 3 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Maps/box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 2, 3 ]
MedicalDoctor: [ 3, 3 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 4, 4 ]
ResearchAssistant: [ 4, 4 ]
ResearchAssistant: [ 4, 4 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Expand All @@ -65,4 +65,4 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]

10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,26 @@
ServiceWorker: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 2, 2 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 1, 1 ]
MedicalDoctor: [ 1, 1 ]
MedicalIntern: [ 2, 2 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1 , 1 ]
# SeniorResearcher: [ 1 , 1 ]
Scientist: [ 2, 2 ]
ResearchAssistant: [ 2, 2 ]
Borg: [ 1, 1 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 2, 2 ]
SecurityCadet: [ 2, 2 ]
Expand All @@ -64,4 +64,4 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]

8 changes: 4 additions & 4 deletions Resources/Prototypes/Maps/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@
StationEngineer: [ 4, 4 ]
AtmosphericTechnician: [ 2, 2 ]
TechnicalAssistant: [ 2, 3 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
MedicalDoctor: [ 3, 4 ]
Chemist: [ 2, 3 ]
MedicalIntern: [ 2, 3 ]
Paramedic: [ 1, 2 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 3, 4 ]
ResearchAssistant: [ 2, 2 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
#security
HeadOfSecurity: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
Warden: [ 1, 1 ]
Lawyer: [ 2, 2 ]
SecurityCadet: [ 2, 2 ]
Detective: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
#supply
CargoTechnician: [ 3, 3 ]
Quartermaster: [ 1, 1 ]
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Maps/europa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@
StationEngineer: [ 2, 2 ]
AtmosphericTechnician: [ 2, 2 ]
TechnicalAssistant: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
MedicalDoctor: [ 1, 2 ]
Chemist: [ 1, 2 ]
MedicalIntern: [ 1, 1 ]
Paramedic: [ 1, 2 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 1, 2 ]
ResearchAssistant: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
#security
HeadOfSecurity: [ 1, 1 ]
SecurityOfficer: [ 2, 2 ]
Warden: [ 1, 1 ]
Lawyer: [ 1, 1 ]
SecurityCadet: [ 3, 3 ]
Detective: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
#supply
CargoTechnician: [ 3, 3 ]
Quartermaster: [ 1, 1 ]
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/fland.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 3, 3 ]
MedicalDoctor: [ 5, 5 ]
Paramedic: [ 2, 2 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 4, 4 ]
ResearchAssistant: [ 6, 6 ]
ResearchAssistant: [ 6, 6 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
SecurityOfficer: [ 7, 7 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/kettle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
StationEngineer: [ 4, 6 ]
TechnicalAssistant: [ 8, 8 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 2, 3 ]
Paramedic: [ 2, 2 ]
MedicalDoctor: [ 3, 5 ]
MedicalIntern: [ 8, 8 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 4, 6 ]
ResearchAssistant: [ 8, 8 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 4, 6 ]
SecurityCadet: [ 8, 8 ]
Expand All @@ -64,4 +64,4 @@
Clown: [ 1, 2 ]
Mime: [ 1, 2 ]
Musician: [ 1, 2 ]

10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/marathon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 3, 3 ]
TechnicalAssistant: [ 3, 3 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 3, 3 ]
MedicalDoctor: [ 3, 3 ]
MedicalIntern: [ 3, 3 ]
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 3, 3 ]
ResearchAssistant: [ 3, 3 ]
ResearchAssistant: [ 3, 3 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
SecurityOfficer: [ 3, 3 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 4, 6 ]
TechnicalAssistant: [ 3, 6 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 3, 3 ]
MedicalDoctor: [ 4, 4 ]
MedicalIntern: [ 3, 6 ]
Paramedic: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 4, 6 ]
ResearchAssistant: [ 3, 6 ]
ResearchAssistant: [ 3, 6 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
SecurityOfficer: [ 4, 6 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 3, 6 ]
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Maps/omega.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
# SeniorEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 2, 2 ]
TechnicalAssistant: [ 2, 2 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
SeniorPhysician: [ 1, 1 ]
# SeniorPhysician: [ 1, 1 ]
Chemist: [ 2, 2 ]
MedicalDoctor: [ 2, 2 ]
MedicalIntern: [ 2, 2 ]
#science
ResearchDirector: [ 1, 1 ]
SeniorResearcher: [ 1, 1 ]
# SeniorResearcher: [ 1, 1 ]
Scientist: [ 3, 3 ]
ResearchAssistant: [ 2, 2 ]
ResearchAssistant: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
# SeniorOfficer: [ 1, 1 ]
SecurityOfficer: [ 3, 3 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
Expand Down
Loading
Loading