From 8ee863a455109a28c065aea6814584022fee3924 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sun, 7 Feb 2021 01:12:42 +0000 Subject: [PATCH 1/4] [MIRROR] Event Managers can use TGUI interactions --- code/modules/tgui/states.dm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index 2973d51668..b4ba8fd8fc 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -20,9 +20,9 @@ return if(isobserver(user)) - // // 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) // Regular ghosts can always at least view if in range. if(user.client) @@ -122,4 +122,18 @@ /mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object) if((TK in mutations) && (get_dist(src, src_object) <= 2)) return STATUS_INTERACTIVE - return ..() \ No newline at end of file +<<<<<<< HEAD + return ..() +||||||| parent of 9dcac9c0ad... Merge pull request #9650 from VOREStation/upstream-merge-7847 + return ..() + +// Topic Extensions for old UIs +/datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state) + return tgui_status(user, state) +======= + return ..() + +// Topic Extensions for old UIs +/datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state) + return tgui_status(user, state) +>>>>>>> 9dcac9c0ad... Merge pull request #9650 from VOREStation/upstream-merge-7847 From 70bf4f2c3576152adf01d536bc35019fdcb96610 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sat, 6 Feb 2021 18:15:59 -0700 Subject: [PATCH 2/4] Update states.dm --- code/modules/tgui/states.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index b4ba8fd8fc..775bf0c522 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -122,18 +122,8 @@ /mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object) if((TK in mutations) && (get_dist(src, src_object) <= 2)) return STATUS_INTERACTIVE -<<<<<<< HEAD - return ..() -||||||| parent of 9dcac9c0ad... Merge pull request #9650 from VOREStation/upstream-merge-7847 return ..() // Topic Extensions for old UIs /datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state) return tgui_status(user, state) -======= - return ..() - -// Topic Extensions for old UIs -/datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state) - return tgui_status(user, state) ->>>>>>> 9dcac9c0ad... Merge pull request #9650 from VOREStation/upstream-merge-7847 From e5ad5e6983825c562eb8a3289c3a78accb4949f5 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 11 Apr 2021 07:14:45 -0400 Subject: [PATCH 3/4] Update base.dm --- code/modules/nano/interaction/base.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm index 8245ee04ed..714d942d6a 100644 --- a/code/modules/nano/interaction/base.dm +++ b/code/modules/nano/interaction/base.dm @@ -10,10 +10,10 @@ /datum/topic_state/proc/href_list(var/mob/user) return list() - +/* //CHOMPedit: I guess we have nanoUI again? Upstream doesnt. /datum/topic_state/proc/can_use_topic(var/src_object, var/mob/user) return STATUS_CLOSE - +*/ /mob/proc/shared_nano_interaction() if (src.stat || !client) return STATUS_CLOSE // no updates, close the interface From ecc80a31c646477d8166c7ab69f5355946585dca Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 11 Apr 2021 07:22:09 -0400 Subject: [PATCH 4/4] Update base.dm --- code/modules/nano/interaction/base.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm index 714d942d6a..45f141b608 100644 --- a/code/modules/nano/interaction/base.dm +++ b/code/modules/nano/interaction/base.dm @@ -3,17 +3,19 @@ /datum/proc/nano_container() return src - + +/* //CHOMPedit: I guess we have nanoUI again? Upstream doesnt. /datum/proc/CanUseTopic(var/mob/user, var/datum/topic_state/state) var/src_object = nano_host() return state.can_use_topic(src_object, user) +*/ /datum/topic_state/proc/href_list(var/mob/user) return list() -/* //CHOMPedit: I guess we have nanoUI again? Upstream doesnt. + /datum/topic_state/proc/can_use_topic(var/src_object, var/mob/user) return STATUS_CLOSE -*/ + /mob/proc/shared_nano_interaction() if (src.stat || !client) return STATUS_CLOSE // no updates, close the interface