cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports Nano UI to Subsystems

Browse Source
This commit is contained in:
Fox McCloud
2018-03-26 23:59:52 -04:00
parent c13ce9099f
commit 5701ea7c75
122 changed files with 398 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+2 -2
View File
@@ -734,7 +734,7 @@
/obj/machinery/computer/shuttle/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
var/obj/docking_port/mobile/M = shuttle_master.getShuttle(shuttleId)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "shuttle_console.tmpl", M ? M.name : "shuttle", 300, 200)
ui.open()
@@ -814,7 +814,7 @@
log_admin("[key_name(usr)] requested to move the transport ferry to Centcom.")
message_admins("<b>FERRY: <font color='blue'>[key_name_admin(usr)] (<A HREF='?_src_=holder;secretsfun=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
. = 1
nanomanager.update_uis(src)
SSnanoui.update_uis(src)
spawn(600) //One minute cooldown
cooldown = 0
code/modules/shuttle/shuttle_manipulator.dm
+1 -1
View File
@@ -60,7 +60,7 @@
/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
// update the ui if it exists, returns null if no ui is passed/found
ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
code/modules/shuttle/supply.dm
+6 -6
View File
@@ -428,7 +428,7 @@
ui_interact(user)
/obj/machinery/computer/ordercomp/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
ui = nanomanager.try_update_ui(user, src, ui_key, ui)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui)
if(!ui)
ui = new(user, src, ui_key, "order_console.tmpl", name, ORDER_SCREEN_WIDTH, ORDER_SCREEN_HEIGHT)
ui.open()
@@ -492,7 +492,7 @@
if(href_list["doorder"])
if(world.time < reqtime)
visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
nanomanager.update_uis(src)
SSnanoui.update_uis(src)
return 1
var/index = copytext(href_list["doorder"], 1, lentext(href_list["doorder"])) //text2num(copytext(href_list["doorder"], 1))
@@ -555,7 +555,7 @@
content_pack = P
add_fingerprint(usr)
nanomanager.update_uis(src)
SSnanoui.update_uis(src)
return 1
/obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob)
@@ -577,7 +577,7 @@
return
/obj/machinery/computer/supplycomp/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
ui = nanomanager.try_update_ui(user, src, ui_key, ui)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui)
if(!ui)
ui = new(user, src, ui_key, "supply_console.tmpl", name, SUPPLY_SCREEN_WIDTH, SUPPLY_SCREEN_HEIGHT)
ui.open()
@@ -673,7 +673,7 @@
else if(href_list["doorder"])
if(world.time < reqtime)
visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
nanomanager.update_uis(src)
SSnanoui.update_uis(src)
return 1
var/index = copytext(href_list["doorder"], 1, lentext(href_list["doorder"])) //text2num(copytext(href_list["doorder"], 1))
@@ -754,7 +754,7 @@
content_pack = P
add_fingerprint(usr)
nanomanager.update_uis(src)
SSnanoui.update_uis(src)
return 1
/obj/machinery/computer/supplycomp/proc/post_signal(var/command)