Fixes a bunch of fallout from the tgui PR (#13648)

* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
This commit is contained in:
DeltaFire15
2020-11-01 21:59:22 +01:00
committed by GitHub
parent 002c0b231b
commit 91584053f5
12 changed files with 93 additions and 14 deletions
@@ -237,12 +237,21 @@
. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"] the interface.</span>"
/obj/machinery/airalarm/ui_status(mob/user)
if(hasSiliconAccessInArea(user) && aidisabled)
to_chat(user, "AI control has been disabled.")
else if(!shorted)
if(hasSiliconAccessInArea(user))
if(aidisabled)
to_chat(user, "AI control has been disabled")
return UI_CLOSE
else if(!issilicon(user)) //True sillycones use ..()
return UI_INTERACTIVE
if(!shorted)
return ..()
return UI_CLOSE
/obj/machinery/airalarm/can_interact(mob/user)
. = ..()
if (!issilicon(user) && hasSiliconAccessInArea(user))
return TRUE
/obj/machinery/airalarm/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)