cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27440 from Cyberboss/you_keep_unchecking_that_file_____i_dont_think_you_know_what_it_does

Browse Source 
Merge loadallmaps.dm into basemap.dm
This commit is contained in:
Leo
2017-05-20 23:26:32 -03:00
committed by GitHub
parent 7d25557bde 7ddfb291e2
commit 0a220bb8db
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/basemap.dm
+23
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"
#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
_maps/loadallmaps.dm
-20
View File
@@ -1,20 +0,0 @@
#ifdef ALL_MAPS
#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 "code\_compile_options.dm"
#include "code\world.dm"
#include "code\__DATASTRUCTURES\globals.dm"