Merge remote-tracking branch 'upstream/master' into ups

This commit is contained in:
Jabak
2024-08-11 18:33:08 +03:00
202 changed files with 2224 additions and 756 deletions

View File

@@ -67,3 +67,5 @@
Boxer: [ 0, 0 ]
Borg: [ 1, 2 ]
Passenger: [ -1, -1 ]
Maid: [ 1, 1 ]
Bomzh: [ 1, 0 ]

View File

@@ -61,3 +61,5 @@
SeniorEngineer: [ 1, 1 ]
Inspector: [ 1, 1]
Borg: [ 3, 2 ]
Maid: [ 1, 1 ]
Bomzh: [ 1, 0 ]

View File

@@ -26,6 +26,7 @@
ChiefMedicalOfficer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
Maid: [ 1, 1 ]
#Security
Warden: [ 1, 1 ]
SeniorOfficer: [ 1, 1 ]
@@ -67,4 +68,4 @@
Boxer: [ 1, 1 ]
Borg: [ 1, 1 ]
Passenger: [ -1, -1 ]
Bomzh: [ 1, 0 ]

View File

@@ -60,4 +60,7 @@
SeniorPhysician: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
Borg: [ 2, 2 ]
Maid: [ 1, 1 ]
Bomzh: [ 1, 0 ]

View File

@@ -21,6 +21,7 @@
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
Maid: [ 1, 1 ]
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
@@ -28,6 +29,7 @@
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Bomzh: [ 1, 0 ]
#engineering
ChiefEngineer: [ 1, 1 ]
SeniorEngineer: [ 1, 1 ]
@@ -44,9 +46,9 @@
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 ]
@@ -65,4 +67,4 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]