Revert map PRs (#10079)

* Revert "Fix Saltern cvar (#10077)"

This reverts commit 0f0420eca9.

* Revert "Map ID fixes (Take 2) (#10075)"

This reverts commit c15e14676d.

Content.IntegrationTests/Tests/SaveLoadSaveTest.cs

@@ -93,7 +93,7 @@ namespace Content.IntegrationTests.Tests
                 mapId = mapManager.CreateMap();
                 mapManager.AddUninitializedMap(mapId);
                 mapManager.SetMapPaused(mapId, true);
-                mapLoader.LoadMap(mapId, "Maps/Stations/saltern.yml");
+                mapLoader.LoadMap(mapId, "Maps/saltern.yml");
                 mapLoader.SaveMap(mapId, "load save ticks save 1.yml");
             });
 

Content.Shared/CCVar/CCVars.cs

@@ -155,7 +155,7 @@ namespace Content.Shared.CCVar
         ///     Controls the game map prototype to load. SS14 stores these prototypes in Prototypes/Maps.
         /// </summary>
         public static readonly CVarDef<string>
-            GameMap = CVarDef.Create("game.map", "Saltern", CVar.SERVERONLY);
+            GameMap = CVarDef.Create("game.map", "saltern", CVar.SERVERONLY);
 
         /// <summary>
         ///     Controls if the game should obey map criteria or not. Overriden if a map vote or similar occurs.

Resources/Prototypes/Maps/atlas.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Atlas
+  id: atlas
   mapName: 'Atlas'
-  mapPath: /Maps/Stations/atlas.yml
+  mapPath: /Maps/atlas.yml
   minPlayers: 0
   maxPlayers: 35
   votable: False

Resources/Prototypes/Maps/bagel.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Bagel
+  id: bagelstation
   mapName: 'Bagel Station'
-  mapPath: /Maps/Stations/bagel.yml
+  mapPath: /Maps/bagel.yml
   minPlayers: 35
   stations:
     Bagel:

Resources/Prototypes/Maps/barratry.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Barratry
+  id: barratry
   mapName: 'Barratry'
-  mapPath: /Maps/Stations/barratry.yml
+  mapPath: /Maps/barratry.yml
   minPlayers: 40
   stations:
     Barratry:

Resources/Prototypes/Maps/dart.yml

@@ -1,7 +1,7 @@
 - type: gameMap
   id: Dart
   mapName: 'Dart ERT'
-  mapPath: /Maps/Shuttles/dart.yml
+  mapPath: /Maps/dart.yml
   minPlayers: 0
   votable: false
   stations:

Resources/Prototypes/Maps/delta.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Delta
+  id: delta
   mapName: 'Delta Station'
-  mapPath: /Maps/Stations/delta.yml
+  mapPath: /Maps/delta.yml
   minPlayers: 60
   stations:
     Delta:

Resources/Prototypes/Maps/game.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Reach
+  id: ssreach
   mapName: 'Reach'
-  mapPath: /Maps/Stations/ssreach.yml
+  mapPath: /Maps/ssreach.yml
   minPlayers: 0
   maxPlayers: 15
   votable: false

Resources/Prototypes/Maps/infiltrator.yml

@@ -1,15 +1,15 @@
-- type: gameMap
+- type: gameMap
-  id: Infiltrator
+  id: infiltrator
-  mapName: 'Syndicate Infiltrator'
+  mapName: 'Syndicate Infiltrator'
-  mapPath: /Maps/Shuttles/infiltrator.yml
+  mapPath: /Maps/infiltrator.yml
-  minPlayers: 0
+  minPlayers: 0
-  votable: false
+  votable: false
-  stations:
+  stations:
-    Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map.
+    Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map.
-      mapNameTemplate: '{0} Infiltrator {1}'
+      mapNameTemplate: '{0} Infiltrator {1}'
-      nameGenerator:
+      nameGenerator:
-        !type:NanotrasenNameGenerator
+        !type:NanotrasenNameGenerator
-        prefixCreator: '14'
+        prefixCreator: '14'
-      overflowJobs: []
+      overflowJobs: []
-      availableJobs:
+      availableJobs:
-        Captain: [ 1, 1 ]
+        Captain: [ 1, 1 ]

Resources/Prototypes/Maps/lighthouse.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Lighthouse
+  id: lighthouse
   mapName: 'Lighthouse'
-  mapPath: /Maps/Stations/lighthouse.yml
+  mapPath: /Maps/lighthouse.yml
   minPlayers: 35
   maxPlayers: 70
   stations:

Resources/Prototypes/Maps/marathon.yml

@@ -1,48 +1,48 @@
-- type: gameMap
+- type: gameMap
-  id: Marathon
+  id: marathonstation
-  mapName: 'Marathon Station'
+  mapName: 'Marathon Station'
-  mapPath: /Maps/Stations/marathon.yml
+  mapPath: /Maps/marathon.yml
-  minPlayers: 35
+  minPlayers: 35
-  maxPlayers: 70
+  maxPlayers: 70
-  stations:
+  stations:
-    Marathon:
+    Marathon:
-      mapNameTemplate: '{0} Marathon Station {1}'
+      mapNameTemplate: '{0} Marathon Station {1}'
-      nameGenerator:
+      nameGenerator:
-        !type:NanotrasenNameGenerator
+        !type:NanotrasenNameGenerator
-        prefixCreator: '14'
+        prefixCreator: '14'
-      overflowJobs:
+      overflowJobs:
-        - Passenger
+        - Passenger
-      availableJobs:
+      availableJobs:
-        CargoTechnician: [ 2, 3 ]
+        CargoTechnician: [ 2, 3 ]
-        Passenger: [ -1, -1 ]
+        Passenger: [ -1, -1 ]
-        Bartender: [ 2, 2 ]
+        Bartender: [ 2, 2 ]
-        Botanist: [ 3, 3]
+        Botanist: [ 3, 3]
-        Chef: [ 2, 2 ]
+        Chef: [ 2, 2 ]
-        Clown: [ 1, 1 ]
+        Clown: [ 1, 1 ]
-        Janitor: [ 1, 2 ]
+        Janitor: [ 1, 2 ]
-        Mime: [ 1, 1 ]
+        Mime: [ 1, 1 ]
-        Captain: [ 1, 1 ]
+        Captain: [ 1, 1 ]
-        HeadOfPersonnel: [ 1, 1 ]
+        HeadOfPersonnel: [ 1, 1 ]
-        ChiefEngineer: [ 1, 1 ]
+        ChiefEngineer: [ 1, 1 ]
-        StationEngineer: [ 4, 6 ]
+        StationEngineer: [ 4, 6 ]
-        ChiefMedicalOfficer: [ 1, 1 ]
+        ChiefMedicalOfficer: [ 1, 1 ]
-        MedicalDoctor: [ 3, 4 ]
+        MedicalDoctor: [ 3, 4 ]
-        Chemist: [ 2, 3 ]
+        Chemist: [ 2, 3 ]
-        ResearchDirector: [ 1, 1 ]
+        ResearchDirector: [ 1, 1 ]
-        Scientist: [ 3, 4 ]
+        Scientist: [ 3, 4 ]
-        HeadOfSecurity: [ 1, 1 ]
+        HeadOfSecurity: [ 1, 1 ]
-        SecurityOfficer: [ 4, 4 ]
+        SecurityOfficer: [ 4, 4 ]
-        Chaplain: [ 1, 1 ]
+        Chaplain: [ 1, 1 ]
-        Warden: [ 1, 1 ]
+        Warden: [ 1, 1 ]
-        Librarian: [ 1, 1 ]
+        Librarian: [ 1, 1 ]
-        Lawyer: [ 2, 2 ]
+        Lawyer: [ 2, 2 ]
-        Quartermaster: [ 1, 1 ]
+        Quartermaster: [ 1, 1 ]
-        SalvageSpecialist: [ 3, 3 ]
+        SalvageSpecialist: [ 3, 3 ]
-        Musician: [ 1, 1 ]
+        Musician: [ 1, 1 ]
-        AtmosphericTechnician: [ 3, 3 ]
+        AtmosphericTechnician: [ 3, 3 ]
-        TechnicalAssistant: [ 2, 2 ]
+        TechnicalAssistant: [ 2, 2 ]
-        MedicalIntern: [ 2, 2 ]
+        MedicalIntern: [ 2, 2 ]
-        ServiceWorker: [ 2, 2 ]
+        ServiceWorker: [ 2, 2 ]
-        SecurityCadet: [ 2, 2 ]
+        SecurityCadet: [ 2, 2 ]
-        Psychologist: [ 1, 1 ]
+        Psychologist: [ 1, 1 ]
-        Detective: [ 1, 1 ]
+        Detective: [ 1, 1 ]

Resources/Prototypes/Maps/nss_pillar.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Pillar
+  id: NSSPillar
   mapName: 'NSS Pillar'
-  mapPath: /Maps/Stations/nss_pillar.yml
+  mapPath: /Maps/nss_pillar.yml
   minPlayers: 40
   stations:
     Pillar:

Resources/Prototypes/Maps/packedstation.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Packed
+  id: packedstation
   mapName: 'Packedstation'
-  mapPath: /Maps/Stations/packedstation.yml
+  mapPath: /Maps/packedstation.yml
   minPlayers: 0
   maxPlayers: 35
   votable: true

Resources/Prototypes/Maps/pirate.yml

@@ -1,15 +1,15 @@
-- type: gameMap
+- type: gameMap
-  id: Pirate
+  id: pirate
-  mapName: 'Pirate Ship'
+  mapName: 'Pirate Ship'
-  mapPath: /Maps/Shuttles/pirate.yml
+  mapPath: /Maps/pirate.yml
-  minPlayers: 0
+  minPlayers: 0
-  votable: false
+  votable: false
-  stations:
+  stations:
-    Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map.
+    Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map.
-      mapNameTemplate: '{0} Pirate {1}'
+      mapNameTemplate: '{0} Pirate {1}'
-      nameGenerator:
+      nameGenerator:
-        !type:NanotrasenNameGenerator
+        !type:NanotrasenNameGenerator
-        prefixCreator: '14'
+        prefixCreator: '14'
-      overflowJobs: []
+      overflowJobs: []
-      availableJobs:
+      availableJobs:
-        Captain: [ 1, 1 ]
+        Captain: [ 1, 1 ]

Resources/Prototypes/Maps/saltern.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Saltern
+  id: saltern
   mapName: 'Saltern'
-  mapPath: /Maps/Stations/saltern.yml
+  mapPath: /Maps/saltern.yml
   minPlayers: 0
   maxPlayers: 35
   fallback: true

Resources/Prototypes/Maps/splitstation.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Split
+  id: SplitStation
   mapName: 'Split Station'
-  mapPath: /Maps/Stations/splitstation.yml
+  mapPath: /Maps/splitstation.yml
   minPlayers: 50
   stations:
     Split:

Resources/Prototypes/Maps/waystation.yml

@@ -1,7 +1,7 @@
 - type: gameMap
-  id: Way
+  id: waystation
   mapName: 'Waystation'
-  mapPath: /Maps/Stations/waystation.yml
+  mapPath: /Maps/waystation.yml
   minPlayers: 15
   maxPlayers: 50
   votable: false

Resources/Prototypes/shuttles.yml

@@ -1,4 +1,4 @@
 # Cargo
 - type: cargoShuttle
   id: CargoShuttle
-  path: /Maps/Shuttles/cargo_shuttle.yml
+  path: /Maps/cargo_shuttle.yml