Merge pull request #2509

2017-08-29 22:40:08 -07:00
parent 874bad1203 fa9f1ce956
commit f5689b656a
5 changed files with 0 additions and 142096 deletions
@@ -11,7 +11,6 @@
 #include "map_files\OmegaStation\OmegaStation.dmm"
 #include "map_files\PubbyStation\PubbyStation.dmm"
 #include "map_files\BoxStation\BoxStation.dmm"
-#include "map_files\Cerestation\cerestation.dmm"

 #ifdef TRAVISBUILDING
 #include "templates.dm"
@@ -1 +0,0 @@
-#define FORCE_MAP "_maps/cerestation.json"
@@ -1,8 +0,0 @@
-{
-    "map_name": "CereStation",
-    "map_path": "map_files/Cerestation",
-    "map_file": "cerestation.dmm",
-    "minetype": "lavaland",
-    "transition_config": "default",
-	"allow_custom_shuttles": "yes"
-}
@@ -32,7 +32,3 @@ endmap
 map deltastation
 	minplayers 50
 endmap
-
-map cerestation
-	minplayers 45
-endmap