From 324b97f913c28273e8208b6b53efec67716626b9 Mon Sep 17 00:00:00 2001 From: rosieposie Date: Sat, 8 Jun 2024 21:45:59 -0400 Subject: [PATCH] Revert "Subpatch 1984 (#1307)" This reverts commit 71733f370595cc1943459e1bed3f0fc86400430e. --- .../Tests/PostMapInitTest.cs | 1 + Resources/Prototypes/Maps/Pools/default.yml | 1 + Resources/Prototypes/Maps/submarine.yml | 73 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 Resources/Prototypes/Maps/submarine.yml diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index c512c246f3c..7702d3d8a06 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -58,6 +58,7 @@ public sealed class PostMapInitTest "TheHive", //DeltaV "Hammurabi", //DeltaV "Lighthouse", //DeltaV + "Submarine", //DeltaV "Micro" //DeltaV }; diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index 7a013117ff9..761a8c38001 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -12,3 +12,4 @@ - Shoukou - Tortuga - TheHive + - Submarine diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml new file mode 100644 index 00000000000..1d4fc2217e1 --- /dev/null +++ b/Resources/Prototypes/Maps/submarine.yml @@ -0,0 +1,73 @@ +- type: gameMap + id: Submarine + mapName: 'Submarine' + mapPath: /Maps/submarine.yml + minPlayers: 60 + stations: + Submarine: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Submarine {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'DV' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Propeller.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #civilian + Passenger: [ -1, -1 ] + Librarian: [ 1, 1 ] + #command + Captain: [ 1, 1 ] + #engineering + AtmosphericTechnician: [ 2, 4 ] + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 4, 6 ] + TechnicalAssistant: [ 1, 2 ] + #medical + Chemist: [ 2, 2 ] + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 4, 5 ] + MedicalIntern: [ 1, 2 ] + Paramedic: [ 2, 3 ] + Psychologist: [ 1, 2 ] + #security + Brigmedic: [ 1, 1 ] + Detective: [ 1, 1 ] + HeadOfSecurity: [ 1, 1 ] + Prisoner: [ 2, 4 ] + PrisonGuard: [ 1, 2 ] + SecurityOfficer: [ 4, 6 ] + SecurityCadet: [ 1, 2 ] + Warden: [ 1, 1 ] + #service + Bartender: [ 2, 3 ] + Botanist: [ 2, 4 ] + Boxer: [ 2, 2 ] + Chef: [ 3, 4 ] + Clown: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Janitor: [ 2, 3 ] + Lawyer: [ 2, 3 ] + MartialArtist: [ 1, 2 ] + Mime: [ 1, 1 ] + Musician: [ 2, 2 ] + Reporter: [ 1, 2 ] + ServiceWorker: [ 1, 2 ] + Zookeeper: [ 2, 2 ] + #science + MedicalBorg: [ 2, 3 ] + Chaplain: [ 1, 1 ] + ForensicMantis: [ 1, 1 ] + ResearchAssistant: [ 1, 2 ] + ResearchDirector: [ 1, 1 ] + Scientist: [ 4, 5 ] + #supply + CargoTechnician: [ 3, 5 ] + Courier: [ 1, 2 ] + SalvageSpecialist: [ 3, 5 ] + Quartermaster: [ 1, 1 ]