Merge branch 'master' into master

BeeStation · Nov 20, 2019 · 6019aa3 · 6019aa3
2 parents c5bfe82 + 75955bb
commit 6019aa3
Show file tree

Hide file tree

Showing 43 changed files with 434,683 additions and 432,370 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -6,7 +6,12 @@
 	#ifdef ALL_MAPS
 		#include "map_files\Mining\Lavaland.dmm"
 		#include "map_files\debug\runtimestation.dmm"
-		#include "map_files\Aegis\Aegis.dmm"
+		#include "map_files\Aegis\aegis1.dmm"
+		#include "map_files\Aegis\aegis2.dmm"
+		#include "map_files\Aegis\aegis3.dmm"
+		#include "map_files\Aegis\ao1.dmm"
+		#include "map_files\Aegis\ao2.dmm"
+		#include "map_files\Aegis\ao3.dmm"
 		#include "map_files\Valkyrie\Valkyrie.dmm"
 		#include "map_files\Hammerhead\Hammerhead.dmm"
 

diff --git a/_maps/aegis.json b/_maps/aegis.json
@@ -1,8 +1,8 @@
 {
     "map_name": "NSV Aegis",
     "map_path": "map_files/Aegis",
-    "map_file": ["Aegis.dmm"], 
+    "map_file": ["aegis3.dmm", "aegis2.dmm", "aegis1.dmm", "ao1.dmm", "ao2.dmm", "ao3.dmm"], 
 	"traits": [{"Up": 1}, {"Up": 1, "Down": -1}, {"Down": -1}, {"Linkage": "Self", "Astraeus System":1, "Station":0}, {"Linkage": "Self", "Hyperspace":1, "Station":0}, {"Linkage": "Self", "Corvi System":1, "Station":0}],
 	"space_ruin_levels": -1,
 	"minetype": "Not Lavaland"
-	}
+	}