From e28ca744f020d4a8a059139699ac795927876a19 Mon Sep 17 00:00:00 2001 From: Purpose Date: Sat, 22 Sep 2018 16:09:17 +0100 Subject: [PATCH] Adds the Air Traffic Control stuff from #7776 --- _maps/delta.dm | 33 +++++++++++++++++---------------- code/modules/map_fluff/delta.dm | 10 ++++++++++ paradise.dme | 1 + 3 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 code/modules/map_fluff/delta.dm diff --git a/_maps/delta.dm b/_maps/delta.dm index 8b76a5bf73c..5ee84d3d0cd 100644 --- a/_maps/delta.dm +++ b/_maps/delta.dm @@ -1,8 +1,8 @@ /* -You need to have 7 z-levels of the same size dimensions. -z-level order is important, the order you put them in inside this file will determine what z level number they are assigned ingame. -Names of z-level do not matter, but order does greatly, for instances such as checking alive status of revheads on z1 -current as of 2015/05/11 +All z-levels should be identical in size. Their numbers should not matter. +The order of z-levels should not matter as long as their attributes are properly defined at MAP_TRANSITION_CONFIG. +Old code checked for the number of the z-level (for example whether there are any revheads on Z1), +currently it should check for the define (for example whether there are any revheads on any z-levels defined as STATION_LEVEL). z1 = station z2 = centcomm z3 = telecommunications center @@ -15,19 +15,18 @@ Original design by Okand37 of TG Station Lovingly ported by Purpose2 to Paradise */ -#if !defined(MAP_FILE) +#if !defined(USING_MAP_DATUM) + #include "map_files\delta\delta.dmm" + #include "map_files\cyberiad\z2.dmm" + #include "map_files\cyberiad\z3.dmm" + #include "map_files\cyberiad\z4.dmm" + #include "map_files\generic\z5.dmm" + #include "map_files\cyberiad\z6.dmm" + #include "map_files\generic\z7.dmm" - #include "map_files\delta\delta.dmm" - #include "map_files\cyberiad\z2.dmm" - #include "map_files\cyberiad\z3.dmm" - #include "map_files\cyberiad\z4.dmm" - #include "map_files\generic\z5.dmm" - #include "map_files\cyberiad\z6.dmm" - #include "map_files\generic\z7.dmm" - - #define MAP_FILE "delta.dmm" - #define MAP_NAME "Kerberos" - #define MAP_TRANSITION_CONFIG list(\ + #define MAP_FILE "delta.dmm" + #define MAP_NAME "Kerberos" + #define MAP_TRANSITION_CONFIG list(\ DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL,STATION_CONTACT,REACHABLE,AI_OK)),\ DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\ @@ -36,6 +35,8 @@ DECLARE_LEVEL(MINING, CROSSLINKED, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\ DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE))) + #define USING_MAP_DATUM /datum/map/delta + #elif !defined(MAP_OVERRIDE) #warn a map has already been included, ignoring Delta. diff --git a/code/modules/map_fluff/delta.dm b/code/modules/map_fluff/delta.dm new file mode 100644 index 00000000000..d68266e3146 --- /dev/null +++ b/code/modules/map_fluff/delta.dm @@ -0,0 +1,10 @@ +/datum/map/delta + name = "Delta" + full_name = "NSS Kerberos" + + station_name = "NSS Kerberos" + station_short = "Kerberos" + dock_name = "NAS Trurl" + company_name = "Nanotrasen" + company_short = "NT" + starsys_name = "Epsilon Eridani " diff --git a/paradise.dme b/paradise.dme index 7c4deb70dd2..f650a3cefa1 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1519,6 +1519,7 @@ #include "code\modules\logic\logic_base.dm" #include "code\modules\logic\mono_input.dm" #include "code\modules\map_fluff\cyberiad.dm" +#include "code\modules\map_fluff\delta.dm" #include "code\modules\map_fluff\maps.dm" #include "code\modules\map_fluff\metastation.dm" #include "code\modules\martial_arts\adminfu.dm"