Merge pull request #13731 from AffectedArc07/tgui-fixes-1

Fixes TGUI aghost interactions + disposals
This commit is contained in:
Fox McCloud
2020-06-30 15:44:59 -04:00
committed by GitHub
3 changed files with 9 additions and 5 deletions
+2 -5
View File
@@ -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, "<span class='warning'>The disposal units power is disabled.</span>")
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))
+5
View File
@@ -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
+2
View File
@@ -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