Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339

[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
parent f072def90e 6a7d414fdf
commit d2e13833d6
27 changed files with 278 additions and 196869 deletions
@@ -236,7 +236,7 @@

 		switch (command)
 			if ("map")
-				currentmap = new ("_maps/[data].json")
+				currentmap = load_map_config("_maps/[data].json")
 				if(currentmap.defaulted)
 					log_config("Failed to load map config for [data]!")
 					currentmap = null