From 0ce768af5ac4f3939fcc07a7f5d4a0951410a9ef Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 26 Aug 2018 17:43:49 -0700 Subject: [PATCH] Appeases travis (Round 1) --- .../objects/items/devices/communicator/UI.dm | 7 ++-- .../devices/communicator/communicator.dm | 6 +-- nano/templates/comm2.tmpl | 41 ------------------- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 nano/templates/comm2.tmpl diff --git a/code/game/objects/items/devices/communicator/UI.dm b/code/game/objects/items/devices/communicator/UI.dm index 16f36f9b93f..d414232a80f 100644 --- a/code/game/objects/items/devices/communicator/UI.dm +++ b/code/game/objects/items/devices/communicator/UI.dm @@ -195,7 +195,7 @@ if(href_list["message"]) if(!get_connection_to_tcomms()) - usr << "Error: Cannot connect to Exonet node." + to_chat(usr, "Error: Cannot connect to Exonet node.") 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 diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index f9cde275a65..ec9c09c1616 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -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 << "It looks like it's on a video call: \[view\]" + to_chat(user, "It looks like it's on a video call: \[view\]") // 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 += "The device doesn't appear to be transmitting any data.\n" msg += "" - 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, "You slot \the [cartridge] into \the [src].") 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() diff --git a/nano/templates/comm2.tmpl b/nano/templates/comm2.tmpl deleted file mode 100644 index 62614fcc0f0..00000000000 --- a/nano/templates/comm2.tmpl +++ /dev/null @@ -1,41 +0,0 @@ - - -
-
-
- {{:data.time}} | - {{if data.connectionStatus == 1}} - - {{else}} - - {{/if}} - | {{:data.owner}} | {{:data.occupation}} -
-
-
- - -

Medical Records

-{{if data.currentTab == "0"}} -
- {{for data.med_records}} -
- {{:helper.link(value.name, '', {"switch_tab" : value.name})}} -
- {{/for}} -
-{{/if}} -{{for data.med_records}} - {{if value.name == data.currentTab}} -
{{:helper.link('Back', 'icon-triangle-1-w', {'switch_tab' : 0})}}

- {{for value.record :itemValue:itemIndex}} -
-
{{:itemValue.tab}}
-
{{:itemValue.val}}
-
- {{/for}} - {{/if}} -{{/for}} \ No newline at end of file