Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2017-03-15 00:37:01 -04:00
parent d2d4f238ae a4c1198b96
commit de1fe1e2f1
2 changed files with 6453 additions and 0 deletions
@@ -0,0 +1,31 @@
+#if !defined(MAP_FILE)
+
+		#define TITLESCREEN "title" //Add an image in misc/fullscreen.dmi, and set this define to the icon_state, to set a custom titlescreen for your map
+
+		#define MINETYPE "lavaland"
+
+        #include "map_files\CitadelStation\CitadelStation-1.0.2.dmm"
+        
+#ifndef TRAVIS_MASS_MAP_BUILD
+        #include "map_files\generic\z2.dmm"
+        #include "map_files\generic\z3.dmm"
+        #include "map_files\generic\z4.dmm"
+        #include "map_files\generic\lavaland.dmm"
+        #include "map_files\generic\z6.dmm"
+        #include "map_files\generic\z7.dmm"
+        #include "map_files\generic\z8.dmm"
+		#include "map_files\generic\z9.dmm"
+		#include "map_files\generic\z10.dmm"
+		#include "map_files\generic\z11.dmm"
+
+		#define MAP_PATH "map_files/CitadelStation"
+        #define MAP_FILE "CitadelStation-1.0.2"
+        #define MAP_NAME "Citadel Station"
+
+		#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG
+#endif
+#elif !defined(MAP_OVERRIDE)
+
+	#warn a map has already been included, ignoring /tg/station 2.
+
+#endif