From bc4f50cc3ed201efb184c19b9ad9ee19d9186d18 Mon Sep 17 00:00:00 2001 From: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Date: Mon, 9 Aug 2021 06:56:37 -0700 Subject: [PATCH] Fixes admins not being able to open circuits from anywhere (#60775) --- code/modules/tgui/tgui.dm | 2 +- code/modules/wiremod/integrated_circuit.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 1ae34944efd..a0c39258b95 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -58,7 +58,7 @@ src.interface = interface if(title) src.title = title - src.state = src_object.ui_state() + src.state = src_object.ui_state(user) // Deprecated if(ui_x && ui_y) src.window_size = list(ui_x, ui_y) diff --git a/code/modules/wiremod/integrated_circuit.dm b/code/modules/wiremod/integrated_circuit.dm index 8196974eceb..d17c9dc5ab9 100644 --- a/code/modules/wiremod/integrated_circuit.dm +++ b/code/modules/wiremod/integrated_circuit.dm @@ -295,6 +295,10 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) /obj/item/integrated_circuit/ui_status(mob/user) . = ..() + + if (isobserver(user)) + . = max(., UI_UPDATE) + // Extra protection because ui_state will not close the UI if they already have the ui open, // as ui_state is only set during if(admin_only)