cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1245 from CHOMPStationBot/upstream-merge-9650

Browse Source 
[MIRROR] [MIRROR] Event Managers can use TGUI interactions
This commit is contained in:
Nadyr
2021-04-11 22:59:54 -04:00
committed by GitHub
parent 02df6f7dc0 ecc80a31c6
commit d6cfcea267
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/nano/interaction/base.dm
View File

@@ -4,9 +4,11 @@
/datum/proc/nano_container() /datum/proc/nano_container()
return src return src
/* //CHOMPedit: I guess we have nanoUI again? Upstream doesnt.
/datum/proc/CanUseTopic(var/mob/user, var/datum/topic_state/state) /datum/proc/CanUseTopic(var/mob/user, var/datum/topic_state/state)
var/src_object = nano_host() var/src_object = nano_host()
return state.can_use_topic(src_object, user) return state.can_use_topic(src_object, user)
*/
/datum/topic_state/proc/href_list(var/mob/user) /datum/topic_state/proc/href_list(var/mob/user)
return list() return list()

10
code/modules/tgui/states.dm
View File

@@ -20,9 +20,9 @@
return return
if(isobserver(user)) if(isobserver(user))
// // If they turn on ghost AI control, admins can always interact. // Admins can always interact.
// if(user.client.advanced_admin_interaction) if(check_rights(R_ADMIN|R_EVENT, 0, src))
// . = max(., STATUS_INTERACTIVE) . = max(., STATUS_INTERACTIVE)
// Regular ghosts can always at least view if in range. // Regular ghosts can always at least view if in range.
if(user.client) if(user.client)
@@ -123,3 +123,7 @@
if((TK in mutations) && (get_dist(src, src_object) <= 2)) if((TK in mutations) && (get_dist(src, src_object) <= 2))
return STATUS_INTERACTIVE return STATUS_INTERACTIVE
return ..() return ..()
// Topic Extensions for old UIs
/datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state)
return tgui_status(user, state)