From 37ec617c0fa94d15b3413f2a109c3fe1456f2bec Mon Sep 17 00:00:00 2001 From: Schnayy Date: Sat, 6 Feb 2021 18:45:08 -0600 Subject: [PATCH 1/2] Event Managers can use TGUI interactions --- code/modules/tgui/states.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index b2208e4f992..c457566800e 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -20,9 +20,15 @@ return if(isobserver(user)) +<<<<<<< HEAD // // If they turn on ghost AI control, admins can always interact. // if(user.client.advanced_admin_interaction) // . = max(., STATUS_INTERACTIVE) +======= + // Admins can always interact. + if(check_rights(R_ADMIN|R_EVENT, 0, src)) + . = max(., STATUS_INTERACTIVE) +>>>>>>> 5daee31... Merge pull request #7847 from Cerebulon/aghostfixEM // Regular ghosts can always at least view if in range. if(user.client) From dcd5375867a6f482db4ae0372f35d3065ea3e5ea Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 6 Feb 2021 19:53:14 -0500 Subject: [PATCH 2/2] Update states.dm --- code/modules/tgui/states.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index c457566800e..775bf0c5221 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -20,15 +20,9 @@ return if(isobserver(user)) -<<<<<<< HEAD - // // If they turn on ghost AI control, admins can always interact. - // if(user.client.advanced_admin_interaction) - // . = max(., STATUS_INTERACTIVE) -======= // Admins can always interact. if(check_rights(R_ADMIN|R_EVENT, 0, src)) . = max(., STATUS_INTERACTIVE) ->>>>>>> 5daee31... Merge pull request #7847 from Cerebulon/aghostfixEM // Regular ghosts can always at least view if in range. if(user.client) @@ -132,4 +126,4 @@ // Topic Extensions for old UIs /datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state) - return tgui_status(user, state) \ No newline at end of file + return tgui_status(user, state)