Merge d7deac0608 into fd5b16abb3

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -89,6 +89,35 @@ namespace Content.IntegrationTests.Tests
             .Select(glob => new Regex(GlobToRegex(glob), RegexOptions.IgnoreCase | RegexOptions.Compiled))
             .ToArray();
 
+        private static readonly string[] GameMaps =
+        {
+            "Dev",
+            "TestTeg",
+            "CentComm",
+            "MeteorArena",
+            "Academy", //DeltaV
+            "Anvil", //DeltaV
+            "Arena", // DeltaV
+            "ArenaMedieval", //DeltaV
+            "Asterisk", // DeltaV
+            "Byoin", // DeltaV
+            "Chibi", // DeltaV
+            "Division", // DeltaV
+            "Edge", // DeltaV
+            "Elegance", // DeltaV
+            "Glacier", // DeltaV
+            "Hammurabi", // DeltaV
+            "Lighthouse", // DeltaV
+            "Micro", // DeltaV
+            "Ovni", //DeltaV
+            "Pebble", // DeltaV
+            "PebbleHiring", // DeltaV
+            "Shoukou", // DeltaV
+            "Submarine", //DeltaV
+            "Terra", //DeltaV
+            "TheHive", // DeltaV
+            "Tortuga" // DeltaV
+        };
         private static readonly string[] GameMaps = GameDataScrounger.PrototypesOfKind<GameMapPrototype>().Where(x => x != PoolManager.TestMap).ToArray();
         private static readonly ResPath[] AllMapFiles = GameDataScrounger.FilesInDirectoryInVfs("/Maps/", "*.yml");
         private static readonly ResPath[] ShuttleMapFiles = GameDataScrounger.FilesInDirectoryInVfs("/Maps/Shuttles", "*.yml");

Resources/Prototypes/Maps/Pools/default.yml

@@ -4,6 +4,7 @@
 # DeltaV
   - Arena
   - Academy
+  - Anvil
   - Asterisk
   - Byoin
   - Chibi

Resources/Prototypes/Maps/anvil.yml

@@ -0,0 +1,77 @@
+- type: gameMap
+  id: Anvil
+  mapName: 'Anvil'
+  mapPath: /Maps/anvil.yml
+  minPlayers: 35
+  stations:
+    Anvil:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Anvil Station {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'DV'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/NTES_Hammerhead.yml
+        - type: StationJobs
+          availableJobs:
+          #civilian
+            Passenger: [ -1, -1 ]
+          #command
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ChiefJustice: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            StationAi: [ 1, 1 ]
+          #engineering
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 3, 5 ]
+            TechnicalAssistant: [ 2, 3 ]
+          #justice
+            Clerk: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Prosecutor: [ 1, 1 ]
+          #medical
+            Chemist: [ 2, 2 ]
+            Paramedic: [ 1, 2 ]
+            MedicalDoctor: [ 3, 5 ]
+            MedicalIntern: [ 2, 3 ]
+            Psychologist: [ 1, 1 ]
+            Surgeon: [ 1, 1 ]
+          #security
+            Brigmedic: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            Prisoner: [ 3, 3 ]
+            PrisonGuard: [ 2, 3 ]
+            SecurityOfficer: [ 2, 5 ]
+            SecurityCadet: [ 2, 3 ]
+            Warden: [ 1, 1 ]
+          #service
+            Bartender: [ 2, 2 ]
+            Botanist: [ 2, 2 ]
+            Chef: [ 2, 2 ]
+            Clown: [ 1, 1 ]
+            Janitor: [ 2, 2 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 2, 3 ]
+            Reporter: [ 1, 1 ]
+            ServiceWorker: [ 4, 5 ] 
+            Librarian: [ 1, 1 ]
+            MartialArtist: [ 2, 2 ]
+          #science
+            Chaplain: [ 1, 1 ]
+            ForensicMantis: [ 1, 1 ]
+            Scientist: [ 4, 6 ]
+            ResearchAssistant: [ 4, 6 ]
+            Roboticist: [ 1, 2 ]
+            Borg: [ 2, 3 ]
+          #supply
+            CargoTechnician: [ 2, 3 ]
+            CargoAssistant: [ 1, 2 ]
+            Courier: [ 2, 2 ]
+            SalvageSpecialist: [ 2, 3 ]

Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml

@@ -712,6 +712,16 @@
     containers:
       board: [ DoorElectronicsSecurity ]
 
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalSecurityShuttleLocked
+  suffix: External, Glass, Security, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
+
+
 # Station-Specific Airlocks
 - type: entity
   parent: HighSecDoor
@@ -723,13 +733,22 @@
       board: [ DoorElectronicsSecurity ]
 
 - type: entity
-  parent: HighSecDoor
-  id: HighSecEngineeringLocked
-  suffix: Engineering, Locked
+  parent: AirlockMiningGlass
+  id: AirlockMiningGlassSecurity
+  suffix: Security, Locked
   components:
   - type: ContainerFill
     containers:
-      board: [ DoorElectronicsEngineering ]
+      board: [ DoorElectronicsSecurity ]
+
+- type: entity
+  parent: AirlockMining
+  id: AirlockMiningSecurity
+  suffix: Security, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
 
 - type: entity
   parent: HighSecDoor

Resources/deltav_map_attributions.yml

@@ -1,5 +1,15 @@
+
+- files: ["anvil.yml"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "Created by Gray for Delta-V."
+  source: "https://github.com/DeltaV-Station/Delta-v/pull/4338"
+
 - files: ["academy.yml"]
   license: "CC-BY-NC-SA-4.0"
+
+- files: ["academy.yml"]
+  license: "CC-BY-NC-SA-4.0"
+
   copyright: "Created by Biddy Gelson for Delta V."
   source: "https://github.com/DeltaV-Station/Delta-v/pull/4192"