cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-12 02:32:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tgstation/master' into who-named-this-damned-proc

Browse Source
This commit is contained in:
Ryll-Ryll
2020-07-16 21:43:14 -04:00
parent 6506b72d1e 7e9785e436
commit 1f31064c3e
1630 changed files with 271270 additions and 268777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/modular_computers/computers/item/computer_ui.dm
View File

@@ -3,7 +3,7 @@
ui_interact(user)
// Operates TGUI
/obj/item/modular_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
/obj/item/modular_computer/ui_interact(mob/user, datum/tgui/ui)
if(!enabled)
if(ui)
ui.close()
@@ -33,21 +33,12 @@
to_chat(user, "<span class='danger'>\The [src] beeps three times, it's screen displaying a \"DISK ERROR\" warning.</span>")
return // No HDD, No HDD files list or no stored files. Something is very broken.
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
ui = SStgui.try_update_ui(user, src, ui)
if (!ui)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
assets.send(user)
assets = get_asset_datum(/datum/asset/simple/arcade)
assets.send(user)
var/headername
switch(device_theme)
if("ntos")
headername = "NtOS Main Menu"
if("syndicate")
headername = "Syndix Main Menu"
ui = new(user, src, ui_key, "NtosMain", headername, 400, 500, master_ui, state)
ui = new(user, src, "NtosMain")
ui.send_asset(get_asset_datum(/datum/asset/simple/headers))
ui.set_autoupdate(TRUE)
ui.open()
ui.set_autoupdate(state = 1)
/obj/item/modular_computer/ui_data(mob/user)