From: Damn Feds <20566341+K-Dynamic@users.noreply.github.com>
Date: Fri, 11 Apr 2025 10:41:46 +0000 (+1200)
Subject: Merge branch 'master' into bagel-sec-count
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d66c59d38d5a33af1b836d5bc08cfa7d2310e191;p=space-station-14.git

Merge branch 'master' into bagel-sec-count
---

d66c59d38d5a33af1b836d5bc08cfa7d2310e191
diff --cc Resources/Prototypes/Maps/bagel.yml
index f704019442,f4424f0bfb..9138d58eaa
--- a/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 ]