diff --git a/.travis.yml b/.travis.yml index 8273b1e69ab..08a46cf6b5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,8 @@ env: - DM_MAPFILE="" matrix: - BUILD_TOOLS=true - - DM_MAPFILE="tgstation2" - - DM_MAPFILE="metastation" - - DM_MAPFILE="birdstation" - - DM_MAPFILE="pubbystation" - DM_MAPFILE="templates" - - DM_MAPFILE="omegastation" - - DM_MAPFILE="deltastation" + - DM_MAPFILE="loadallmaps" cache: directories: diff --git a/_maps/birdstation.dm b/_maps/birdstation.dm index 434912fa9da..326a5217bc1 100644 --- a/_maps/birdstation.dm +++ b/_maps/birdstation.dm @@ -13,6 +13,7 @@ A small map intended for lowpop(40 players and less). #define MINETYPE "lavaland" #include "map_files\BirdStation\BirdStation.dmm" +#ifndef TRAVIS_MASS_MAP_BUILD #include "map_files\generic\z2.dmm" #include "map_files\generic\z3.dmm" #include "map_files\generic\z4.dmm" @@ -29,7 +30,7 @@ A small map intended for lowpop(40 players and less). #define MAP_NAME "BirdboatStation" #define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG - +#endif #if !defined(MAP_OVERRIDE_FILES) #define MAP_OVERRIDE_FILES #include "map_files\BirdStation\job\job_changes.dm" diff --git a/_maps/deltastation.dm b/_maps/deltastation.dm index 5a66be6ca10..e297e63075f 100644 --- a/_maps/deltastation.dm +++ b/_maps/deltastation.dm @@ -5,6 +5,7 @@ #define MINETYPE "lavaland" #include "map_files\DeltaStation\DeltaStation2.dmm" +#ifndef TRAVIS_MASS_MAP_BUILD #include "map_files\generic\z2.dmm" #include "map_files\generic\z3.dmm" #include "map_files\generic\z4.dmm" @@ -21,7 +22,7 @@ #define MAP_NAME "Delta Station" #define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG - +#endif #elif !defined(MAP_OVERRIDE) #warn a map has already been included, deltastation. diff --git a/_maps/loadallmaps.dm b/_maps/loadallmaps.dm new file mode 100644 index 00000000000..1cf574249ec --- /dev/null +++ b/_maps/loadallmaps.dm @@ -0,0 +1,49 @@ +#define TRAVIS_MASS_MAP_BUILD +#define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG + +#include "birdstation.dm" +#ifdef MAP_OVERRIDE_FILES + #undef MAP_OVERRIDE_FILES +#endif + +#include "deltastation.dm" +#ifdef MAP_OVERRIDE_FILES + #undef MAP_OVERRIDE_FILES +#endif + +#include "metastation.dm" +#ifdef MAP_OVERRIDE_FILES + #undef MAP_OVERRIDE_FILES +#endif + +#include "omegastation.dm" +#ifdef MAP_OVERRIDE_FILES + #undef MAP_OVERRIDE_FILES +#endif + +#include "pubbystation.dm" +#ifdef MAP_OVERRIDE_FILES + #undef MAP_OVERRIDE_FILES +#endif + +#include "tgstation2.dm" +#ifdef MAP_OVERRIDE_FILES + #undef MAP_OVERRIDE_FILES +#endif + +#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" + +#undef TRAVIS_MASS_MAP_BUILD + +#include "runtimestation.dm" + +#define BYOND_WHY_YOU_NO_ALLOW_INCLUDE_LAST_LINE //because byond fails to compile if the last thing in a file is an include. \ No newline at end of file diff --git a/_maps/metastation.dm b/_maps/metastation.dm index 9987cd2459f..3fbd063eafd 100644 --- a/_maps/metastation.dm +++ b/_maps/metastation.dm @@ -5,6 +5,7 @@ #define MINETYPE "lavaland" #include "map_files\MetaStation\MetaStation.dmm" +#ifndef TRAVIS_MASS_MAP_BUILD #include "map_files\generic\z2.dmm" #include "map_files\generic\z3.dmm" #include "map_files\generic\z4.dmm" @@ -21,7 +22,7 @@ #define MAP_NAME "MetaStation" #define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG - +#endif #elif !defined(MAP_OVERRIDE) #warn a map has already been included, ignoring MetaStation. diff --git a/_maps/omegastation.dm b/_maps/omegastation.dm index 8000697e50c..ad4fe6607c1 100644 --- a/_maps/omegastation.dm +++ b/_maps/omegastation.dm @@ -5,6 +5,7 @@ #define MINETYPE "lavaland" #include "map_files\OmegaStation\OmegaStation.dmm" +#ifndef TRAVIS_MASS_MAP_BUILD #include "map_files\generic\z2.dmm" #include "map_files\generic\z3.dmm" #include "map_files\generic\z4.dmm" @@ -21,7 +22,7 @@ #define MAP_NAME "OmegaStation" #define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG - +#endif #if !defined(MAP_OVERRIDE_FILES) #define MAP_OVERRIDE_FILES #include "map_files\OmegaStation\job\job_changes.dm" diff --git a/_maps/pubbystation.dm b/_maps/pubbystation.dm index 92ef96be5e3..9ef04e80613 100644 --- a/_maps/pubbystation.dm +++ b/_maps/pubbystation.dm @@ -5,6 +5,7 @@ #define MINETYPE "lavaland" #include "map_files\PubbyStation\PubbyStation.dmm" +#ifndef TRAVIS_MASS_MAP_BUILD #include "map_files\generic\z2.dmm" #include "map_files\generic\z3.dmm" #include "map_files\generic\z4.dmm" @@ -21,7 +22,7 @@ #define MAP_NAME "PubbyStation" #define MAP_TRANSITION_CONFIG DEFAULT_MAP_TRANSITION_CONFIG - +#endif #if !defined(MAP_OVERRIDE_FILES) #define MAP_OVERRIDE_FILES #include "map_files\PubbyStation\job\job_changes.dm" diff --git a/_maps/tgstation2.dm b/_maps/tgstation2.dm index 9f027f88e85..9ebc966dbae 100644 --- a/_maps/tgstation2.dm +++ b/_maps/tgstation2.dm @@ -5,6 +5,7 @@ #define MINETYPE "lavaland" #include "map_files\TgStation\tgstation.2.1.3.dmm" +#ifndef TRAVIS_MASS_MAP_BUILD #include "map_files\generic\z2.dmm" #include "map_files\generic\z3.dmm" #include "map_files\generic\z4.dmm" @@ -21,7 +22,7 @@ #define MAP_NAME "Box 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.