From 3b59c7ca27b1a810708f85a8735aa78eb0e36252 Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Tue, 30 Jun 2020 13:51:52 +0100 Subject: [PATCH] Fixes TGUI aghost interactions + disposals --- code/modules/recycling/disposal.dm | 7 ++----- code/modules/tgui/states/default.dm | 5 +++++ code/modules/tgui/states/observer.dm | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 733add1131c..7584a9cbfe3 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -271,7 +271,7 @@ /obj/machinery/disposal/tgui_data(mob/user) var/list/data = list() - + data["isAI"] = isAI(user) data["flushing"] = flush data["mode"] = mode @@ -290,15 +290,12 @@ to_chat(usr, "The disposal units power is disabled.") return - if(..()) - return - if(stat & BROKEN) return src.add_fingerprint(usr) - if(usr.stat || usr.restrained() || src.flushing) + if(src.flushing) return if(istype(src.loc, /turf)) diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm index a32474eef66..4da729aa7e5 100644 --- a/code/modules/tgui/states/default.dm +++ b/code/modules/tgui/states/default.dm @@ -56,3 +56,8 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new) return STATUS_INTERACTIVE else return ..() + +/mob/dead/observer/default_can_use_tgui_topic() + if(can_admin_interact()) + return STATUS_INTERACTIVE // Admins are more equal + return STATUS_UPDATE // Ghosts can view updates diff --git a/code/modules/tgui/states/observer.dm b/code/modules/tgui/states/observer.dm index b7c81c36e5d..bf98f444654 100644 --- a/code/modules/tgui/states/observer.dm +++ b/code/modules/tgui/states/observer.dm @@ -9,5 +9,7 @@ GLOBAL_DATUM_INIT(tgui_observer_state, /datum/tgui_state/observer_state, new) /datum/tgui_state/observer_state/can_use_topic(src_object, mob/user) if(isobserver(user)) return STATUS_INTERACTIVE + if(check_rights(R_ADMIN, 0, src)) + return STATUS_INTERACTIVE return STATUS_CLOSE