Merge branch 'master' into bagel-sec-count

diff --cc Resources/Prototypes/Maps/bagel.yml
index f70401944293f7d5164acc6919e17ab6740f6312,f4424f0bfbb8726ddf8b25291ca24f817e96aae4..9138d58eaa38bd56fece107b6ed7c662a938f67c
--- 1/Resources/Prototypes/Maps/bagel.yml
--- 2/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@@ -16,11 -16,16 +16,16 @@@
          - type: StationEmergencyShuttle
            emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
          - type: StationJobs
 -          availableJobs: # 58 jobs total w/o latejoins & interns, 75 jobs total w/ latejoins & interns
 -            #command (7)
 +          availableJobs: # 60 jobs total w/o latejoins & interns, 77 jobs total w/ latejoins & interns
 +            #command
              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 ]
@@@ -38,24 -42,21 +42,21 @@@
              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 ] #intern, not counted
 -            #security (8)
 +            ResearchAssistant: [ 4, 4 ]
 +            #security (10)
-             HeadOfSecurity: [ 1, 1 ]
              Warden: [ 1, 1 ]
 -            SecurityOfficer: [ 4, 4 ]
 +            SecurityOfficer: [ 6, 6 ]
              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 ]