cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14391 from neersighted/tgui_followup

Browse Source 
Fix tgui proc signatures and thus AI APC reboot
This commit is contained in:
Cheridan
2016-01-04 17:06:52 -06:00
parent c13a2f97e5 174c25f53f
commit 797bfe01ef
23 changed files with 89 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/tanks/tanks.dm
+4 -3
View File
@@ -115,10 +115,11 @@
add_fingerprint(user)
ui_interact(user)
/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = hands_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "tanks", name, 400, 200, state = inventory_state)
ui = new(user, src, ui_key, "tanks", name, 400, 200, master_ui, state)
ui.open()
/obj/item/weapon/tank/get_ui_data()