Merge pull request #35 from FunnyYellowDoge/asteroidefox

Lavaland + Asteroide
Foxterosa · May 14, 2020 · 6488eff · 6488eff
2 parents d49b765 + 0dbcf14
commit 6488eff
Show file tree

Hide file tree

Showing 8 changed files with 544 additions and 646 deletions.
diff --git a/_maps/__MAP_DEFINES.dm b/_maps/__MAP_DEFINES.dm
@@ -36,6 +36,7 @@
 	#define EMPTY_AREA "Empty Area"
 	#define EMPTY_AREA_2 "Empty Area 2"
 	#define AWAY_MISSION "Away Mission"
+	#define ASTEROID "Asteroid"
 
 // Convenience define
 	#define DECLARE_LEVEL(NAME,LINKS,TRAITS) list("name" = NAME, "linkage" = LINKS, "attributes" = TRAITS)

diff --git a/_maps/cyberiad.dm b/_maps/cyberiad.dm
@@ -20,6 +20,7 @@ z7 = empty
 	#include "map_files\generic\Lavaland.dmm"
 	#include "map_files\cyberiad\z6.dmm"
 	#include "map_files\generic\z7.dmm"
+	#include "map_files\generic\z5.dmm"
 
 	#define MAP_TRANSITION_CONFIG list(\
 DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
@@ -28,7 +29,8 @@ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\
 DECLARE_LEVEL(CONSTRUCTION, CROSSLINKED, list(REACHABLE)),\
 DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\
 DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\
-DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)))
+DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)),\
+DECLARE_LEVEL(ASTEROID, CROSSLINKED, list(REACHABLE, STATION_CONTACT, ORE_LEVEL, AI_OK)))
 
 	#define USING_MAP_DATUM /datum/map/cyberiad
 

diff --git a/_maps/delta.dm b/_maps/delta.dm
@@ -23,6 +23,7 @@ Lovingly ported by Purpose2 to Paradise
 	#include "map_files\generic\Lavaland.dmm"
 	#include "map_files\cyberiad\z6.dmm"
 	#include "map_files\generic\z7.dmm"
+	#include "map_files\generic\z5.dmm"
 
 	#define MAP_FILE "delta.dmm"
 	#define MAP_NAME "Kerberos"
@@ -33,7 +34,8 @@ DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\
 DECLARE_LEVEL(CONSTRUCTION, CROSSLINKED, list(REACHABLE)),\
 DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\
 DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\
-DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)))
+DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)),\
+DECLARE_LEVEL(ASTEROID, CROSSLINKED, list(REACHABLE, STATION_CONTACT, ORE_LEVEL, AI_OK)))
 
 	#define USING_MAP_DATUM /datum/map/delta