Merge pull request #1819 from CHOMPStationBot/upstream-merge-10165

[MIRROR] TGUI Fix Compilation
This commit is contained in:
Nadyr
2021-04-23 03:34:53 -04:00
committed by GitHub
8 changed files with 76 additions and 38 deletions
@@ -209,12 +209,12 @@
/mob/living/silicon/robot/proc/setup_PDA()
if (!rbPDA)
rbPDA = new/obj/item/device/pda/ai(src)
rbPDA.set_name_and_job(custom_name,"[modtype] [braintype]")
rbPDA.set_name_and_job(name,"[modtype] [braintype]")
/mob/living/silicon/robot/proc/setup_communicator()
if (!communicator)
communicator = new/obj/item/device/communicator/integrated(src)
communicator.register_device(src.name, "[modtype] [braintype]")
communicator.register_device(name, "[modtype] [braintype]")
//If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
//Improved /N
+1
View File
@@ -181,6 +181,7 @@
SStgui.update_user_uis(U, P) // Update the sending user's PDA UI so that they can see the new message
log_pda("(PDA: [src.name]) sent \"[t]\" to [P.name]", usr)
to_chat(U, "[bicon(pda)] <b>Sent message to [P.owner] ([P.ownjob]), </b>\"[t]\"")
else
to_chat(U, "<span class='notice'>ERROR: Messaging server is not responding.</span>")
+1 -1
View File
@@ -104,7 +104,7 @@
/obj/structure/noticeboard/examine(mob/user)
tgui_interact(user)
return list()
return ..()
/obj/structure/noticeboard/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)