From 65c8fea74e793802b23d5140e21d6afccb8f9a74 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 16 Apr 2018 15:38:42 +0300 Subject: [PATCH 1/2] Merge pull request #37209 from ninjanomnom/admin-shuttles Makes admin loaded shuttles work again --- code/modules/admin/verbs/map_template_loadverb.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm index ba50ecae32..13c8dfb952 100644 --- a/code/modules/admin/verbs/map_template_loadverb.dm +++ b/code/modules/admin/verbs/map_template_loadverb.dm @@ -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