juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor

Browse Source
This commit is contained in:
ElectroJr
2025-02-16 16:52:51 +13:00
parent b13ccfefd6 fb1d180c7d
commit eedc992d57
1624 changed files with 385006 additions and 263837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Maps/Pools/default.yml
View File

@@ -4,7 +4,7 @@
- Amber
- Bagel
- Box
- Cog
- Convex
- Core
- Elkridge
- Fland

61
Resources/Prototypes/Maps/Relic.yml Normal file
View File

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

115
Resources/Prototypes/Maps/amber.yml
View File

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

8
Resources/Prototypes/Maps/box.yml
View File

@@ -25,6 +25,7 @@
Janitor: [ 2, 2 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
Reporter: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
@@ -45,9 +46,9 @@
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 5, 5 ]
SecurityOfficer: [ 5, 7 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 2, 4 ]
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
@@ -60,5 +61,4 @@
Musician: [ 1, 1 ]
#silicon
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
Borg: [ 2, 2 ]

35
Resources/Prototypes/Maps/cog.yml → Resources/Prototypes/Maps/convex.yml
View File

@@ -1,20 +1,19 @@
- type: gameMap
id: Cog
mapName: 'Cog'
mapPath: /Maps/cog.yml
minPlayers: 40
maxPlayers: 80 #big map
id: Convex
mapName: 'Convex'
mapPath: /Maps/convex.yml
minPlayers: 75
stations:
Cog:
Convex:
stationProto: StandardNanotrasenStation
components:
- type: StationNameSetup
mapNameTemplate: '{0} Cog {1}'
mapNameTemplate: '{0} Convex Recreational Complex {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: 'R4' # R4407/Goon. GS isn't as cool sounding.
prefixCreator: '14-SM'
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_wode.yml
emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
- type: StationJobs
availableJobs:
#service
@@ -25,30 +24,28 @@
Chef: [ 2, 2 ]
Janitor: [ 3, 3 ]
Chaplain: [ 1, 1 ]
Reporter: [ 2, 2 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
Zookeeper: [ 1, 1 ]
Reporter: [ 1, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 3, 3 ]
MedicalDoctor: [ 4, 4 ]
MedicalIntern: [ 3, 3 ]
Psychologist: [ 1, 1 ]
MedicalDoctor: [ 6, 6 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 5, 5 ]
ResearchAssistant: [ 3, 3 ]
ResearchAssistant: [ 6, 6 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Lawyer: [ 2, 2 ]
@@ -61,7 +58,7 @@
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Boxer: [ 2, 2]
Boxer: [2, 2]
#silicon
StationAi: [ 1, 1 ]
Borg: [ 3, 3 ]

6
Resources/Prototypes/Maps/elkridge.yml
View File

@@ -2,8 +2,8 @@
id: Elkridge
mapName: 'Elkridge Depot'
mapPath: /Maps/elkridge.yml
minPlayers: 7
maxPlayers: 35
minPlayers: 15
maxPlayers: 45
stations:
Elkridge:
stationProto: StandardNanotrasenStation
@@ -38,7 +38,7 @@
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 2, 2 ]
MedicalDoctor: [ 3, 3 ]
MedicalDoctor: [ 2, 3 ]
MedicalIntern: [ 2, 2 ]
Paramedic: [ 1, 1 ]
Psychologist: [ 1, 1 ]

14
Resources/Prototypes/Maps/fland.yml
View File

@@ -24,15 +24,15 @@
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
Janitor: [ 3, 3 ]
Janitor: [ 4, 4 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Reporter: [ 1, 1 ]
Reporter: [ 2, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
StationEngineer: [ 6, 6 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
@@ -47,14 +47,14 @@
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 8, 8 ]
SecurityOfficer: [ 10, 10 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
SecurityCadet: [ 6, 6 ]
Lawyer: [ 2, 2 ]
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 4, 4 ]
CargoTechnician: [ 6, 6 ]
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
@@ -62,4 +62,4 @@
Musician: [ 1, 1 ]
#silicon
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
Borg: [ 5, 5 ]

1
Resources/Prototypes/Maps/loop.yml
View File

@@ -38,6 +38,7 @@
Chemist: [ 3, 3 ]
MedicalDoctor: [ 4, 5 ]
Paramedic: [ 2, 2 ]
Psychologist: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]

2
Resources/Prototypes/Maps/marathon.yml
View File

@@ -46,7 +46,7 @@
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Lawyer: [ 2, 2 ]

33
Resources/Prototypes/Maps/meta.yml
View File

@@ -3,6 +3,7 @@
mapName: 'Meta Station'
mapPath: /Maps/meta.yml
minPlayers: 50
maxPlayers: 80
stations:
Meta:
stationProto: StandardNanotrasenStation
@@ -16,7 +17,7 @@
emergencyShuttlePath: /Maps/Shuttles/emergency_meta.yml
- type: StationJobs
availableJobs:
#service
#service (18)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 2, 2 ]
@@ -27,37 +28,37 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Reporter: [ 2, 2 ]
#engineering
#engineering (11)
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 6, 8 ]
TechnicalAssistant: [ 6, 8 ]
#medical
StationEngineer: [ 5, 7 ]
TechnicalAssistant: [ 4, 4 ]
#medical (11)
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 2, 3 ]
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 6 ]
MedicalIntern: [ 4, 6 ]
MedicalIntern: [ 4, 4 ]
Paramedic: [ 1, 2 ]
#science
#science (9)
ResearchDirector: [ 1, 1 ]
Scientist: [ 5, 7 ]
ResearchAssistant: [ 3, 6 ]
#security
Scientist: [ 6, 8 ]
ResearchAssistant: [ 4, 4 ]
#security (12)
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 6, 6 ]
SecurityOfficer: [ 7, 7 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Lawyer: [ 2, 2 ]
#supply
#supply (10)
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 5 ]
#civilian
CargoTechnician: [ 4, 6 ]
#civilian (3+)
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon
#silicon (5)
StationAi: [ 1, 1 ]
Borg: [ 4, 4 ]

2
Resources/Prototypes/Maps/packed.yml
View File

@@ -45,7 +45,7 @@
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
SecurityOfficer: [ 3, 3 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 2 ]
Lawyer: [ 1, 1 ]

37
Resources/Prototypes/Maps/plasma.yml
View File

@@ -2,8 +2,8 @@
id: Plasma
mapName: 'Plasma'
mapPath: /Maps/plasma.yml
minPlayers: 20
maxPlayers: 60
minPlayers: 30
maxPlayers: 80
stations:
Plasma:
stationProto: StandardNanotrasenStation
@@ -18,10 +18,16 @@
- type: StationCargoShuttle
path: /Maps/Shuttles/cargo_plasma.yml
- type: StationJobs
availableJobs:
#service
availableJobs: #Total of 66 jobs roundstart, max of 93 inc. latejoins and trainees.
#command - 7
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service - 18-21
Bartender: [ 2, 2 ]
Botanist: [ 2, 3 ]
Chef: [ 2, 2 ]
@@ -30,37 +36,32 @@
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
Reporter: [ 2, 3 ]
#engineering
ChiefEngineer: [ 1, 1 ]
Clown: [ 1, 2 ] # This might be fun
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#engineering - 8-12
AtmosphericTechnician: [ 4, 4 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
#medical - 9-13
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 4 ]
Paramedic: [ 2, 2 ]
MedicalIntern: [ 4, 4 ]
Psychologist: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
#science - 7-13
Scientist: [ 4, 4 ]
ResearchAssistant: [ 4, 4 ]
StationAi: [ 1, 1 ]
Borg: [ 2, 4 ]
#security
HeadOfSecurity: [ 1, 1 ]
#security - 9-17
Warden: [ 1, 1 ]
SecurityOfficer: [ 6, 8 ]
Detective: [ 1, 2 ]
SecurityCadet: [ 4, 4 ]
Lawyer: [ 1, 2 ]
#supply
Quartermaster: [ 1, 1 ]
#supply - 8-10
SalvageSpecialist: [ 4, 4 ]
CargoTechnician: [ 4, 6 ]
#civilian
#civilian - the tiders yearn for the mines
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]