ui stuff then map conflicts

This commit is contained in:
Aurorablade
2016-09-16 00:45:37 -04:00
parent b5f74be725
commit fd9d6d8c71
5 changed files with 94 additions and 41 deletions
+6 -1
View File
@@ -5,7 +5,6 @@
icon_keyboard = "tech_key"
var/auth_need = 3
var/list/authorized = list()
var/canrecall = TRUE
/obj/machinery/computer/emergency_shuttle/attackby(obj/item/weapon/card/W, mob/user, params)
if(stat & (BROKEN|NOPOWER))
@@ -92,6 +91,9 @@
var/datum/announcement/priority/emergency_shuttle_called = new(0, new_sound = sound('sound/AI/shuttlecalled.ogg'))
var/datum/announcement/priority/emergency_shuttle_recalled = new(0, new_sound = sound('sound/AI/shuttlerecalled.ogg'))
var/canRecall = TRUE//no bad condom, do not recall the crew transfer shuttle!
/obj/docking_port/mobile/emergency/register()
if(!..())
return 0 //shuttle master not initialized
@@ -146,6 +148,9 @@
emergency_shuttle_called.Announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][shuttle_master.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]")
/obj/docking_port/mobile/emergency/cancel(area/signalOrigin)
if(!canRecall)
return
if(mode != SHUTTLE_CALL)
return
+10 -2
View File
@@ -72,14 +72,16 @@
data["templates"] = list()
var/list/templates = data["templates"]
data["templates_tabs"] = list()
data["selected"] = list()
data["selected"] = null
for(var/shuttle_id in shuttle_templates)
var/datum/map_template/shuttle/S = shuttle_templates[shuttle_id]
if(!templates[S.port_id])
data["templates_tabs"] += S.port_id
// The first found shuttle type will be our default
if(!existing_shuttle)
existing_shuttle = shuttle_master.getShuttle(S.port_id)
templates[S.port_id] = list(
"port_id" = S.port_id,
"templates" = list())
@@ -149,6 +151,12 @@
selected_menu_key = href_list["selectMenuKey"]
return 1 // return 1 forces an update to all Nano uis attached to src
if(href_list["select_template_category"])
var/chosen_shuttle_id = href_list["select_template_category"]
selected = null
existing_shuttle = shuttle_master.getShuttle(chosen_shuttle_id)
return 1
if(href_list["select_template"])
if(S)
existing_shuttle = shuttle_master.getShuttle(S.port_id)