diff --git a/_maps/DiscStation.dm b/_maps/DiscStation.dm index e218c9344b1..1fdf59042c8 100644 --- a/_maps/DiscStation.dm +++ b/_maps/DiscStation.dm @@ -17,7 +17,9 @@ Names of z-level do not matter, but order does greatly, for instances such as ch #define MAP_FILE "DiscStation.dmm" #define MAP_NAME "DiscStation" - #define MAP_TRANSITION_CONFIG list("Main Station" = 2,"CentComm" = 1,"Abandoned_Satellite" = 2,"Derelicted Station" = 2,"Mining Asteroid" = 2,"Empty Area 1" = 2,"Empty Area 2" = 2) + + #define MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, ABANDONED_SATELLITE = CROSSLINKED, DERELICT = CROSSLINKED, MINING = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED) + #elif !defined(MAP_OVERRIDE) diff --git a/_maps/__MAP_DEFINES.dm b/_maps/__MAP_DEFINES.dm new file mode 100644 index 00000000000..d5441f47441 --- /dev/null +++ b/_maps/__MAP_DEFINES.dm @@ -0,0 +1,12 @@ + #define CROSSLINKED 2 + #define SELFLOOPING 1 + #define UNAFFECTED 0 + #define MAIN_STATION "Main Station" + #define CENTCOMM "CentComm" + #define ABANDONED_SATELLITE "Abandoned Satellite" + #define DERELICT "Derelicted Station" + #define MINING "Mining Asteroid" + #define EMPTY_AREA_1 "Empty Area 1" + #define EMPTY_AREA_2 "Empty Area 2" + #define AWAY_MISSION "Away Mission" + #define AWAY_MISSION_LIST list(AWAY_MISSION = UNAFFECTED) \ No newline at end of file diff --git a/_maps/birdstation.dm b/_maps/birdstation.dm index cd7aa09e2f2..ff0922cfcc3 100644 --- a/_maps/birdstation.dm +++ b/_maps/birdstation.dm @@ -20,8 +20,8 @@ Make sure this is the only ticked file in the .dm folder, then compile as usual. #define MAP_FILE "BirdStation.dmm" #define MAP_NAME "BirdboatStation" - #define MAP_TRANSITION_CONFIG list("Main Station" = 2,"CentComm" = 1,"Abandoned_Satellite" = 2,"Derelicted Station" = 2,"Mining Asteroid" = 2,"Empty Area 1" = 2,"Empty Area 2" = 2) + #define MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, ABANDONED_SATELLITE = CROSSLINKED, DERELICT = CROSSLINKED, MINING = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED) #if !defined(MAP_OVERRIDE_FILES) #define MAP_OVERRIDE_FILES diff --git a/_maps/dreamstation.dm b/_maps/dreamstation.dm index ed58fe9ad71..e925023c2f4 100644 --- a/_maps/dreamstation.dm +++ b/_maps/dreamstation.dm @@ -26,7 +26,8 @@ z7 = empty space #define MAP_FILE "dreamstation04.dmm" #define MAP_NAME "DreamStation" - #define MAP_TRANSITION_CONFIG list("Main Station" = 2,"CentComm" = 1,"Abandoned_Satellite" = 2,"Derelicted Station" = 2,"Mining Asteroid" = 2,"Empty Area 1" = 2,"Empty Area 2" = 2) + + #define MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, ABANDONED_SATELLITE = CROSSLINKED, DERELICT = CROSSLINKED, MINING = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED) #elif !defined(MAP_OVERRIDE) diff --git a/_maps/metastation.dm b/_maps/metastation.dm index b079efed44f..d26f43f4086 100644 --- a/_maps/metastation.dm +++ b/_maps/metastation.dm @@ -23,10 +23,10 @@ z7 = empty space #include "map_files\generic\z6.dmm" #include "map_files\generic\z7.dmm" - #define MAP_FILE "MetaStation.v41F.dmm" #define MAP_NAME "MetaStation" - #define MAP_TRANSITION_CONFIG list("Main Station" = 2,"CentComm" = 1,"Abandoned_Satellite" = 2,"Derelicted Station" = 2,"Mining Asteroid" = 2,"Empty Area 1" = 2,"Empty Area 2" = 2) + + #define MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, ABANDONED_SATELLITE = CROSSLINKED, DERELICT = CROSSLINKED, MINING = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED) #elif !defined(MAP_OVERRIDE) diff --git a/_maps/ministation.dm b/_maps/ministation.dm index f1321c71653..bfe9c34b3f4 100644 --- a/_maps/ministation.dm +++ b/_maps/ministation.dm @@ -56,10 +56,10 @@ Changes to the uplinks were made to discourage murderboning, the rest is the sam #include "map_files\generic\z6.dmm" #include "map_files\generic\z7.dmm" - #define MAP_FILE "MiniStation.dmm" #define MAP_NAME "MiniStation" - #define MAP_TRANSITION_CONFIG list("Main Station" = 2,"CentComm" = 1,"Abandoned_Satellite" = 2,"Derelicted Station" = 2,"Mining Asteroid" = 2,"Empty Area 1" = 2,"Empty Area 2" = 2) + + #define MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, ABANDONED_SATELLITE = CROSSLINKED, DERELICT = CROSSLINKED, MINING = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED) #if !defined(MAP_OVERRIDE_FILES) #define MAP_OVERRIDE_FILES diff --git a/_maps/tgstation2.dm b/_maps/tgstation2.dm index 250449ca373..75caa2f02f4 100644 --- a/_maps/tgstation2.dm +++ b/_maps/tgstation2.dm @@ -25,7 +25,8 @@ z7 = empty space #define MAP_FILE "tgstation.2.1.3.dmm" #define MAP_NAME "Box Station" - #define MAP_TRANSITION_CONFIG list("Main Station" = 2,"CentComm" = 1,"Abandoned_Satellite" = 2,"Derelicted Station" = 2,"Mining Asteroid" = 2,"Empty Area 1" = 2,"Empty Area 2" = 2) + + #define MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, ABANDONED_SATELLITE = CROSSLINKED, DERELICT = CROSSLINKED, MINING = CROSSLINKED, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED) #elif !defined(MAP_OVERRIDE) diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index d667a028b6c..8b2339d34cb 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -41,7 +41,7 @@ maploader.load_map(file) world.log << "away mission loaded: [map]" - map_transition_config.Add(list("Away Mission" = 0)) + map_transition_config.Add(AWAY_MISSION_LIST) for(var/obj/effect/landmark/L in landmarks_list) if (L.name != "awaystart") diff --git a/tgstation.dme b/tgstation.dme index 2bf744c774b..ca32085966c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -13,6 +13,7 @@ // END_PREFERENCES // BEGIN_INCLUDE +#include "_maps\__MAP_DEFINES.dm" #include "_maps\tgstation2.dm" #include "code\_compile_options.dm" #include "code\hub.dm"