job counts for each map

diff --git a/Resources/Prototypes/Maps/amber.yml b/Resources/Prototypes/Maps/amber.yml
index e5f2749c1a8d8e89744007595c2e1f25a9678416..104cca25773effb1634a9199a1df9bed76fe2efa 100644 (file)
--- a/Resources/Prototypes/Maps/amber.yml
+++ b/Resources/Prototypes/Maps/amber.yml
@@ -16,11 +16,16 @@
       - type: StationEmergencyShuttle
         emergencyShuttlePath: /Maps/Shuttles/emergency_amber.yml
       - type: StationJobs
-        availableJobs:
-          # command
+        availableJobs: # 60 jobs total w/o latejoins & interns, 77 jobs total w/ latejoins & interns
+          #command (7)
           Captain: [ 1, 1 ]
-          #service
           HeadOfPersonnel: [ 1, 1 ]
+          HeadOfSecurity: [ 1, 1 ]
+          ChiefMedicalOfficer: [ 1, 1 ]
+          ChiefEngineer: [ 1, 1 ]
+          ResearchDirector: [ 1, 1 ]
+          Quartermaster: [ 1, 1 ]
+          #service (14)
           Bartender: [ 2, 2 ]
           Botanist: [ 3, 3 ]
           Chef: [ 2, 2 ]
@@ -28,39 +33,34 @@
           Chaplain: [ 1, 1 ]
           Librarian: [ 1, 1 ]
           ServiceWorker: [ 2, 2 ]
-          #engineering
-          ChiefEngineer: [ 1, 1 ]
+          Reporter: [ 1, 1 ]
+          #engineering (5 - 7)
           AtmosphericTechnician: [ 3, 3 ]
           StationEngineer: [ 2, 4 ]
-          TechnicalAssistant: [ 2, 2 ]
-          #medical
-          ChiefMedicalOfficer: [ 1, 1 ]
+          TechnicalAssistant: [ 2, 2 ] #intern, not counted
+          #medical (9 - 11)
           Chemist: [ 2, 2 ]
           MedicalDoctor: [ 4, 6 ]
           Paramedic: [ 2, 2 ]
-          MedicalIntern: [ 2, 2 ]
+          MedicalIntern: [ 2, 2 ] #intern, not counted
           Psychologist: [ 1, 1 ]
-          #science
-          ResearchDirector: [ 1, 1 ]
+          #science (4 - 6)
           Scientist: [ 4, 6 ]
-          ResearchAssistant: [ 2, 2 ]
-          #security
-          HeadOfSecurity: [ 1, 1 ]
+          ResearchAssistant: [ 2, 2 ] #intern, not counted
+          #security (8 - 10)
           Warden: [ 1, 1 ]
           SecurityOfficer: [ 4, 6 ]
           Detective: [ 1, 1 ]
-          SecurityCadet: [ 2, 2 ]
+          SecurityCadet: [ 2, 2 ] #intern, not counted
           Lawyer: [ 2, 2 ]
-          #supply
-          Quartermaster: [ 1, 1 ]
+          #supply (6 - 7)
           SalvageSpecialist: [ 3, 3 ]
           CargoTechnician: [ 3, 4 ]
-          #civilian
-          Passenger: [ -1, -1 ]
+          #civilian (3+)
+          Passenger: [ -1, -1 ] #infinite, not counted
           Clown: [ 1, 1 ]
           Mime: [ 1, 1 ]
           Musician: [ 1, 1 ]
-          Reporter: [ 1, 1 ]
-          #silicon
+          #silicon (4)
           StationAi: [ 1, 1 ]
           Borg: [ 3, 3 ]

diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
index 793dfc5b21cd598c5fe777804b91ff8825fdf6d7..f4424f0bfbb8726ddf8b25291ca24f817e96aae4 100644 (file)
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -16,11 +16,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
         - type: StationJobs
-          availableJobs:
-            #command
+          availableJobs: # 58 jobs total w/o latejoins & interns, 75 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
-            #service
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (13 - 14)
             Bartender: [ 1, 2 ]
             Botanist: [ 2, 2 ]
             Chef: [ 2, 2 ]
@@ -28,38 +33,33 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            Reporter: [ 2, 2 ]
+            #engineering (7)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 4, 4 ] #intern, not counted
+            #medical (6)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
-            MedicalIntern: [ 4, 4 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
+            #science (5)
             Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 4, 4 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 4, 4 ] #intern, not counted
+            #security (8)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 4, 4 ] #intern, not counted
             Lawyer: [ 2, 2 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            Reporter: [ 2, 2 ]
-            #silicon
+            #silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
index e74e47eeb12373dd20c6f3ad87ea745c7d2508ba..891cab2c847d98d78a3e85575f7a11f7247c4566 100644 (file)
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -15,10 +15,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 63 jobs total w/o latejoins & interns, 81 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (14)
             Bartender: [ 2, 2 ]
             Botanist: [ 3, 3 ]
             Chef: [ 2, 2 ]
@@ -27,38 +33,33 @@
             Librarian: [ 1, 1 ]
             Reporter: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (8)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 4, 4 ] #intern, exclude from dept count
+            #medical (8)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 4, 4 ]
             Paramedic: [ 1, 1 ]
-            MedicalIntern: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ] #intern, exclude from dept count
             Psychologist: [ 1, 1 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (5)
             Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 4, 4 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 4, 4 ] #intern, exclude from dept count
+            #security (9 - 11)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 5, 7 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 2, 4 ]
+            SecurityCadet: [ 2, 4 ] #intern, exclude from dept count
             Lawyer: [ 2, 2 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon
+            #silicon (3)
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
\ No newline at end of file
+            Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/convex.yml b/Resources/Prototypes/Maps/convex.yml
index 816ece623f73e7e7637c64bd57db2d92ad58ec08..1d7236f032a9f99bff845ee726d2f1413508c186 100644 (file)
--- a/Resources/Prototypes/Maps/convex.yml
+++ b/Resources/Prototypes/Maps/convex.yml
@@ -14,11 +14,17 @@
             prefixCreator: '14-SM'
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
-        - type: StationJobs
+        - type: StationJobs # 74 jobs total w/o latejoins & interns, 93 jobs total w/ latejoins & interns
           availableJobs:
-            #service
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (18 - 19)
             Bartender: [ 2, 2 ]
             Botanist: [ 3, 3 ]
             Chef: [ 2, 2 ]
@@ -27,38 +33,33 @@
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 3, 3 ]
             Reporter: [ 1, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            Boxer: [2, 2]
+            #engineering (8)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 4, 4 ] #intern, not counted
+            #medical (10)
             Chemist: [ 3, 3 ]
             MedicalDoctor: [ 6, 6 ]
             Paramedic: [ 1, 1 ]
-            MedicalIntern: [ 4, 4 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
+            #science (5)
             Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 6, 6 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 6, 6 ] #intern, not counted
+            #security (12)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 4, 4 ] #intern, not counted
             Lawyer: [ 2, 2 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (7)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 4, 4 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            Boxer: [2, 2]
-            #silicon
+            #silicon (4)
             StationAi: [ 1, 1 ]
             Borg: [ 3, 3 ]

diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
index e4e280ad6673e5fe06087e99899669c5dd82d65e..441a490381eac50b22b0f728cbb57aa4c52e208a 100644 (file)
--- a/Resources/Prototypes/Maps/core.yml
+++ b/Resources/Prototypes/Maps/core.yml
@@ -18,50 +18,51 @@
         - type: StationCargoShuttle
           path: /Maps/Shuttles/cargo_core.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 56 jobs total w/o latejoins & interns, 64 jobs total w/ latejoins & interns
+            #command (7)
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (16)
             Bartender: [ 2, 2 ]
-            Botanist: [ 2, 2]
+            Botanist: [ 2, 2 ]
             Chef: [ 1, 1 ]
             Janitor: [ 2, 2 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 3, 3 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            Boxer: [ 2, 2 ]
+            Reporter: [ 2, 2 ]
+            #engineering (6)
             StationEngineer: [ 4, 4 ]
             AtmosphericTechnician: [ 2, 2 ]
-            TechnicalAssistant: [ 2, 2 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 2, 2 ] #intern, not counted
+            #medical (6 - 8)
             MedicalDoctor: [ 3, 4 ]
             Chemist: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            MedicalIntern: [ 2, 2 ] #intern, not counted
             Paramedic: [ 1, 2 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (3)
             Scientist: [ 3, 3 ]
-            ResearchAssistant: [ 1, 1 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 1, 1 ] #intern, not counted
+            #security (7)
             SecurityOfficer: [ 4, 4 ]
             Warden: [ 1, 1 ]
             Lawyer: [ 1, 1 ]
-            SecurityCadet: [ 1, 1 ]
+            SecurityCadet: [ 1, 1 ] #intern, not counted
             Detective: [ 1, 1 ]
-            #supply
+            #supply (5)
             CargoTechnician: [ 3, 3 ]
-            Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            Boxer: [ 2, 2 ]
-            Reporter: [ 2, 2 ]
-            # silicon
+            # silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/elkridge.yml b/Resources/Prototypes/Maps/elkridge.yml
index bbf5193d135284ef6601f20acb11f548a42a4bb8..3239812d1751dc7543a5bedff2b6d9b8da775126 100644 (file)
--- a/Resources/Prototypes/Maps/elkridge.yml
+++ b/Resources/Prototypes/Maps/elkridge.yml
@@ -18,10 +18,16 @@
         - type: StationCargoShuttle
           path: /Maps/Shuttles/cargo_elkridge.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 46 jobs total w/o latejoins & interns, 61 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (9 - 11)
             Bartender: [ 1, 1 ]
             Botanist: [ 1, 2 ]
             Chef: [ 1, 1 ]
@@ -30,38 +36,33 @@
             Librarian: [ 1, 1 ]
             Reporter: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (5 - 6)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 3, 4 ]
-            TechnicalAssistant: [ 2, 2 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 2, 2 ] #intern, not counted
+            #medical (6 - 7)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 2, 3 ]
-            MedicalIntern: [ 2, 2 ]
+            MedicalIntern: [ 2, 2 ] #intern, not counted
             Paramedic: [ 1, 1 ]
             Psychologist: [ 1, 1 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (3 - 4)
             Scientist: [ 3, 4 ]
-            ResearchAssistant: [ 2, 2 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ] #intern, not counted
+            #security (6 - 7)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 3, 4 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 2, 2 ] #intern, not counted
             Lawyer: [ 1, 1 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (4 - 5)
             SalvageSpecialist: [ 2, 2 ]
             CargoTechnician: [ 2, 3 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon
+            #silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
index e169acbe1d1c9b2421f9c535a6b2a04d711a94a7..5026d3774b3a7798e7ec037a0860b2f08e7231f8 100644 (file)
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -17,10 +17,16 @@
         - type: StationCargoShuttle
           path: /Maps/Shuttles/cargo_fland.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 81 jobs total w/o latejoins & interns, 101 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (17)
             Bartender: [ 2, 2 ]
             Botanist: [ 3, 3 ]
             Chef: [ 2, 2 ]
@@ -29,37 +35,32 @@
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
             Reporter: [ 2, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (9)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 6, 6 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 4, 4 ] #intern, not counted
+            #medical (11)
             Chemist: [ 3, 3 ]
             MedicalDoctor: [ 6, 6 ]
             Paramedic: [ 2, 2 ]
-            MedicalIntern: [ 4, 4 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
+            #science (5)
             Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 6, 6 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 6, 6 ] #intern, not counted
+            #security (14)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 10, 10 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 6, 6 ]
+            SecurityCadet: [ 6, 6 ] #intern, not counted
             Lawyer: [ 2, 2 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (9)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 6, 6 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon
+            #silicon (6)
             StationAi: [ 1, 1 ]
             Borg: [ 5, 5 ]

diff --git a/Resources/Prototypes/Maps/loop.yml b/Resources/Prototypes/Maps/loop.yml
index 124db0327b5f1f824740afc0486656db4b3defb4..13d15ec9aa39dc0edbdcb7805c98bac88574cfa2 100644 (file)
--- a/Resources/Prototypes/Maps/loop.yml
+++ b/Resources/Prototypes/Maps/loop.yml
@@ -16,11 +16,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_wode.yml
         - type: StationJobs
-          availableJobs:
-            #command
+          availableJobs: # 66 jobs total w/o latejoins & interns, 85 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
-            #service
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (14)
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 2 ]
             Chef: [ 2, 2 ]
@@ -28,39 +33,34 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 3, 3 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            Reporter: [ 1, 1 ]
+            #engineering (8)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
-            TechnicalAssistant: [ 5, 5 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 5, 5 ] #intern, not counted
+            #medical (10 - 11)
             Chemist: [ 3, 3 ]
             MedicalDoctor: [ 4, 5 ]
             Paramedic: [ 2, 2 ]
             Psychologist: [ 1, 1 ]
-            MedicalIntern: [ 4, 4 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
+            #science (5)
             Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 4, 4 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 4, 4 ] #intern, not counted
+            #security (9)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 5, 5 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 4, 4 ] #intern, not counted
             Lawyer: [ 2, 2 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (7)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 4, 4 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            Reporter: [ 1, 1 ]
-            #silicon
+            #silicon (3 - 4)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 3 ]

diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index d9770af26e0c67d18e3b128b03cdfccec15cebc8..1c075f5b1d2758a25296fac102907f4c1a389da8 100644 (file)
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -16,10 +16,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 61 jobs total w/o latejoins & interns, 76 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (11 - 13)
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 3 ]
             Chef: [ 2, 2 ]
@@ -27,38 +33,33 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (7)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 3, 3 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 3, 3 ] #intern, not counted
+            #medical (8)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 4, 4 ]
-            MedicalIntern: [ 3, 3 ]
+            MedicalIntern: [ 3, 3 ] #intern, not counted
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (4)
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 3, 3 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 3, 3 ] #intern, not counted
+            #security (12)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 4, 4 ] #intern, not counted
             Lawyer: [ 2, 2 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon
+            #silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index 1932d6651f03619b968d9070da202e728ab6c8be..3592aa12f24a6304b206375ff45cac71a51b6268 100644 (file)
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -16,10 +16,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_meta.yml
         - type: StationJobs
-          availableJobs:
-            #service (18)
+          availableJobs: # 68 jobs total w/o latejoins & interns, 95 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (14 - 16)
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 3 ]
             Chef: [ 2, 2 ]
@@ -28,34 +34,29 @@
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
             Reporter: [ 2, 2 ]
-            #engineering (11)
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (8 - 10)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 7 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical (11)
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 4, 4 ] #intern, not counted
+            #medical (7 - 10)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 4, 6 ]
-            MedicalIntern: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
             Paramedic: [ 1, 2 ]
-            #science (9)
-            ResearchDirector: [ 1, 1 ]
+            #science (6 - 8)
             Scientist: [ 6, 8 ]
-            ResearchAssistant: [ 4, 4 ]
-            #security (12)
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 4, 4 ] #intern, not counted
+            #security (11)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 7, 7 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 4, 4 ] #intern, not counted
             Lawyer: [ 2, 2 ]
-            #supply (10)
-            Quartermaster: [ 1, 1 ]
+            #supply (7 - 9)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 4, 6 ]
             #civilian (3+)
-            Passenger: [ -1, -1 ]
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]

diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml
index f3953eb8d6c0046ff0e3c6112f7c140deebbc935..ea7618d586b39aa78b5fa319d14ebd6b0eee791a 100644 (file)
--- a/Resources/Prototypes/Maps/oasis.yml
+++ b/Resources/Prototypes/Maps/oasis.yml
@@ -15,10 +15,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_accordia.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 72 jobs total w/o latejoins & interns, 91 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (15 - 16)
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 3 ]
             Chef: [ 2, 2 ]
@@ -28,37 +34,33 @@
             ServiceWorker: [ 2, 2 ]
             Zookeeper: [ 1, 1 ]
             Reporter: [ 1, 1 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (8)
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 4, 4 ] #intern, not counted
+            #medical (11)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 6, 6 ]
             Paramedic: [ 2, 2 ]
-            MedicalIntern: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
             Psychologist: [ 1, 1 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (5)
             Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 6, 6 ]
-            StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 6, 6 ] #intern, not counted
+            #security (13)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 4, 4 ]
+            SecurityCadet: [ 4, 4 ] #intern, not counted
             Lawyer: [ 3, 3 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (7)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 4, 4 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
+            #silicon (3)
+            Borg: [ 2, 2 ]
+            StationAi: [ 1, 1 ]

diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
index 031c831f556d2cf648c9117162e2f7aa7d3b330c..3c3267821cd872e1e1be1b79528c3db27ef160a0 100644 (file)
--- a/Resources/Prototypes/Maps/omega.yml
+++ b/Resources/Prototypes/Maps/omega.yml
@@ -16,10 +16,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 49 jobs total w/o latejoins & interns, 58 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (9 - 10)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
             Chef: [ 1, 1 ]
@@ -27,37 +33,33 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering
+            #engineering (6)
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 2 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 2, 2 ] #intern, not counted
+            #medical (6)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
-            MedicalIntern: [ 2, 2 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            MedicalIntern: [ 2, 2 ] #intern, not counted
+            #science (4)
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ] #intern, not counted
+            #security (7)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 2, 2 ] #intern, not counted
             Lawyer: [ 1, 1 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (4)
             SalvageSpecialist: [ 2, 2 ]
             CargoTechnician: [ 2, 2 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon
+            #silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
index 12e034bcfb98bf0b6037b3520a98d2445d0e1355..7ea5fbc9d0b7cbd55f77f615a5c32d8ed7050615 100644 (file)
--- a/Resources/Prototypes/Maps/packed.yml
+++ b/Resources/Prototypes/Maps/packed.yml
@@ -16,10 +16,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_crimson.yml
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 46 jobs total w/o latejoins & interns, 57 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (8 - 10)
             Bartender: [ 1, 1 ]
             Botanist: [ 1, 2 ]
             Chef: [ 1, 1 ]
@@ -27,37 +33,32 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (6)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 3, 3 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 3, 3 ] #intern, not counted
+            #medical (6)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
-            MedicalIntern: [ 2, 2 ]
+            MedicalIntern: [ 2, 2 ] #intern, not counted
             Paramedic: [ 1, 1 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (4)
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ] #intern, not counted
+            #security (6)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 3, 3 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 2, 2 ] #intern, not counted
             Lawyer: [ 1, 1 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (4)
             SalvageSpecialist: [ 2, 2 ]
             CargoTechnician: [ 2, 2 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            #silicon
+            #silicon (2)
             StationAi: [ 1, 1 ]
             Borg: [ 1, 1 ]

diff --git a/Resources/Prototypes/Maps/plasma.yml b/Resources/Prototypes/Maps/plasma.yml
index 17cbb5c9af5a7ff9bc7149e797daa095898619ee..1d8be63fffe49147c3d8509f239f1766db158545 100644 (file)
--- a/Resources/Prototypes/Maps/plasma.yml
+++ b/Resources/Prototypes/Maps/plasma.yml
@@ -18,8 +18,8 @@
         - type: StationCargoShuttle
           path: /Maps/Shuttles/cargo_plasma.yml
         - type: StationJobs
-          availableJobs: #Total of 66 jobs roundstart, max of 93 inc. latejoins and trainees.
-            #command - 7
+          availableJobs: # 66 jobs total w/o latejoins & interns, 91 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             ChiefEngineer: [ 1, 1 ]
@@ -27,7 +27,7 @@
             ResearchDirector: [ 1, 1 ]
             HeadOfSecurity: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
-            #service - 18-21
+            #service (15 - 17)
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 3 ]
             Chef: [ 2, 2 ]
@@ -36,32 +36,33 @@
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
             Reporter: [ 2, 3 ]
-            Clown: [ 1, 2 ] # This might be fun
-            Mime: [ 1, 1 ]
-            Musician: [ 1, 1 ]
-            #engineering - 8-12
+            #engineering (8)
             AtmosphericTechnician: [ 4, 4 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical - 9-13
+            TechnicalAssistant: [ 4, 4 ] #intern, not counted
+            #medical (9)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 4, 4 ]
             Paramedic: [ 2, 2 ]
-            MedicalIntern: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
             Psychologist: [ 1, 1 ]
-            #science - 7-13
+            #science (4)
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 4, 4 ]
-            StationAi: [ 1, 1 ]
-            Borg: [ 2, 4 ]
-            #security - 9-17
+            ResearchAssistant: [ 4, 4 ] #intern, not counted
+            #security (9 - 11)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 6, 8 ]
-            Detective: [ 1, 2 ]
-            SecurityCadet: [ 4, 4 ]
+            Detective: [ 1, 2 ] #good cop, bad cop
+            SecurityCadet: [ 4, 4 ] #intern, not counted
             Lawyer: [ 1, 2 ]
-            #supply - 8-10
-            SalvageSpecialist: [ 4, 4 ]
+            #supply (8 - 10)
+            SalvageSpecialist: [ 4, 4 ] #the salvagers yearn for the mines
             CargoTechnician: [ 4, 6 ]
-            #civilian - the tiders yearn for the mines
-            Passenger: [ -1, -1 ]
+            #civilian (3 - 4+)
+            Passenger: [ -1, -1 ]  #infinite, the tiders yearn for the mines
+            Clown: [ 1, 2 ] # this might be fun!
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]
+            #silicon (3 - 5)
+            Borg: [ 2, 4 ]
+            StationAi: [ 1, 1 ]

diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml
index 376e336671709c0152168f98c3f7abc779d55fa4..36652f3a66d67e9d3b263a2495cfd357c093abe5 100644 (file)
--- a/Resources/Prototypes/Maps/reach.yml
+++ b/Resources/Prototypes/Maps/reach.yml
@@ -16,21 +16,28 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency.yml
         - type: StationJobs
-          availableJobs:
+          availableJobs: # 15 jobs total w/o latejoins, 19 jobs total w/ latejoins
+            #command (2)
             Captain: [ 1, 1 ]
             HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 1, 3 ]
-            CargoTechnician: [ 1, 1 ]
-            SalvageSpecialist: [ 1, 1 ]
+            #service (4)
             Bartender: [ 1, 1 ]
             Botanist: [ 1, 1 ]
             Chef: [ 1, 1 ]
-            MedicalDoctor: [ 1, 2 ]
-            Chemist: [ 1, 1 ]
             Janitor: [ 1, 1 ]
-            Musician: [ 1, 1 ]
+            #engineering (2 - 3)
             AtmosphericTechnician: [ 1, 1 ]
             StationEngineer: [ 1, 2 ]
+            #medical (2 - 3)
+            Chemist: [ 1, 1 ]
+            MedicalDoctor: [ 1, 2 ]
+            #science (1)
             Scientist: [ 1, 1 ]
-            Passenger: [ -1, -1 ]
-
+            #security (1 - 3)
+            SecurityOfficer: [ 1, 3 ]
+            #supply (2)
+            CargoTechnician: [ 1, 1 ]
+            SalvageSpecialist: [ 1, 1 ]
+            #civilian (1+)
+            Passenger: [ -1, -1 ] #infinite, not counted
+            Musician: [ 1, 1 ]

diff --git a/Resources/Prototypes/Maps/relic.yml b/Resources/Prototypes/Maps/relic.yml
index b982c0ac116382dd64afadecdbcae6e80c6e1517..ba93dfa2b4d970f57b7ef10ce0693804e9f55368 100644 (file)
--- a/Resources/Prototypes/Maps/relic.yml
+++ b/Resources/Prototypes/Maps/relic.yml
@@ -20,44 +20,44 @@
         - type: StationCargoShuttle
           path: /Maps/Shuttles/cargo_relic.yml
         - type: StationJobs
-          availableJobs:
-            #command
+          availableJobs: # 31 jobs total w/o latejoins & interns, 43 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
-            #service
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (6 - 7)
             Bartender: [ 1, 1 ]
             Botanist: [ 1, 2 ]
             Chef: [ 1, 1 ]
             Janitor: [ 1, 1 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (4)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 2, 2 ]
-            TechnicalAssistant: [ 2, 2 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 2, 2 ] #intern, not counted
+            #medical (4)
             Chemist: [ 1, 1 ]
             MedicalDoctor: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
-            MedicalIntern: [ 2, 2 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            MedicalIntern: [ 2, 2 ] #intern, not counted
+            #science (1 - 3)
             Scientist: [ 1, 3 ]
-            ResearchAssistant: [ 2, 2 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ] #intern, not counted
+            #security (4 - 5)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 1, 2 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityCadet: [ 2, 2 ] #intern, not counted
             Lawyer: [ 1, 1 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            #supply (2)
             CargoTechnician: [ 2, 2 ]
-            #civilian
-            Passenger: [ -1, -1 ]
-            #silicon
+            #civilian (1+)
+            Passenger: [ -1, -1 ] #infinite, not counted
+            #silicon (3)
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index d0a539d182132ff3b48733b806ca7940d6ca7b93..0d4cff9790d2d1af7f22e9c247eb8cc7f28c7b70 100644 (file)
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -15,10 +15,16 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 45 jobs total w/o latejoins & interns, 62 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (8 - 9)
             Bartender: [ 1, 1 ]
             Botanist: [ 1, 2 ]
             Chef: [ 1, 1 ]
@@ -26,35 +32,30 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            #engineering (6)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 4, 4 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 4, 4 ] #intern, not counted
+            #medical (6)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
-            MedicalIntern: [ 4, 4 ]
+            MedicalIntern: [ 4, 4 ] #intern, not counted
             Paramedic: [ 1, 1 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (4)
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ]
-            Borg: [ 2, 2 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ] #intern, not counted
+            #security (6)
             Warden: [ 1, 1 ]
             Detective: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            SecurityCadet: [ 4, 4 ] #intern, not counted
+            #supply (3 - 5)
             SalvageSpecialist: [ 1, 3 ]
             CargoTechnician: [ 2, 2 ]
-            #civillian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-
+            #silicon (2)
+            Borg: [ 2, 2 ]

diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml
index cb37998a8ea610bd0512f7839675a461ecfee4fc..e4b6ecdfcfced0d1cecbe129716024149edaa40b 100644 (file)
--- a/Resources/Prototypes/Maps/train.yml
+++ b/Resources/Prototypes/Maps/train.yml
@@ -18,10 +18,16 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # TODO - add railway station
         - type: StationJobs
-          availableJobs:
-            #service
+          availableJobs: # 53 jobs total w/o latejoins & interns, 65 jobs total w/ latejoins & interns
+            #command (7)
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            #service (11 - 12)
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
             Chef: [ 1, 1 ]
@@ -29,36 +35,32 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 3 ]
-            Detective: [ 1, 1 ]
-            #engineering
-            ChiefEngineer: [ 1, 1 ]
+            Reporter: [ 1, 1 ]
+            #engineering (6)
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 3, 3 ]
-            #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
+            TechnicalAssistant: [ 3, 3 ] #intern, not counted
+            #medical (5)
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
+            MedicalIntern: [ 2, 2 ] #intern, not counted
             Paramedic: [ 1, 1 ]
-            #science
-            ResearchDirector: [ 1, 1 ]
+            #science (4)
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ]
-            #security
-            HeadOfSecurity: [ 1, 1 ]
+            ResearchAssistant: [ 2, 2 ] #intern, not counted
+            #security (9 - 10)
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 6, 6 ]
-            SecurityCadet: [ 3, 3 ]
+            SecurityCadet: [ 3, 3 ] #intern, not counted
             Lawyer: [ 1, 2 ]
-            #supply
-            Quartermaster: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            #supply (6)
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 3, 3 ]
-            #civilian
-            Passenger: [ -1, -1 ]
+            #civilian (3+)
+            Passenger: [ -1, -1 ] #infinite, not counted
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
+            #silicon (2)
             Borg: [ 2, 2 ]
-            Reporter: [ 1, 1 ]