Merge pull request #6438 from Citadel-Station-13/upstream-merge-37209

[MIRROR] Makes admin loaded shuttles work again
2018-04-22 02:42:28 -05:00
parent e30d3540b1 475b741bd2
commit 76001518d8
1 changed files with 8 additions and 2 deletions
@@ -34,8 +34,14 @@
 	if(copytext("[map]",-4) != ".dmm")
 		to_chat(usr, "Bad map file: [map]")
 		return
-
-	var/datum/map_template/M = new(map, "[map]")
+	var/datum/map_template/M
+	switch(alert(usr, "What kind of map is this?", "Map type", "Normal", "Shuttle", "Cancel"))
+		if("Normal")
+			M = new /datum/map_template(map, "[map]")
+		if("Shuttle")
+			M = new /datum/map_template/shuttle(map, "[map]")
+		else
+			return
 	if(M.preload_size(map))
 		to_chat(usr, "Map template '[map]' ready to place ([M.width]x[M.height])")
 		SSmapping.map_templates[M.name] = M