From 512bdc37e2a6678d7f89b07e951eb5ea3efc49ed Mon Sep 17 00:00:00 2001 From: Schnayy Date: Thu, 18 Feb 2021 05:46:43 -0600 Subject: [PATCH] ANOTHER Event manager TGUI fix --- code/modules/tgui/states/default.dm | 4 ++++ code/modules/tgui/states/observer.dm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm index a69295452b3..5f41533496d 100644 --- a/code/modules/tgui/states/default.dm +++ b/code/modules/tgui/states/default.dm @@ -74,6 +74,10 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new) return ..() /mob/observer/dead/default_can_use_tgui_topic() +<<<<<<< HEAD if(can_admin_interact()) +======= + if(check_rights(R_ADMIN|R_EVENT, 0, src)) +>>>>>>> 9a3a7fb... Merge pull request #7879 from Cerebulon/gigglezone 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 bf98f444654..bdfe690dbaa 100644 --- a/code/modules/tgui/states/observer.dm +++ b/code/modules/tgui/states/observer.dm @@ -9,7 +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)) + if(check_rights(R_ADMIN|R_EVENT, 0, src)) return STATUS_INTERACTIVE return STATUS_CLOSE