Merge pull request tgstation#6733 from CorruptComputer/asteroidareas

Moves all the custom AsteroidStation areas
new525 · Jan 6, 2015 · 0efd9f4 · 0efd9f4
2 parents d9e859b + 42a8999
commit 0efd9f4
Show file tree

Hide file tree

Showing 6 changed files with 944 additions and 948 deletions.
diff --git a/_maps/AsteroidStation.dm b/_maps/AsteroidStation.dm
@@ -16,15 +16,10 @@ Then tick this file, the maps and all additional files will be automatically def
 	#include "map_files\Asteroidstation\z5.dmm"
 	#include "map_files\Asteroidstation\z6.dmm"
 	#include "map_files\Asteroidstation\z7.dmm"
-
+	
 	#define MAP_FILE "Asteroidstation.dmm"
 	#define MAP_NAME "AsteroidStation"
 
-	#if !defined(MAP_OVERRIDE_FILES)
-		#define MAP_OVERRIDE_FILES
-		#include "map_files\Asteroidstation\areas.dm"
-	#endif
-
 #elif !defined(MAP_OVERRIDE)
 
 	#warn a map has already been included, ignoring AsteroidStation.