Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml
This commit is contained in:
Ed
2024-12-11 14:49:02 +03:00
298 changed files with 153553 additions and 9112 deletions

View File

@@ -1,4 +1,4 @@
- type: gameMapPool
id: NOCP14DefaultMapPool
maps:
- Dev
- Dev

View File

@@ -0,0 +1,65 @@
- type: gameMap
id: Amber
mapName: 'Amber'
mapPath: /Maps/amber.yml
minPlayers: 7
maxPlayers: 50
stations:
Amber:
stationProto: StandardNanotrasenStation
components:
- type: StationNameSetup
mapNameTemplate: '{0} Amber Station {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14-SB'
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_amber.yml
- type: StationJobs
availableJobs:
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 1, 1 ]
Botanist: [ 2, 2 ]
Chef: [ 1, 1 ]
Janitor: [ 2, 2 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 1, 3 ]
Reporter: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 2, 4 ]
TechnicalAssistant: [ 1, 1 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 2, 2 ]
MedicalDoctor: [ 2, 4 ]
Paramedic: [ 2, 2 ]
MedicalIntern: [ 1, 2 ]
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 4, 4 ]
ResearchAssistant: [ 1, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 1, 1 ]
Lawyer: [ 1, 1 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 2, 3 ]
CargoTechnician: [ 2, 3 ]
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]