shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1071 from Citadel-Station-13/upstream-merge-27440

Browse Source 
[MIRROR] Merge loadallmaps.dm into basemap.dm
This commit is contained in:
LetterJay
2017-05-22 16:30:07 -05:00
committed by GitHub
parent ab50a3eca5 65c24a5fde
commit c56ae0396a
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/basemap.dm
+28 -5
View File
@@ -1,7 +1,30 @@
#ifndef ALL_MAPS
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#ifndef ALL_MAPS
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#include "map_files\Mining\lavaland.dmm"
#else
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\TgStation\tgstation.2.1.3.dmm"
#include "map_files\Cerestation\cerestation.dmm"
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#include "map_files\Mining\Lavaland.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"
#endif
#endif
tgstation.dme
-1
View File
@@ -14,7 +14,6 @@
// BEGIN_INCLUDE
#include "_maps\basemap.dm"
#include "_maps\loadallmaps.dm"
#include "_maps\tgstation2.dm"
#include "code\_compile_options.dm"
#include "code\world.dm"