Merge pull request #10575 from Arturlang/TGUIs_Nexties

[TESTMERGE] Properly working TGUI Next
This commit is contained in:
Ghom
2021-01-04 19:47:54 -03:00
committed by Archie
parent 7ed460e9fe
commit 291dcf9515
378 changed files with 40549 additions and 9150 deletions
+3 -1
View File
@@ -223,7 +223,7 @@
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "bsa", name, 400, 305, master_ui, state)
ui = new(user, src, ui_key, "bsa", name, 400, 220, master_ui, state)
ui.open()
/obj/machinery/computer/bsa_control/ui_data()
@@ -252,6 +252,8 @@
update_icon()
/obj/machinery/computer/bsa_control/proc/calibrate(mob/user)
if(!GLOB.bsa_unlock)
return
var/list/gps_locators = list()
for(var/obj/item/gps/G in GLOB.GPS_list) //nulls on the list somehow
if(G.tracking)