cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Appeases travis (Round 1)

Browse Source
This commit is contained in:
Atermonera
2018-08-26 17:43:52 -07:00
parent 22d9c89a97
commit 0ce768af5a
3 changed files with 6 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/communicator/UI.dm
+3 -4
View File
@@ -195,7 +195,7 @@
if(href_list["message"])
if(!get_connection_to_tcomms())
usr << "<span class='danger'>Error: Cannot connect to Exonet node.</span>"
to_chat(usr, "<span class='danger'>Error: Cannot connect to Exonet node.</span>")
return
var/their_address = href_list["message"]
var/text = sanitizeSafe(input(usr,"Enter your message.","Text Message"))
@@ -261,10 +261,9 @@
notehtml = note
if(href_list["switch_template"])
var/datum/nanoui/ui = nanomanager.get_open_ui(usr, src, "main")
var/datum/nanoui/ui = GLOB.nanomanager.get_open_ui(usr, src, "main")
if(ui)
usr << "Switching to template [href_list["switch_template"]]"
ui.append_template("Body", href_list["switch_template"])
ui.add_template("Body", href_list["switch_template"])
if(href_list["Light"])
fon = !fon
code/game/objects/items/devices/communicator/communicator.dm
+3 -3
View File
@@ -103,7 +103,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
/obj/item/device/communicator/examine(mob/user)
. = ..(user, 1)
if(. && video_source)
user << "<span class='notice'>It looks like it's on a video call: <a href='?src=\ref[src];watchvideo=1'>\[view\]</a></span>"
to_chat(user, "<span class='notice'>It looks like it's on a video call: <a href='?src=\ref[src];watchvideo=1'>\[view\]</a></span>")
// Proc: initialize_exonet()
// Parameters: 1 (user - the person the communicator belongs to)
@@ -144,7 +144,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
else
msg += "<span class='notice'>The device doesn't appear to be transmitting any data.</span>\n"
msg += "</span>"
user << msg
to_chat(user, msg)
return
// Proc: emp_act()
@@ -234,7 +234,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
cartridge.forceMove(src)
to_chat(usr, "<span class='notice'>You slot \the [cartridge] into \the [src].</span>")
modules[++modules.len] = list("module" = "External Device", "icon" = "external64", "number" = EXTRTAB)
nanomanager.update_uis(src) // update all UIs attached to src
GLOB.nanomanager.update_uis(src) // update all UIs attached to src
return
// Proc: attack_self()