cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tgui proc signatures and thus AI APC reboot

Browse Source 
This allows state overloading

Make AI reboot code use ui_interact instead of attack_ai
Fixes #13762
This commit is contained in:
Bjorn Neergaard
2016-01-04 16:23:42 -06:00
parent f021d1920a
commit aec6bc103c
20 changed files with 75 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+4 -3
View File
@@ -85,10 +85,11 @@
return
ui_interact(user)
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "chem_dispenser", name, 550, 550)
ui = new(user, src, ui_key, "chem_dispenser", name, 550, 550, master_ui, state)
ui.open()
/obj/machinery/chem_dispenser/get_ui_data()
code/modules/reagents/chemistry/machinery/chem_heater.dm
+4 -3
View File
@@ -96,10 +96,11 @@
return
ui_interact(user)
/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open = force_open)
/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
ui = new(user, src, ui_key, "chem_heater", name, 275, 400)
ui = new(user, src, ui_key, "chem_heater", name, 275, 400, master_ui, state)
ui.open()
/obj/machinery/chem_heater/get_ui_data()