Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream
# Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Client/Clothing/ClientClothingSystem.cs # Content.Client/Hands/Systems/HandsSystem.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Shared/Hands/Components/HandsComponent.cs # Content.Shared/Inventory/InventoryComponent.cs # Content.Shared/Storage/StorageComponent.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Mobs/Player/human.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/oasis.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Maps/saltern.yml
This commit is contained in:
Ed
@@ -1,4 +1,4 @@
|
||||
- type: gameMapPool
|
||||
id: DefaultMapPool
|
||||
maps:
|
||||
- Dev
|
||||
- Dev
|
||||
|
||||
@@ -1 +1,62 @@
|
||||
# Not used in CP14
|
||||
- type: gameMap
|
||||
id: Fland
|
||||
mapName: 'Fland Installation'
|
||||
mapPath: /Maps/fland.yml
|
||||
minPlayers: 70
|
||||
stations:
|
||||
Fland:
|
||||
stationProto: StandardNanotrasenStation
|
||||
components:
|
||||
- type: StationNameSetup
|
||||
mapNameTemplate: '{0} Fland Installation {1}'
|
||||
nameGenerator:
|
||||
!type:NanotrasenNameGenerator
|
||||
prefixCreator: 'B'
|
||||
- type: StationEmergencyShuttle
|
||||
emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
|
||||
- type: StationCargoShuttle
|
||||
path: /Maps/Shuttles/cargo_fland.yml
|
||||
- type: StationJobs
|
||||
availableJobs:
|
||||
#service
|
||||
Captain: [ 1, 1 ]
|
||||
HeadOfPersonnel: [ 1, 1 ]
|
||||
Bartender: [ 2, 2 ]
|
||||
Botanist: [ 3, 3 ]
|
||||
Chef: [ 2, 2 ]
|
||||
Janitor: [ 3, 3 ]
|
||||
Chaplain: [ 1, 1 ]
|
||||
Librarian: [ 1, 1 ]
|
||||
ServiceWorker: [ 2, 2 ]
|
||||
#engineering
|
||||
ChiefEngineer: [ 1, 1 ]
|
||||
AtmosphericTechnician: [ 3, 3 ]
|
||||
StationEngineer: [ 5, 5 ]
|
||||
TechnicalAssistant: [ 4, 4 ]
|
||||
#medical
|
||||
ChiefMedicalOfficer: [ 1, 1 ]
|
||||
Chemist: [ 3, 3 ]
|
||||
MedicalDoctor: [ 6, 6 ]
|
||||
Paramedic: [ 2, 2 ]
|
||||
MedicalIntern: [ 4, 4 ]
|
||||
#science
|
||||
ResearchDirector: [ 1, 1 ]
|
||||
Scientist: [ 5, 5 ]
|
||||
ResearchAssistant: [ 6, 6 ]
|
||||
Borg: [ 2, 2 ]
|
||||
#security
|
||||
HeadOfSecurity: [ 1, 1 ]
|
||||
Warden: [ 1, 1 ]
|
||||
SecurityOfficer: [ 8, 8 ]
|
||||
Detective: [ 1, 1 ]
|
||||
SecurityCadet: [ 4, 4 ]
|
||||
Lawyer: [ 2, 2 ]
|
||||
#supply
|
||||
Quartermaster: [ 1, 1 ]
|
||||
SalvageSpecialist: [ 3, 3 ]
|
||||
CargoTechnician: [ 4, 4 ]
|
||||
#civilian
|
||||
Passenger: [ -1, -1 ]
|
||||
Clown: [ 1, 1 ]
|
||||
Mime: [ 1, 1 ]
|
||||
Musician: [ 1, 1 ]
|
||||
|
||||
@@ -1 +1,63 @@
|
||||
# Not used in CP14
|
||||
- type: gameMap
|
||||
id: Oasis
|
||||
mapName: 'Oasis'
|
||||
mapPath: /Maps/oasis.yml
|
||||
minPlayers: 70
|
||||
stations:
|
||||
Oasis:
|
||||
stationProto: StandardNanotrasenStation
|
||||
components:
|
||||
- type: StationNameSetup
|
||||
mapNameTemplate: '{0} Oasis {1}'
|
||||
nameGenerator:
|
||||
!type:NanotrasenNameGenerator
|
||||
prefixCreator: 'B'
|
||||
- type: StationEmergencyShuttle
|
||||
emergencyShuttlePath: /Maps/Shuttles/emergency_accordia.yml
|
||||
- type: StationJobs
|
||||
availableJobs:
|
||||
#service
|
||||
Captain: [ 1, 1 ]
|
||||
HeadOfPersonnel: [ 1, 1 ]
|
||||
Bartender: [ 2, 2 ]
|
||||
Botanist: [ 2, 3 ]
|
||||
Chef: [ 2, 2 ]
|
||||
Janitor: [ 3, 3 ]
|
||||
Chaplain: [ 1, 1 ]
|
||||
Librarian: [ 1, 1 ]
|
||||
ServiceWorker: [ 2, 2 ]
|
||||
Zookeeper: [ 1, 1 ]
|
||||
Reporter: [ 1, 1 ]
|
||||
#engineering
|
||||
ChiefEngineer: [ 1, 1 ]
|
||||
AtmosphericTechnician: [ 3, 3 ]
|
||||
StationEngineer: [ 5, 5 ]
|
||||
TechnicalAssistant: [ 4, 4 ]
|
||||
#medical
|
||||
ChiefMedicalOfficer: [ 1, 1 ]
|
||||
Chemist: [ 2, 2 ]
|
||||
MedicalDoctor: [ 6, 6 ]
|
||||
Paramedic: [ 2, 2 ]
|
||||
MedicalIntern: [ 4, 4 ]
|
||||
Psychologist: [ 1, 1 ]
|
||||
#science
|
||||
ResearchDirector: [ 1, 1 ]
|
||||
Scientist: [ 5, 5 ]
|
||||
ResearchAssistant: [ 6, 6 ]
|
||||
Borg: [ 2, 2 ]
|
||||
#security
|
||||
HeadOfSecurity: [ 1, 1 ]
|
||||
Warden: [ 1, 1 ]
|
||||
SecurityOfficer: [ 8, 8 ]
|
||||
Detective: [ 1, 1 ]
|
||||
SecurityCadet: [ 4, 4 ]
|
||||
Lawyer: [ 3, 3 ]
|
||||
#supply
|
||||
Quartermaster: [ 1, 1 ]
|
||||
SalvageSpecialist: [ 3, 3 ]
|
||||
CargoTechnician: [ 4, 4 ]
|
||||
#civilian
|
||||
Passenger: [ -1, -1 ]
|
||||
Clown: [ 1, 1 ]
|
||||
Mime: [ 1, 1 ]
|
||||
Musician: [ 1, 1 ]
|
||||
|
||||
@@ -1 +1,59 @@
|
||||
# Not used in CP14
|
||||
- type: gameMap
|
||||
id: Packed
|
||||
mapName: 'Packed'
|
||||
mapPath: /Maps/packed.yml
|
||||
minPlayers: 5
|
||||
maxPlayers: 40
|
||||
stations:
|
||||
Packed:
|
||||
stationProto: StandardNanotrasenStation
|
||||
components:
|
||||
- type: StationNameSetup
|
||||
mapNameTemplate: '{0} Packed {1}'
|
||||
nameGenerator:
|
||||
!type:NanotrasenNameGenerator
|
||||
prefixCreator: 'VG'
|
||||
- type: StationJobs
|
||||
availableJobs:
|
||||
#service
|
||||
Captain: [ 1, 1 ]
|
||||
HeadOfPersonnel: [ 1, 1 ]
|
||||
Bartender: [ 1, 1 ]
|
||||
Botanist: [ 1, 2 ]
|
||||
Chef: [ 1, 1 ]
|
||||
Janitor: [ 1, 2 ]
|
||||
Chaplain: [ 1, 1 ]
|
||||
Librarian: [ 1, 1 ]
|
||||
ServiceWorker: [ 2, 2 ]
|
||||
#engineering
|
||||
ChiefEngineer: [ 1, 1 ]
|
||||
AtmosphericTechnician: [ 2, 2 ]
|
||||
StationEngineer: [ 4, 4 ]
|
||||
TechnicalAssistant: [ 3, 3 ]
|
||||
#medical
|
||||
ChiefMedicalOfficer: [ 1, 1 ]
|
||||
Chemist: [ 2, 2 ]
|
||||
MedicalDoctor: [ 3, 3 ]
|
||||
MedicalIntern: [ 2, 2 ]
|
||||
Paramedic: [ 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: [ 1, 1 ]
|
||||
#supply
|
||||
Quartermaster: [ 1, 1 ]
|
||||
SalvageSpecialist: [ 2, 2 ]
|
||||
CargoTechnician: [ 2, 2 ]
|
||||
#civilian
|
||||
Passenger: [ -1, -1 ]
|
||||
Clown: [ 1, 1 ]
|
||||
Mime: [ 1, 1 ]
|
||||
Musician: [ 1, 1 ]
|
||||
Borg: [ 1 , 1 ]
|
||||
|
||||
@@ -1 +1,60 @@
|
||||
# Not used in CP14
|
||||
- type: gameMap
|
||||
id: Saltern
|
||||
mapName: 'Saltern'
|
||||
mapPath: /Maps/saltern.yml
|
||||
minPlayers: 0
|
||||
maxPlayers: 35
|
||||
fallback: true
|
||||
stations:
|
||||
Saltern:
|
||||
stationProto: StandardNanotrasenStation
|
||||
components:
|
||||
- type: StationNameSetup
|
||||
mapNameTemplate: '{0} Saltern {1}'
|
||||
nameGenerator:
|
||||
!type:NanotrasenNameGenerator
|
||||
prefixCreator: '14'
|
||||
- type: StationJobs
|
||||
availableJobs:
|
||||
#service
|
||||
Captain: [ 1, 1 ]
|
||||
HeadOfPersonnel: [ 1, 1 ]
|
||||
Bartender: [ 1, 1 ]
|
||||
Botanist: [ 1, 2 ]
|
||||
Chef: [ 1, 1 ]
|
||||
Janitor: [ 1, 1 ]
|
||||
Chaplain: [ 1, 1 ]
|
||||
Librarian: [ 1, 1 ]
|
||||
ServiceWorker: [ 2, 2 ]
|
||||
#engineering
|
||||
ChiefEngineer: [ 1, 1 ]
|
||||
AtmosphericTechnician: [ 2, 2 ]
|
||||
StationEngineer: [ 4, 4 ]
|
||||
TechnicalAssistant: [ 4, 4 ]
|
||||
#medical
|
||||
ChiefMedicalOfficer: [ 1, 1 ]
|
||||
Chemist: [ 2, 2 ]
|
||||
MedicalDoctor: [ 3, 3 ]
|
||||
MedicalIntern: [ 4, 4 ]
|
||||
Paramedic: [ 1, 1 ]
|
||||
#science
|
||||
ResearchDirector: [ 1, 1 ]
|
||||
Scientist: [ 4, 4 ]
|
||||
ResearchAssistant: [ 2, 2 ]
|
||||
Borg: [ 2, 2 ]
|
||||
#security
|
||||
HeadOfSecurity: [ 1, 1 ]
|
||||
Warden: [ 1, 1 ]
|
||||
Detective: [ 1, 1 ]
|
||||
SecurityOfficer: [ 4, 4 ]
|
||||
SecurityCadet: [ 4, 4 ]
|
||||
#supply
|
||||
Quartermaster: [ 1, 1 ]
|
||||
SalvageSpecialist: [ 1, 3 ]
|
||||
CargoTechnician: [ 2, 2 ]
|
||||
#civillian
|
||||
Passenger: [ -1, -1 ]
|
||||
Clown: [ 1, 1 ]
|
||||
Mime: [ 1, 1 ]
|
||||
Musician: [ 1, 1 ]
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
- type: gameMap
|
||||
id: NukieOutpost
|
||||
mapName: Nukie Outpost
|
||||
mapPath: /Maps/Nonstations/nukieplanet.yml
|
||||
minPlayers: 0
|
||||
stations:
|
||||
SyndicateOutpost:
|
||||
stationProto: StandardNukieOutpost
|
||||
components:
|
||||
- type: StationNameSetup
|
||||
mapNameTemplate: "Nukie Outpost"
|
||||
Reference in New Issue
Block a user