From 026ad08b451eae2ef4e1520b2ffc82d02a51dc6d Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 3 May 2023 22:33:39 +0100
Subject: [PATCH] [MIRROR] Add Birdshot Station to _basemap.dm [MDB IGNORE]
 (#20878)

* Add Birdshot Station to _basemap.dm

* conflicts

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
---
 _maps/_basemap.dm             | 9 +++++----
 config/spaceruinblacklist.txt | 9 ++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
index e09f87be963..64855a4ac14 100644
--- a/_maps/_basemap.dm
+++ b/_maps/_basemap.dm
@@ -6,13 +6,14 @@
 
 #ifndef LOWMEMORYMODE
 	#ifdef ALL_MAPS
-		#include "map_files\Mining\Lavaland.dmm"
-		#include "map_files\debug\runtimestation.dmm"
+		#include "map_files\Birdshot\birdshot.dmm"
 		#include "map_files\debug\multiz.dmm"
+		#include "map_files\debug\runtimestation.dmm"
 		#include "map_files\Deltastation\DeltaStation2.dmm"
-		#include "map_files\MetaStation\MetaStation.dmm"
-		#include "map_files\NorthStar\north_star.dmm"
 		#include "map_files\IceBoxStation\IceBoxStation.dmm"
+		#include "map_files\MetaStation\MetaStation.dmm"
+		#include "map_files\Mining\Lavaland.dmm"
+		#include "map_files\NorthStar\north_star.dmm"
 		#include "map_files\tramstation\tramstation.dmm"
 		// SKYRAT EDIT ADDITON START - Compiling our modular maps too!
 		#include "map_files\VoidRaptor\VoidRaptor.dmm"
diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt
index 65c4fcfbf65..63bc8d0dc26 100644
--- a/config/spaceruinblacklist.txt
+++ b/config/spaceruinblacklist.txt
@@ -22,8 +22,8 @@
 #_maps/RandomRuins/SpaceRuins/clownplanet.dmm
 #_maps/RandomRuins/SpaceRuins/crashedclownship.dmm
 #_maps/RandomRuins/SpaceRuins/crashedship.dmm
+#_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
 #_maps/RandomRuins/SpaceRuins/deepstorage.dmm
-#_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
 #_maps/RandomRuins/SpaceRuins/derelict2.dmm
 #_maps/RandomRuins/SpaceRuins/derelict3.dmm
 #_maps/RandomRuins/SpaceRuins/derelict4.dmm
@@ -35,8 +35,10 @@
 #_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
 #_maps/RandomRuins/SpaceRuins/dj_station.dmm
 #_maps/RandomRuins/SpaceRuins/emptyshell.dmm
-#_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm
+#_maps/RandomRuins/SpaceRuins/fasttravel.dmm
+#_maps/RandomRuins/SpaceRuins/forgottenship.dmm
 #_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
+#_maps/RandomRuins/SpaceRuins/hellfactory.dmm
 #_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
 #_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
 #_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
@@ -47,9 +49,11 @@
 #_maps/RandomRuins/SpaceRuins/mrow_thats_right
 #_maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
 #_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+#_maps/RandomRuins/SpaceRuins/oldstation.dmm
 #_maps/RandomRuins/SpaceRuins/oldteleporter.dmm
 #_maps/RandomRuins/SpaceRuins/onehalf.dmm
 #_maps/RandomRuins/SpaceRuins/originalcontent.dmm
+#_maps/RandomRuins/SpaceRuins/prey_pod.dmm
 #_maps/RandomRuins/SpaceRuins/pod_crash.dmm
 #_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
 #_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm
@@ -68,7 +72,6 @@
 #_maps/RandomRuins/SpaceRuins/waystation.dmm
 #_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm
 #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
-#_maps/RandomRuins/SpaceRuins/medieval1.dmm
 #_maps/RandomRuins/SpaceRuins/forgottenship.dmm
 #_maps/RandomRuins/SpaceRuins/hellfactory.dmm
 #_maps/RandomRuins/SpaceRuins/space_billboard.dmm