")
@@ -179,37 +178,40 @@
return t
-/datum/nano_module/program/computer_filemanager
- name = "NTOS File Manager"
+/datum/computer_file/program/filemanager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state)
-/datum/nano_module/program/computer_filemanager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
- var/list/data = host.initial_data()
- var/datum/computer_file/program/filemanager/PRG
- PRG = program
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "file_manager", "NTOS File Manage", 575, 700, state = state)
+ ui.open()
+ ui.set_autoupdate(state = 1)
+
+/datum/computer_file/program/filemanager/ui_data(mob/user)
+ var/list/data = get_header_data()
var/obj/item/weapon/computer_hardware/hard_drive/HDD
var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD
- if(PRG.error)
- data["error"] = PRG.error
- if(PRG.open_file)
+ if(error)
+ data["error"] = error
+ if(open_file)
var/datum/computer_file/data/file
- if(!PRG.computer || !PRG.computer.hard_drive)
+ if(!computer || !computer.hard_drive)
data["error"] = "I/O ERROR: Unable to access hard drive."
else
- HDD = PRG.computer.hard_drive
- file = HDD.find_file_by_name(PRG.open_file)
+ HDD = computer.hard_drive
+ file = HDD.find_file_by_name(open_file)
if(!istype(file))
data["error"] = "I/O ERROR: Unable to open file."
else
- data["filedata"] = PRG.parse_tags(file.stored_data)
+ data["filedata"] = parse_tags(file.stored_data)
data["filename"] = "[file.filename].[file.filetype]"
else
- if(!PRG.computer || !PRG.computer.hard_drive)
+ if(!computer || !computer.hard_drive)
data["error"] = "I/O ERROR: Unable to access hard drive."
else
- HDD = PRG.computer.hard_drive
- RHDD = PRG.computer.portable_drive
+ HDD = computer.hard_drive
+ RHDD = computer.portable_drive
var/list/files[0]
for(var/datum/computer_file/F in HDD.stored_files)
files.Add(list(list(
@@ -231,11 +233,4 @@
)))
data["usbfiles"] = usbfiles
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "file_manager.tmpl", "NTOS File Manager", 575, 700, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
-
-
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/news_browser.dm b/code/modules/modular_computers/file_system/programs/news_browser.dm
deleted file mode 100644
index 2fe58ee6348..00000000000
--- a/code/modules/modular_computers/file_system/programs/news_browser.dm
+++ /dev/null
@@ -1,120 +0,0 @@
-/datum/computer_file/program/newsbrowser
- filename = "newsbrowser"
- filedesc = "NTNet/ExoNet News Browser"
- extended_desc = "This program may be used to view and download news articles from the network."
- program_icon_state = "generic"
- size = 8
- requires_ntnet = 1
- available_on_ntnet = 1
-
- nanomodule_path = /datum/nano_module/program/computer_newsbrowser/
- var/datum/computer_file/data/news_article/loaded_article
- var/download_progress = 0
- var/download_netspeed = 0
- var/downloading = 0
- var/message = ""
-
-/datum/computer_file/program/newsbrowser/process_tick()
- if(!downloading)
- return
- download_netspeed = 0
- // Speed defines are found in misc.dm
- switch(ntnet_status)
- if(1)
- download_netspeed = NTNETSPEED_LOWSIGNAL
- if(2)
- download_netspeed = NTNETSPEED_HIGHSIGNAL
- if(3)
- download_netspeed = NTNETSPEED_ETHERNET
- download_progress += download_netspeed
- if(download_progress >= loaded_article.size)
- downloading = 0
- requires_ntnet = 0 // Turn off NTNet requirement as we already loaded the file into local memory.
- nanomanager.update_uis(NM)
-
-/datum/computer_file/program/newsbrowser/kill_program()
- ..()
- requires_ntnet = 1
- loaded_article = null
- download_progress = 0
- downloading = 0
-
-/datum/computer_file/program/newsbrowser/Topic(href, href_list)
- if(..())
- return 1
- if(href_list["PRG_openarticle"])
- . = 1
- if(downloading || loaded_article)
- return 1
-
- for(var/datum/computer_file/data/news_article/N in ntnet_global.available_news)
- if(N.uid == text2num(href_list["PRG_openarticle"]))
- loaded_article = N.clone()
- downloading = 1
- break
- if(href_list["PRG_reset"])
- . = 1
- downloading = 0
- download_progress = 0
- requires_ntnet = 1
- loaded_article = null
- if(href_list["PRG_clearmessage"])
- . = 1
- message = ""
- if(href_list["PRG_savearticle"])
- . = 1
- if(downloading || !loaded_article)
- return
-
- var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename))
- if(!savename)
- return 1
- var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
- if(!HDD)
- return 1
- var/datum/computer_file/data/news_article/N = loaded_article.clone()
- N.filename = savename
- HDD.store_file(N)
- if(.)
- nanomanager.update_uis(NM)
-
-
-/datum/nano_module/program/computer_newsbrowser
- name = "NTNet/ExoNet News Browser"
-
-/datum/nano_module/program/computer_newsbrowser/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
-
- var/datum/computer_file/program/newsbrowser/PRG
- var/list/data = list()
- if(program)
- data = program.get_header_data()
- PRG = program
- else
- return
-
- data["message"] = PRG.message
- if(PRG.loaded_article && !PRG.downloading) // Viewing an article.
- data["title"] = PRG.loaded_article.filename
- data["article"] = PRG.loaded_article.stored_data
- else if(PRG.downloading) // Downloading an article.
- data["download_running"] = 1
- data["download_progress"] = PRG.download_progress
- data["download_maxprogress"] = PRG.loaded_article.size
- data["download_rate"] = PRG.download_netspeed
- else // Viewing list of articles
- var/list/all_articles[0]
- for(var/datum/computer_file/data/news_article/F in ntnet_global.available_news)
- all_articles.Add(list(list(
- "name" = F.filename,
- "size" = F.size,
- "uid" = F.uid
- )))
- data["all_articles"] = all_articles
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "news_browser.tmpl", "NTNet/ExoNet News Browser", 575, 700, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
-
diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
index fc81882fbd7..cdb4a553935 100644
--- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
@@ -103,7 +103,7 @@
//datum/nano_module/program/computer_ntnetdownload
// name = "Network Downloader"
-/datum/computer_file/program/ntnetdownload/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = always_state)
+/datum/computer_file/program/ntnetdownload/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
diff --git a/code/modules/modular_computers/file_system/programs/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/ntmonitor.dm
index 498e2eccf25..8df93e98fc4 100644
--- a/code/modules/modular_computers/file_system/programs/ntmonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/ntmonitor.dm
@@ -8,11 +8,7 @@
required_access = access_network
available_on_ntnet = 1
-//datum/nano_module/computer_ntnetmonitor
-// name = "NTNet Diagnostics and Monitoring"
-// available_to_ai = TRUE
-
-/datum/computer_file/program/ntnetmonitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = always_state)
+/datum/computer_file/program/ntnetmonitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
@@ -67,12 +63,12 @@
. = 1
if(!ntnet_global)
return 1
- ntnet_global.toggle_function(params)
+ ntnet_global.toggle_function(text2num(params["id"]))
/datum/computer_file/program/ntnetmonitor/ui_data(mob/user)
if(!ntnet_global)
return
- var/list/data = list()
+ var/list/data = get_header_data()
data["ntnetstatus"] = ntnet_global.check_function()
data["ntnetrelays"] = ntnet_global.relays.len
@@ -84,7 +80,10 @@
data["config_communication"] = ntnet_global.setting_communication
data["config_systemcontrol"] = ntnet_global.setting_systemcontrol
- data["ntnetlogs"] = ntnet_global.logs
+ data["ntnetlogs"] = list()
+
+ for(var/i in ntnet_global.logs)
+ data["ntnetlogs"] += list(list("entry" = i))
data["ntnetmaxlogs"] = ntnet_global.setting_maxlogcount
return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm
index c609fa86bcb..4d3fcc17b2e 100644
--- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm
+++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm
@@ -9,7 +9,6 @@
network_destination = "NTNRC server"
ui_header = "ntnrc_idle.gif"
available_on_ntnet = 1
- nanomodule_path = /datum/nano_module/program/computer_chatclient/
var/last_message = null // Used to generate the toolbar icon
var/username
var/datum/ntnet_conversation/channel = null
@@ -19,143 +18,144 @@
/datum/computer_file/program/chatclient/New()
username = "DefaultUser[rand(100, 999)]"
-/datum/computer_file/program/chatclient/Topic(href, href_list)
+/datum/computer_file/program/chatclient/ui_act(action, params)
if(..())
return 1
- if(href_list["PRG_speak"])
- . = 1
- if(!channel)
- return 1
- var/mob/living/user = usr
- var/message = sanitize(input(user, "Enter message or leave blank to cancel: "))
- if(!message || !channel)
- return
- channel.add_message(message, username)
-
- if(href_list["PRG_joinchannel"])
- . = 1
- var/datum/ntnet_conversation/C
- for(var/datum/ntnet_conversation/chan in ntnet_global.chat_channels)
- if(chan.id == text2num(href_list["PRG_joinchannel"]))
- C = chan
- break
-
- if(!C)
- return 1
-
- if(netadmin_mode)
- channel = C // Bypasses normal leave/join and passwords. Technically makes the user invisible to others.
- return 1
-
- if(C.password)
- var/mob/living/user = usr
- var/password = sanitize(input(user,"Access Denied. Enter password:"))
- if(C && (password == C.password))
- C.add_client(src)
- channel = C
- return 1
- C.add_client(src)
- channel = C
- if(href_list["PRG_leavechannel"])
- . = 1
- if(channel)
- channel.remove_client(src)
- channel = null
- if(href_list["PRG_newchannel"])
- . = 1
- var/mob/living/user = usr
- var/channel_title = sanitize(input(user,"Enter channel name or leave blank to cancel:"))
- if(!channel_title)
- return
- var/datum/ntnet_conversation/C = new/datum/ntnet_conversation()
- C.add_client(src)
- C.operator = src
- channel = C
- C.title = channel_title
- if(href_list["PRG_toggleadmin"])
- . = 1
- if(netadmin_mode)
- netadmin_mode = 0
- if(channel)
- channel.remove_client(src) // We shouldn't be in channel's user list, but just in case...
- channel = null
- return 1
- var/mob/living/user = usr
- if(can_run(usr, 1, access_network))
- if(channel)
- var/response = alert(user, "Really engage admin-mode? You will be disconnected from your current channel!", "NTNRC Admin mode", "Yes", "No")
- if(response == "Yes")
- if(channel)
- channel.remove_client(src)
- channel = null
- else
- return
- netadmin_mode = 1
- if(href_list["PRG_changename"])
- . = 1
- var/mob/living/user = usr
- var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:"))
- if(!newname)
- return 1
- if(channel)
- channel.add_status_message("[username] is now known as [newname].")
- username = newname
-
- if(href_list["PRG_savelog"])
- . = 1
- if(!channel)
- return
- var/mob/living/user = usr
- var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:")
- if(!logname || !channel)
- return 1
- var/datum/computer_file/data/logfile = new/datum/computer_file/data/logfile()
- // Now we will generate HTML-compliant file that can actually be viewed/printed.
- logfile.filename = logname
- logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]"
- for(var/logstring in channel.messages)
- logfile.stored_data += "[logstring]\[BR\]"
- logfile.stored_data += "\[b\]Logfile dump completed.\[/b\]"
- logfile.calculate_size()
- if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile))
- if(!computer)
- // This program shouldn't even be runnable without computer.
- CRASH("Var computer is null!")
+ switch(action)
+ if("PRG_speak")
+ . = 1
+ if(!channel)
return 1
- if(!computer.hard_drive)
- computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.")
- else // In 99.9% cases this will mean our HDD is full
- computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.")
- if(href_list["PRG_renamechannel"])
- . = 1
- if(!operator_mode || !channel)
- return 1
- var/mob/living/user = usr
- var/newname = sanitize(input(user, "Enter new channel name or leave blank to cancel:"))
- if(!newname || !channel)
- return
- channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.")
- channel.title = newname
- if(href_list["PRG_deletechannel"])
- . = 1
- if(channel && ((channel.operator == src) || netadmin_mode))
- qdel(channel)
+ var/mob/living/user = usr
+ var/message = sanitize(input(user, "Enter message or leave blank to cancel: "))
+ if(!message || !channel)
+ return
+ channel.add_message(message, username)
+
+ if("PRG_joinchannel")
+ . = 1
+ var/datum/ntnet_conversation/C
+ for(var/datum/ntnet_conversation/chan in ntnet_global.chat_channels)
+ if(chan.id == text2num(params["id"]))
+ C = chan
+ break
+
+ if(!C)
+ return 1
+
+ if(netadmin_mode)
+ channel = C // Bypasses normal leave/join and passwords. Technically makes the user invisible to others.
+ return 1
+
+ if(C.password)
+ var/mob/living/user = usr
+ var/password = sanitize(input(user,"Access Denied. Enter password:"))
+ if(C && (password == C.password))
+ C.add_client(src)
+ channel = C
+ return 1
+ C.add_client(src)
+ channel = C
+ if("PRG_leavechannel")
+ . = 1
+ if(channel)
+ channel.remove_client(src)
channel = null
- if(href_list["PRG_setpassword"])
- . = 1
- if(!channel || ((channel.operator != src) && !netadmin_mode))
- return 1
+ if("PRG_newchannel")
+ . = 1
+ var/mob/living/user = usr
+ var/channel_title = sanitize(input(user,"Enter channel name or leave blank to cancel:"))
+ if(!channel_title)
+ return
+ var/datum/ntnet_conversation/C = new/datum/ntnet_conversation()
+ C.add_client(src)
+ C.operator = src
+ channel = C
+ C.title = channel_title
+ if("PRG_toggleadmin")
+ . = 1
+ if(netadmin_mode)
+ netadmin_mode = 0
+ if(channel)
+ channel.remove_client(src) // We shouldn't be in channel's user list, but just in case...
+ channel = null
+ return 1
+ var/mob/living/user = usr
+ if(can_run(usr, 1, access_network))
+ if(channel)
+ var/response = alert(user, "Really engage admin-mode? You will be disconnected from your current channel!", "NTNRC Admin mode", "Yes", "No")
+ if(response == "Yes")
+ if(channel)
+ channel.remove_client(src)
+ channel = null
+ else
+ return
+ netadmin_mode = 1
+ if("PRG_changename")
+ . = 1
+ var/mob/living/user = usr
+ var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:"))
+ if(!newname)
+ return 1
+ if(channel)
+ channel.add_status_message("[username] is now known as [newname].")
+ username = newname
- var/mob/living/user = usr
- var/newpassword = sanitize(input(user, "Enter new password for this channel. Leave blank to cancel, enter 'nopassword' to remove password completely:"))
- if(!channel || !newpassword || ((channel.operator != src) && !netadmin_mode))
- return 1
+ if("PRG_savelog")
+ . = 1
+ if(!channel)
+ return
+ var/mob/living/user = usr
+ var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:")
+ if(!logname || !channel)
+ return 1
+ var/datum/computer_file/data/logfile = new/datum/computer_file/data/logfile()
+ // Now we will generate HTML-compliant file that can actually be viewed/printed.
+ logfile.filename = logname
+ logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]"
+ for(var/logstring in channel.messages)
+ logfile.stored_data += "[logstring]\[BR\]"
+ logfile.stored_data += "\[b\]Logfile dump completed.\[/b\]"
+ logfile.calculate_size()
+ if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile))
+ if(!computer)
+ // This program shouldn't even be runnable without computer.
+ CRASH("Var computer is null!")
+ return 1
+ if(!computer.hard_drive)
+ computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.")
+ else // In 99.9% cases this will mean our HDD is full
+ computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.")
+ if("PRG_renamechannel")
+ . = 1
+ if(!operator_mode || !channel)
+ return 1
+ var/mob/living/user = usr
+ var/newname = sanitize(input(user, "Enter new channel name or leave blank to cancel:"))
+ if(!newname || !channel)
+ return
+ channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.")
+ channel.title = newname
+ if("PRG_deletechannel")
+ . = 1
+ if(channel && ((channel.operator == src) || netadmin_mode))
+ qdel(channel)
+ channel = null
+ if("PRG_setpassword")
+ . = 1
+ if(!channel || ((channel.operator != src) && !netadmin_mode))
+ return 1
- if(newpassword == "nopassword")
- channel.password = ""
- else
- channel.password = newpassword
+ var/mob/living/user = usr
+ var/newpassword = sanitize(input(user, "Enter new password for this channel. Leave blank to cancel, enter 'nopassword' to remove password completely:"))
+ if(!channel || !newpassword || ((channel.operator != src) && !netadmin_mode))
+ return 1
+
+ if(newpassword == "nopassword")
+ channel.password = ""
+ else
+ channel.password = newpassword
/datum/computer_file/program/chatclient/process_tick()
..()
@@ -172,44 +172,47 @@
else
ui_header = "ntnrc_idle.gif"
-/datum/computer_file/program/chatclient/kill_program(var/forced = 0)
+/datum/computer_file/program/chatclient/kill_program(forced = 0)
if(channel)
channel.remove_client(src)
channel = null
..(forced)
-/datum/nano_module/program/computer_chatclient
- name = "NTNet Relay Chat Client"
+/datum/computer_file/program/chatclient/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state)
-/datum/nano_module/program/computer_chatclient/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "ntnet_chat", "NTNet Relay Chat Client", 575, 700, state = state)
+ ui.open()
+ ui.set_autoupdate(state = 1)
+
+
+/datum/computer_file/program/chatclient/ui_data(mob/user)
if(!ntnet_global || !ntnet_global.chat_channels)
return
var/list/data = list()
- if(program)
- data = program.get_header_data()
- var/datum/computer_file/program/chatclient/C = program
- if(!istype(C))
- return
+ data = get_header_data()
- data["adminmode"] = C.netadmin_mode
- if(C.channel)
- data["title"] = C.channel.title
+
+ data["adminmode"] = netadmin_mode
+ if(channel)
+ data["title"] = channel.title
var/list/messages[0]
- for(var/M in C.channel.messages)
+ for(var/M in channel.messages)
messages.Add(list(list(
"msg" = M
)))
data["messages"] = messages
var/list/clients[0]
- for(var/datum/computer_file/program/chatclient/cl in C.channel.clients)
+ for(var/datum/computer_file/program/chatclient/cl in channel.clients)
clients.Add(list(list(
"name" = cl.username
)))
data["clients"] = clients
- C.operator_mode = (C.channel.operator == C) ? 1 : 0
- data["is_operator"] = C.operator_mode || C.netadmin_mode
+ operator_mode = (channel.operator == src) ? 1 : 0
+ data["is_operator"] = operator_mode || netadmin_mode
else // Channel selection screen
var/list/all_channels[0]
@@ -221,10 +224,4 @@
)))
data["all_channels"] = all_channels
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "ntnet_chat.tmpl", "NTNet Relay Chat Client", 575, 700, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/nttransfer.dm b/code/modules/modular_computers/file_system/programs/nttransfer.dm
index 5bd76726aaa..2e863d744c0 100644
--- a/code/modules/modular_computers/file_system/programs/nttransfer.dm
+++ b/code/modules/modular_computers/file_system/programs/nttransfer.dm
@@ -10,7 +10,6 @@ var/global/nttransfer_uid = 0
requires_ntnet_feature = NTNET_PEERTOPEER
network_destination = "other device via P2P tunnel"
available_on_ntnet = 1
- nanomodule_path = /datum/nano_module/program/computer_nttransfer/
var/error = "" // Error screen
var/server_password = "" // Optional password to download the file.
@@ -55,8 +54,6 @@ var/global/nttransfer_uid = 0
downloaded_file = null
..(forced)
-
-
/datum/computer_file/program/nttransfer/proc/update_netspeed()
download_netspeed = 0
switch(ntnet_status)
@@ -87,35 +84,88 @@ var/global/nttransfer_uid = 0
download_completion = 0
-/datum/nano_module/program/computer_nttransfer
- name = "NTNet P2P Transfer Client"
+/datum/computer_file/program/nttransfer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state)
-/datum/nano_module/program/computer_nttransfer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
- if(!program)
- return
- var/datum/computer_file/program/nttransfer/PRG = program
- if(!istype(PRG))
- return
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "ntnet_transfer", "NTNet P2P Transfer Client", 575, 700, state = state)
+ ui.open()
+ ui.set_autoupdate(state = 1)
- var/list/data = program.get_header_data()
+/datum/computer_file/program/nttransfer/ui_act(action, params)
+ if(..())
+ return 1
+ switch(action)
+ if("PRG_downloadfile")
+ for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers)
+ if("[P.unique_token]" == params["id"])
+ remote = P
+ break
+ if(!remote || !remote.provided_file)
+ return
+ if(remote.server_password)
+ var/pass = sanitize(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required"))
+ if(pass != remote.server_password)
+ error = "Incorrect Password"
+ return
+ downloaded_file = remote.provided_file.clone()
+ remote.connected_clients.Add(src)
+ return 1
+ if("PRG_reset")
+ error = ""
+ upload_menu = 0
+ finalize_download()
+ if(src in ntnet_global.fileservers)
+ ntnet_global.fileservers.Remove(src)
+ for(var/datum/computer_file/program/nttransfer/T in connected_clients)
+ T.crash_download("Remote server has forcibly closed the connection")
+ provided_file = null
+ return 1
+ if("PRG_setpassword")
+ var/pass = sanitize(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none"))
+ if(!pass)
+ return
+ if(pass == "none")
+ server_password = ""
+ return
+ server_password = pass
+ return 1
+ if("PRG_uploadfile")
+ for(var/datum/computer_file/F in computer.hard_drive.stored_files)
+ if("[F.uid]" == params["id"])
+ if(F.unsendable)
+ error = "I/O Error: File locked."
+ return
+ provided_file = F
+ ntnet_global.fileservers.Add(src)
+ return
+ error = "I/O Error: Unable to locate file on hard drive."
+ return 1
+ if("PRG_uploadmenu")
+ upload_menu = 1
- if(PRG.error)
- data["error"] = PRG.error
- else if(PRG.downloaded_file)
+
+/datum/computer_file/program/nttransfer/ui_data(mob/user)
+
+ var/list/data = get_header_data()
+
+ if(error)
+ data["error"] = error
+ else if(downloaded_file)
data["downloading"] = 1
- data["download_size"] = PRG.downloaded_file.size
- data["download_progress"] = PRG.download_completion
- data["download_netspeed"] = PRG.actual_netspeed
- data["download_name"] = "[PRG.downloaded_file.filename].[PRG.downloaded_file.filetype]"
- else if (PRG.provided_file)
+ data["download_size"] = downloaded_file.size
+ data["download_progress"] = download_completion
+ data["download_netspeed"] = actual_netspeed
+ data["download_name"] = "[downloaded_file.filename].[downloaded_file.filetype]"
+ else if (provided_file)
data["uploading"] = 1
- data["upload_uid"] = PRG.unique_token
- data["upload_clients"] = PRG.connected_clients.len
- data["upload_haspassword"] = PRG.server_password ? 1 : 0
- data["upload_filename"] = "[PRG.provided_file.filename].[PRG.provided_file.filetype]"
- else if (PRG.upload_menu)
+ data["upload_uid"] = unique_token
+ data["upload_clients"] = connected_clients.len
+ data["upload_haspassword"] = server_password ? 1 : 0
+ data["upload_filename"] = "[provided_file.filename].[provided_file.filetype]"
+ else if (upload_menu)
var/list/all_files[0]
- for(var/datum/computer_file/F in PRG.computer.hard_drive.stored_files)
+ for(var/datum/computer_file/F in computer.hard_drive.stored_files)
all_files.Add(list(list(
"uid" = F.uid,
"filename" = "[F.filename].[F.filetype]",
@@ -133,62 +183,4 @@ var/global/nttransfer_uid = 0
)))
data["servers"] = all_servers
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "ntnet_transfer.tmpl", "NTNet P2P Transfer Client", 575, 700, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
-
-/datum/computer_file/program/nttransfer/Topic(href, href_list)
- if(..())
- return 1
- if(href_list["PRG_downloadfile"])
- for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers)
- if("[P.unique_token]" == href_list["PRG_downloadfile"])
- remote = P
- break
- if(!remote || !remote.provided_file)
- return
- if(remote.server_password)
- var/pass = sanitize(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required"))
- if(pass != remote.server_password)
- error = "Incorrect Password"
- return
- downloaded_file = remote.provided_file.clone()
- remote.connected_clients.Add(src)
- return 1
- if(href_list["PRG_reset"])
- error = ""
- upload_menu = 0
- finalize_download()
- if(src in ntnet_global.fileservers)
- ntnet_global.fileservers.Remove(src)
- for(var/datum/computer_file/program/nttransfer/T in connected_clients)
- T.crash_download("Remote server has forcibly closed the connection")
- provided_file = null
- return 1
- if(href_list["PRG_setpassword"])
- var/pass = sanitize(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none"))
- if(!pass)
- return
- if(pass == "none")
- server_password = ""
- return
- server_password = pass
- return 1
- if(href_list["PRG_uploadfile"])
- for(var/datum/computer_file/F in computer.hard_drive.stored_files)
- if("[F.uid]" == href_list["PRG_uploadfile"])
- if(F.unsendable)
- error = "I/O Error: File locked."
- return
- provided_file = F
- ntnet_global.fileservers.Add(src)
- return
- error = "I/O Error: Unable to locate file on hard drive."
- return 1
- if(href_list["PRG_uploadmenu"])
- upload_menu = 1
- return 0
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm
new file mode 100644
index 00000000000..7ec0cbd3b4a
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm
@@ -0,0 +1,88 @@
+
+
+/datum/computer_file/program/power_monitor
+ filename = "powermonitor"
+ filedesc = "Power Monitoring"
+ program_icon_state = "power_monitor"
+ extended_desc = "This program connects to sensors around the station to provide information about electrical systems"
+ ui_header = "power_norm.gif"
+ required_access = access_engine
+ usage_flags = PROGRAM_CONSOLE
+ requires_ntnet = 0
+ network_destination = "power monitoring system"
+ size = 9
+ var/has_alert = 0
+ var/obj/structure/cable/attached
+ var/list/history = list()
+ var/record_size = 60
+ var/record_interval = 50
+ var/next_record = 0
+
+
+
+
+/datum/computer_file/program/power_monitor/run_program(mob/living/user)
+ . = ..(user)
+ search()
+ history["supply"] = list()
+ history["demand"] = list()
+
+
+/datum/computer_file/program/power_monitor/process_tick()
+ if(!attached)
+ search()
+ else
+ record()
+
+/datum/computer_file/program/power_monitor/proc/search()
+ var/turf/T = get_turf(computer)
+ attached = locate() in T
+
+/datum/computer_file/program/power_monitor/proc/record()
+ if(world.time >= next_record)
+ next_record = world.time + record_interval
+
+ var/list/supply = history["supply"]
+ supply += attached.powernet.viewavail
+ if(supply.len > record_size)
+ supply.Cut(1, 2)
+
+ var/list/demand = history["demand"]
+ demand += attached.powernet.viewload
+ if(demand.len > record_size)
+ demand.Cut(1, 2)
+
+/datum/computer_file/program/power_monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
+ datum/tgui/master_ui = null, datum/ui_state/state = default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "power_monitor_prog", "Power Monitoring", 1200, 1000, master_ui, state)
+ ui.open()
+
+/datum/computer_file/program/power_monitor/ui_data()
+ var/list/data = get_header_data()
+ data["stored"] = record_size
+ data["interval"] = record_interval / 10
+ data["attached"] = attached ? TRUE : FALSE
+ if(attached)
+ data["supply"] = attached.powernet.viewavail
+ data["demand"] = attached.powernet.viewload
+ data["history"] = history
+
+ data["areas"] = list()
+ if(attached)
+ for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
+ var/obj/machinery/power/apc/A = term.master
+ if(istype(A))
+ data["areas"] += list(list(
+ "name" = A.area.name,
+ "charge" = A.cell.percent(),
+ "load" = A.lastused_total,
+ "charging" = A.charging,
+ "eqp" = A.equipment,
+ "lgt" = A.lighting,
+ "env" = A.environ
+ ))
+
+ return data
+
diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index d53975843da..4a74081c687 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -88,7 +88,7 @@
/obj/item/weapon/computer_hardware/hard_drive/proc/install_default_programs()
store_file(new/datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar
store_file(new/datum/computer_file/program/ntnetdownload(src)) // NTNet Downloader Utility, allows users to download more software from NTNet repository
-// store_file(new/datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation.
+ store_file(new/datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation.
// Use this proc to remove file from the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks.
diff --git a/code/modules/modular_computers/hardware/hardware.dm b/code/modules/modular_computers/hardware/hardware.dm
index 4e525cac247..a5ca5456650 100644
--- a/code/modules/modular_computers/hardware/hardware.dm
+++ b/code/modules/modular_computers/hardware/hardware.dm
@@ -22,6 +22,7 @@
return 1
// Nanopaste. Repair all damage if present for a single unit.
var/obj/item/stack/S = W
+/*
if(istype(S, /obj/item/stack/sheet/glass))
if(!damage)
user << "\The [src] doesn't seem to require repairs."
@@ -30,6 +31,7 @@
user << "You apply a bit of \the [W] to \the [src]. It immediately repairs all damage."
damage = 0
return 1
+*/
// Cable coil. Works as repair method, but will probably require multiple applications and more cable.
if(istype(S, /obj/item/stack/cable_coil))
if(!damage)
diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm
index db9c27657f4..a4d1b25f1b9 100644
--- a/code/modules/modular_computers/hardware/network_card.dm
+++ b/code/modules/modular_computers/hardware/network_card.dm
@@ -76,16 +76,15 @@ var/global/ntnet_card_uid = 1
return 0
if(holder2)
- return 2
-/*
+
var/turf/T = get_turf(holder2)
- if((T && istype(T)) && T.z in using_map.station_levels)
+ if((T && istype(T)) && T.z == ZLEVEL_STATION)
// Computer is on station. Low/High signal depending on what type of network card you have
if(long_range)
return 2
else
return 1
-*/
+
if(long_range) // Computer is not on station, but it has upgraded network card. Low signal.
return 1
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
deleted file mode 100644
index 6ae3cda4690..00000000000
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ /dev/null
@@ -1,296 +0,0 @@
-// A vendor machine for modular computer portable devices - Laptops and Tablets
-
-/obj/machinery/lapvend
- name = "computer vendor"
- desc = "A vending machine with microfabricator capable of dispensing various NT-branded computers."
- icon = 'icons/obj/vending.dmi'
- icon_state = "robotics"
- layer = 2.9
- anchored = 1
- density = 1
-
- // The actual laptop/tablet
- var/obj/machinery/modular_computer/laptop/fabricated_laptop = null
- var/obj/item/modular_computer/tablet/fabricated_tablet = null
-
- // Utility vars
- var/state = 0 // 0: Select device type, 1: Select loadout, 2: Payment, 3: Thankyou screen
- var/devtype = 0 // 0: None(unselected), 1: Laptop, 2: Tablet
- var/total_price = 0 // Price of currently vended device.
-
- // Device loadout
- var/dev_cpu = 1 // 1: Default, 2: Upgraded
- var/dev_battery = 1 // 1: Default, 2: Upgraded, 3: Advanced
- var/dev_disk = 1 // 1: Default, 2: Upgraded, 3: Advanced
- var/dev_netcard = 0 // 0: None, 1: Basic, 2: Long-Range
- var/dev_tesla = 0 // 0: None, 1: Standard (LAPTOP ONLY)
- var/dev_nanoprint = 0 // 0: None, 1: Standard
- var/dev_card = 0 // 0: None, 1: Standard
-
-// Removes all traces of old order and allows you to begin configuration from scratch.
-/obj/machinery/lapvend/proc/reset_order()
- state = 0
- devtype = 0
- if(fabricated_laptop)
- qdel(fabricated_laptop)
- fabricated_laptop = null
- if(fabricated_tablet)
- qdel(fabricated_tablet)
- fabricated_tablet = null
- dev_cpu = 1
- dev_battery = 1
- dev_disk = 1
- dev_netcard = 0
- dev_tesla = 0
- dev_nanoprint = 0
- dev_card = 0
-
-// Recalculates the price and optionally even fabricates the device.
-/obj/machinery/lapvend/proc/fabricate_and_recalc_price(var/fabricate = 0)
- total_price = 0
- if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles
- if(fabricate)
- fabricated_laptop = new(src)
- total_price = 99
- switch(dev_cpu)
- if(1)
- if(fabricate)
- fabricated_laptop.cpu.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(fabricated_laptop.cpu)
- if(2)
- if(fabricate)
- fabricated_laptop.cpu.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(fabricated_laptop.cpu)
- total_price += 299
- switch(dev_battery)
- if(1) // Basic(750C)
- if(fabricate)
- fabricated_laptop.cpu.battery_module = new/obj/item/weapon/computer_hardware/battery_module(fabricated_laptop.cpu)
- if(2) // Upgraded(1100C)
- if(fabricate)
- fabricated_laptop.cpu.battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(fabricated_laptop.cpu)
- total_price += 199
- if(3) // Advanced(1500C)
- if(fabricate)
- fabricated_laptop.cpu.battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(fabricated_laptop.cpu)
- total_price += 499
- switch(dev_disk)
- if(1) // Basic(128GQ)
- if(fabricate)
- fabricated_laptop.cpu.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(fabricated_laptop.cpu)
- if(2) // Upgraded(256GQ)
- if(fabricate)
- fabricated_laptop.cpu.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(fabricated_laptop.cpu)
- total_price += 99
- if(3) // Advanced(512GQ)
- if(fabricate)
- fabricated_laptop.cpu.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(fabricated_laptop.cpu)
- total_price += 299
- switch(dev_netcard)
- if(1) // Basic(Short-Range)
- if(fabricate)
- fabricated_laptop.cpu.network_card = new/obj/item/weapon/computer_hardware/network_card(fabricated_laptop.cpu)
- total_price += 99
- if(2) // Advanced (Long Range)
- if(fabricate)
- fabricated_laptop.cpu.network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(fabricated_laptop.cpu)
- total_price += 299
- if(dev_tesla)
- total_price += 399
- if(fabricate)
- fabricated_laptop.tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(fabricated_laptop)
- if(dev_nanoprint)
- total_price += 99
- if(fabricate)
- fabricated_laptop.cpu.nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(fabricated_laptop.cpu)
- if(dev_card)
- total_price += 199
- if(fabricate)
- fabricated_laptop.cpu.card_slot = new/obj/item/weapon/computer_hardware/card_slot(fabricated_laptop.cpu)
-
- return total_price
- else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this.
- if(fabricate)
- fabricated_tablet = new(src)
- fabricated_tablet.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(fabricated_tablet)
- total_price = 199
- switch(dev_battery)
- if(1) // Basic(300C)
- if(fabricate)
- fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module/nano(fabricated_tablet)
- if(2) // Upgraded(500C)
- if(fabricate)
- fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(fabricated_tablet)
- total_price += 199
- if(3) // Advanced(750C)
- if(fabricate)
- fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module(fabricated_tablet)
- total_price += 499
- switch(dev_disk)
- if(1) // Basic(32GQ)
- if(fabricate)
- fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/micro(fabricated_tablet)
- if(2) // Upgraded(64GQ)
- if(fabricate)
- fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(fabricated_tablet)
- total_price += 99
- if(3) // Advanced(128GQ)
- if(fabricate)
- fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(fabricated_tablet)
- total_price += 299
- switch(dev_netcard)
- if(1) // Basic(Short-Range)
- if(fabricate)
- fabricated_tablet.network_card = new/obj/item/weapon/computer_hardware/network_card(fabricated_tablet)
- total_price += 99
- if(2) // Advanced (Long Range)
- if(fabricate)
- fabricated_tablet.network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(fabricated_tablet)
- total_price += 299
- if(dev_nanoprint)
- total_price += 99
- if(fabricate)
- fabricated_tablet.nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(fabricated_tablet)
- if(dev_card)
- total_price += 199
- if(fabricate)
- fabricated_tablet.card_slot = new/obj/item/weapon/computer_hardware/card_slot(fabricated_tablet)
- return total_price
- return 0
-
-
-
-
-
-/obj/machinery/lapvend/Topic(href, href_list)
- if(..())
- return 1
-
- if(href_list["pick_device"])
- if(state) // We've already picked a device type
- return 0
- devtype = text2num(href_list["pick_device"])
- state = 1
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["clean_order"])
- reset_order()
- return 1
- if((state != 1) && devtype) // Following IFs should only be usable when in the Select Loadout mode
- return 0
- if(href_list["confirm_order"])
- state = 2 // Wait for ID swipe for payment processing
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_cpu"])
- dev_cpu = text2num(href_list["hw_cpu"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_battery"])
- dev_battery = text2num(href_list["hw_battery"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_disk"])
- dev_disk = text2num(href_list["hw_disk"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_netcard"])
- dev_netcard = text2num(href_list["hw_netcard"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_tesla"])
- dev_tesla = text2num(href_list["hw_tesla"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_nanoprint"])
- dev_nanoprint = text2num(href_list["hw_nanoprint"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_card"])
- dev_card = text2num(href_list["hw_card"])
- fabricate_and_recalc_price(0)
- return 1
- return 0
-
-/obj/machinery/lapvend/attack_hand(var/mob/user)
- ui_interact(user)
-
-/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- if(stat & (BROKEN | NOPOWER | MAINT))
- if(ui)
- ui.close()
- return 0
-
- var/list/data[0]
- data["state"] = state
- data["devtype"] = devtype
- data["hw_battery"] = dev_battery
- data["hw_disk"] = dev_disk
- data["hw_netcard"] = dev_netcard
- data["hw_tesla"] = dev_tesla
- data["hw_nanoprint"] = dev_nanoprint
- data["hw_card"] = dev_card
- data["hw_cpu"] = dev_cpu
- data["totalprice"] = "[total_price]"
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "computer_fabricator.tmpl", "Personal Computer Vendor", 500, 400)
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
-
-
-obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
- var/obj/item/weapon/card/id/I = W.GetID()
- // Awaiting payment state
- if(state == 2)
- if(process_payment(I,W))
- fabricate_and_recalc_price(1)
- if((devtype == 1) && fabricated_laptop)
- fabricated_laptop.cpu.battery_module.charge_to_full()
- fabricated_laptop.forceMove(src.loc)
- fabricated_laptop.close_laptop()
- fabricated_laptop = null
- else if((devtype == 2) && fabricated_tablet)
- fabricated_tablet.battery_module.charge_to_full()
- fabricated_tablet.forceMove(src.loc)
- fabricated_tablet = null
- ping("Enjoy your new product!")
- state = 3
- return 1
- return 0
- return ..()
-
-
-// Simplified payment processing, returns 1 on success.
-/obj/machinery/lapvend/proc/process_payment(var/obj/item/weapon/card/id/I, var/obj/item/ID_container)
- if(I==ID_container || ID_container == null)
- visible_message("\The [usr] swipes \the [I] through \the [src].")
- else
- visible_message("\The [usr] swipes \the [ID_container] through \the [src].")
- var/datum/money_account/customer_account = get_account(I.associated_account_number)
- if (!customer_account || customer_account.suspended)
- ping("Connection error. Unable to connect to account.")
- return 0
-
- if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2)
- var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
- customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2)
-
- if(!customer_account)
- ping("Unable to access account: incorrect credentials.")
- return 0
-
- if(total_price > customer_account.money)
- ping("Insufficient funds in account.")
- return 0
- else
- customer_account.money -= total_price
- var/datum/transaction/T = new()
- T.target_name = "Computer Manufacturer (via [src.name])"
- T.purpose = "Purchase of [(devtype == 1) ? "laptop computer" : "tablet microcomputer"]."
- T.amount = total_price
- T.source_terminal = src.name
- T.date = current_date_string
- T.time = stationtime2text()
- customer_account.transaction_log.Add(T)
- return 1
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index d57ab3136fa..0f984328612 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1527,11 +1527,16 @@
#include "code\modules\modular_computers\file_system\data.dm"
#include "code\modules\modular_computers\file_system\program.dm"
#include "code\modules\modular_computers\file_system\program_events.dm"
-#include "code\modules\modular_computers\file_system\programs\_program.dm"
+#include "code\modules\modular_computers\file_system\programs\alarm.dm"
#include "code\modules\modular_computers\file_system\programs\configurator.dm"
+#include "code\modules\modular_computers\file_system\programs\file_browser.dm"
#include "code\modules\modular_computers\file_system\programs\ntdownloader.dm"
#include "code\modules\modular_computers\file_system\programs\ntmonitor.dm"
+#include "code\modules\modular_computers\file_system\programs\ntnrc_client.dm"
+#include "code\modules\modular_computers\file_system\programs\nttransfer.dm"
+#include "code\modules\modular_computers\file_system\programs\powermonitor.dm"
#include "code\modules\modular_computers\file_system\programs\antagonist\dos.dm"
+#include "code\modules\modular_computers\file_system\programs\antagonist\revelation.dm"
#include "code\modules\modular_computers\hardware\battery_module.dm"
#include "code\modules\modular_computers\hardware\card_slot.dm"
#include "code\modules\modular_computers\hardware\hard_drive.dm"
@@ -1543,6 +1548,7 @@
#include "code\modules\modular_computers\hardware\tesla_link.dm"
#include "code\modules\modular_computers\NTNet\NTNet.dm"
#include "code\modules\modular_computers\NTNet\NTNet_relay.dm"
+#include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm"
#include "code\modules\ninja\__ninjaDefines.dm"
#include "code\modules\ninja\admin_ninja_verbs.dm"
#include "code\modules\ninja\energy_katana.dm"
diff --git a/tgui/assets/tgui.js b/tgui/assets/tgui.js
index 7aa508866fb..ea7ae8a4094 100644
--- a/tgui/assets/tgui.js
+++ b/tgui/assets/tgui.js
@@ -1,14 +1,15 @@
-require=function t(e,n,r){function a(o,s){if(!n[o]){if(!e[o]){var u="function"==typeof require&&require;if(!s&&u)return u(o,!0);if(i)return i(o,!0);var c=Error("Cannot find module '"+o+"'");throw c.code="MODULE_NOT_FOUND",c}var p=n[o]={exports:{}};e[o][0].call(p.exports,function(t){var n=e[o][1][t];return a(n?n:t)},p,p.exports,t,e,n,r)}return n[o].exports}for(var i="function"==typeof require&&require,o=0;o2?c[2]:void 0,l=Math.min((void 0===p?o:a(p,o))-u,o-s),f=1;for(s>u&&u+l>s&&(f=-1,u+=l-1,s+=l-1);l-- >0;)u in n?n[s]=n[u]:delete n[s],s+=f,u+=f;return n}},{76:76,79:79,80:80}],6:[function(t,e,n){"use strict";var r=t(80),a=t(76),i=t(79);e.exports=[].fill||function(t){for(var e=r(this),n=i(e.length),o=arguments,s=o.length,u=a(s>1?o[1]:void 0,n),c=s>2?o[2]:void 0,p=void 0===c?n:a(c,n);p>u;)e[u++]=t;return e}},{76:76,79:79,80:80}],7:[function(t,e,n){var r=t(78),a=t(79),i=t(76);e.exports=function(t){return function(e,n,o){var s,u=r(e),c=a(u.length),p=i(o,c);if(t&&n!=n){for(;c>p;)if(s=u[p++],s!=s)return!0}else for(;c>p;p++)if((t||p in u)&&u[p]===n)return t||p;return!t&&-1}}},{76:76,78:78,79:79}],8:[function(t,e,n){var r=t(17),a=t(34),i=t(80),o=t(79),s=t(9);e.exports=function(t){var e=1==t,n=2==t,u=3==t,c=4==t,p=6==t,l=5==t||p;return function(f,d,h){for(var m,v,g=i(f),b=a(g),y=r(d,h,3),x=o(b.length),_=0,w=e?s(f,x):n?s(f,0):void 0;x>_;_++)if((l||_ in b)&&(m=b[_],v=y(m,_,g),t))if(e)w[_]=v;else if(v)switch(t){case 3:return!0;case 5:return m;case 6:return _;case 2:w.push(m)}else if(c)return!1;return p?-1:u||c?c:w}}},{17:17,34:34,79:79,80:80,9:9}],9:[function(t,e,n){var r=t(38),a=t(36),i=t(83)("species");e.exports=function(t,e){var n;return a(t)&&(n=t.constructor,"function"!=typeof n||n!==Array&&!a(n.prototype)||(n=void 0),r(n)&&(n=n[i],null===n&&(n=void 0))),new(void 0===n?Array:n)(e)}},{36:36,38:38,83:83}],10:[function(t,e,n){var r=t(11),a=t(83)("toStringTag"),i="Arguments"==r(function(){return arguments}());e.exports=function(t){var e,n,o;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=(e=Object(t))[a])?n:i?r(e):"Object"==(o=r(e))&&"function"==typeof e.callee?"Arguments":o}},{11:11,83:83}],11:[function(t,e,n){var r={}.toString;e.exports=function(t){return r.call(t).slice(8,-1)}},{}],12:[function(t,e,n){"use strict";var r=t(46),a=t(31),i=t(60),o=t(17),s=t(69),u=t(18),c=t(27),p=t(42),l=t(44),f=t(82)("id"),d=t(30),h=t(38),m=t(65),v=t(19),g=Object.isExtensible||h,b=v?"_s":"size",y=0,x=function(t,e){if(!h(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!d(t,f)){if(!g(t))return"F";if(!e)return"E";a(t,f,++y)}return"O"+t[f]},_=function(t,e){var n,r=x(e);if("F"!==r)return t._i[r];for(n=t._f;n;n=n.n)if(n.k==e)return n};e.exports={getConstructor:function(t,e,n,a){var p=t(function(t,i){s(t,p,e),t._i=r.create(null),t._f=void 0,t._l=void 0,t[b]=0,void 0!=i&&c(i,n,t[a],t)});return i(p.prototype,{clear:function(){for(var t=this,e=t._i,n=t._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete e[n.i];t._f=t._l=void 0,t[b]=0},"delete":function(t){var e=this,n=_(e,t);if(n){var r=n.n,a=n.p;delete e._i[n.i],n.r=!0,a&&(a.n=r),r&&(r.p=a),e._f==n&&(e._f=r),e._l==n&&(e._l=a),e[b]--}return!!n},forEach:function(t){for(var e,n=o(t,arguments.length>1?arguments[1]:void 0,3);e=e?e.n:this._f;)for(n(e.v,e.k,this);e&&e.r;)e=e.p},has:function(t){return!!_(this,t)}}),v&&r.setDesc(p.prototype,"size",{get:function(){return u(this[b])}}),p},def:function(t,e,n){var r,a,i=_(t,e);return i?i.v=n:(t._l=i={i:a=x(e,!0),k:e,v:n,p:r=t._l,n:void 0,r:!1},t._f||(t._f=i),r&&(r.n=i),t[b]++,"F"!==a&&(t._i[a]=i)),t},getEntry:_,setStrong:function(t,e,n){p(t,e,function(t,e){this._t=t,this._k=e,this._l=void 0},function(){for(var t=this,e=t._k,n=t._l;n&&n.r;)n=n.p;return t._t&&(t._l=n=n?n.n:t._t._f)?"keys"==e?l(0,n.k):"values"==e?l(0,n.v):l(0,[n.k,n.v]):(t._t=void 0,l(1))},n?"entries":"values",!n,!0),m(e)}}},{17:17,18:18,19:19,27:27,30:30,31:31,38:38,42:42,44:44,46:46,60:60,65:65,69:69,82:82}],13:[function(t,e,n){var r=t(27),a=t(10);e.exports=function(t){return function(){if(a(this)!=t)throw TypeError(t+"#toJSON isn't generic");var e=[];return r(this,!1,e.push,e),e}}},{10:10,27:27}],14:[function(t,e,n){"use strict";var r=t(31),a=t(60),i=t(4),o=t(38),s=t(69),u=t(27),c=t(8),p=t(30),l=t(82)("weak"),f=Object.isExtensible||o,d=c(5),h=c(6),m=0,v=function(t){return t._l||(t._l=new g)},g=function(){this.a=[]},b=function(t,e){return d(t.a,function(t){return t[0]===e})};g.prototype={get:function(t){var e=b(this,t);return e?e[1]:void 0},has:function(t){return!!b(this,t)},set:function(t,e){var n=b(this,t);n?n[1]=e:this.a.push([t,e])},"delete":function(t){var e=h(this.a,function(e){return e[0]===t});return~e&&this.a.splice(e,1),!!~e}},e.exports={getConstructor:function(t,e,n,r){var i=t(function(t,a){s(t,i,e),t._i=m++,t._l=void 0,void 0!=a&&u(a,n,t[r],t)});return a(i.prototype,{"delete":function(t){return o(t)?f(t)?p(t,l)&&p(t[l],this._i)&&delete t[l][this._i]:v(this)["delete"](t):!1},has:function(t){return o(t)?f(t)?p(t,l)&&p(t[l],this._i):v(this).has(t):!1}}),i},def:function(t,e,n){return f(i(e))?(p(e,l)||r(e,l,{}),e[l][t._i]=n):v(t).set(e,n),t},frozenStore:v,WEAK:l}},{27:27,30:30,31:31,38:38,4:4,60:60,69:69,8:8,82:82}],15:[function(t,e,n){"use strict";var r=t(29),a=t(22),i=t(61),o=t(60),s=t(27),u=t(69),c=t(38),p=t(24),l=t(43),f=t(66);e.exports=function(t,e,n,d,h,m){var v=r[t],g=v,b=h?"set":"add",y=g&&g.prototype,x={},_=function(t){var e=y[t];i(y,t,"delete"==t?function(t){return m&&!c(t)?!1:e.call(this,0===t?0:t)}:"has"==t?function(t){return m&&!c(t)?!1:e.call(this,0===t?0:t)}:"get"==t?function(t){return m&&!c(t)?void 0:e.call(this,0===t?0:t)}:"add"==t?function(t){return e.call(this,0===t?0:t),this}:function(t,n){return e.call(this,0===t?0:t,n),this})};if("function"==typeof g&&(m||y.forEach&&!p(function(){(new g).entries().next()}))){var w,k=new g,E=k[b](m?{}:-0,1)!=k,S=p(function(){k.has(1)}),C=l(function(t){new g(t)});C||(g=e(function(e,n){u(e,g,t);var r=new v;return void 0!=n&&s(n,h,r[b],r),r}),g.prototype=y,y.constructor=g),m||k.forEach(function(t,e){w=1/e===-(1/0)}),(S||w)&&(_("delete"),_("has"),h&&_("get")),(w||E)&&_(b),m&&y.clear&&delete y.clear}else g=d.getConstructor(e,t,h,b),o(g.prototype,n);return f(g,t),x[t]=g,a(a.G+a.W+a.F*(g!=v),x),m||d.setStrong(g,t,h),g}},{22:22,24:24,27:27,29:29,38:38,43:43,60:60,61:61,66:66,69:69}],16:[function(t,e,n){var r=e.exports={version:"1.2.6"};"number"==typeof __e&&(__e=r)},{}],17:[function(t,e,n){var r=t(2);e.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,a){return t.call(e,n,r,a)}}return function(){return t.apply(e,arguments)}}},{2:2}],18:[function(t,e,n){e.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},{}],19:[function(t,e,n){e.exports=!t(24)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{24:24}],20:[function(t,e,n){var r=t(38),a=t(29).document,i=r(a)&&r(a.createElement);e.exports=function(t){return i?a.createElement(t):{}}},{29:29,38:38}],21:[function(t,e,n){var r=t(46);e.exports=function(t){var e=r.getKeys(t),n=r.getSymbols;if(n)for(var a,i=n(t),o=r.isEnum,s=0;i.length>s;)o.call(t,a=i[s++])&&e.push(a);return e}},{46:46}],22:[function(t,e,n){var r=t(29),a=t(16),i=t(31),o=t(61),s=t(17),u="prototype",c=function(t,e,n){var p,l,f,d,h=t&c.F,m=t&c.G,v=t&c.S,g=t&c.P,b=t&c.B,y=m?r:v?r[e]||(r[e]={}):(r[e]||{})[u],x=m?a:a[e]||(a[e]={}),_=x[u]||(x[u]={});m&&(n=e);for(p in n)l=!h&&y&&p in y,f=(l?y:n)[p],d=b&&l?s(f,r):g&&"function"==typeof f?s(Function.call,f):f,y&&!l&&o(y,p,f),x[p]!=f&&i(x,p,d),g&&_[p]!=f&&(_[p]=f)};r.core=a,c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,e.exports=c},{16:16,17:17,29:29,31:31,61:61}],23:[function(t,e,n){var r=t(83)("match");e.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,!"/./"[t](e)}catch(a){}}return!0}},{83:83}],24:[function(t,e,n){e.exports=function(t){try{return!!t()}catch(e){return!0}}},{}],25:[function(t,e,n){"use strict";var r=t(31),a=t(61),i=t(24),o=t(18),s=t(83);e.exports=function(t,e,n){var u=s(t),c=""[t];i(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(a(String.prototype,t,n(o,u,c)),r(RegExp.prototype,u,2==e?function(t,e){return c.call(t,this,e)}:function(t){return c.call(t,this)}))}},{18:18,24:24,31:31,61:61,83:83}],26:[function(t,e,n){"use strict";var r=t(4);e.exports=function(){var t=r(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},{4:4}],27:[function(t,e,n){var r=t(17),a=t(40),i=t(35),o=t(4),s=t(79),u=t(84);e.exports=function(t,e,n,c){var p,l,f,d=u(t),h=r(n,c,e?2:1),m=0;if("function"!=typeof d)throw TypeError(t+" is not iterable!");if(i(d))for(p=s(t.length);p>m;m++)e?h(o(l=t[m])[0],l[1]):h(t[m]);else for(f=d.call(t);!(l=f.next()).done;)a(f,h,l.value,e)}},{17:17,35:35,4:4,40:40,79:79,84:84}],28:[function(t,e,n){var r=t(78),a=t(46).getNames,i={}.toString,o="object"==typeof window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(t){try{return a(t)}catch(e){return o.slice()}};e.exports.get=function(t){return o&&"[object Window]"==i.call(t)?s(t):a(r(t))}},{46:46,78:78}],29:[function(t,e,n){var r=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=r)},{}],30:[function(t,e,n){var r={}.hasOwnProperty;e.exports=function(t,e){return r.call(t,e)}},{}],31:[function(t,e,n){var r=t(46),a=t(59);e.exports=t(19)?function(t,e,n){return r.setDesc(t,e,a(1,n))}:function(t,e,n){return t[e]=n,t}},{19:19,46:46,59:59}],32:[function(t,e,n){e.exports=t(29).document&&document.documentElement},{29:29}],33:[function(t,e,n){e.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},{}],34:[function(t,e,n){var r=t(11);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},{11:11}],35:[function(t,e,n){var r=t(45),a=t(83)("iterator"),i=Array.prototype;e.exports=function(t){return void 0!==t&&(r.Array===t||i[a]===t)}},{45:45,83:83}],36:[function(t,e,n){var r=t(11);e.exports=Array.isArray||function(t){return"Array"==r(t)}},{11:11}],37:[function(t,e,n){var r=t(38),a=Math.floor;e.exports=function(t){return!r(t)&&isFinite(t)&&a(t)===t}},{38:38}],38:[function(t,e,n){e.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},{}],39:[function(t,e,n){var r=t(38),a=t(11),i=t(83)("match");e.exports=function(t){var e;return r(t)&&(void 0!==(e=t[i])?!!e:"RegExp"==a(t))}},{11:11,38:38,83:83}],40:[function(t,e,n){var r=t(4);e.exports=function(t,e,n,a){try{return a?e(r(n)[0],n[1]):e(n)}catch(i){var o=t["return"];throw void 0!==o&&r(o.call(t)),i}}},{4:4}],41:[function(t,e,n){"use strict";var r=t(46),a=t(59),i=t(66),o={};t(31)(o,t(83)("iterator"),function(){return this}),e.exports=function(t,e,n){t.prototype=r.create(o,{next:a(1,n)}),i(t,e+" Iterator")}},{31:31,46:46,59:59,66:66,83:83}],42:[function(t,e,n){"use strict";var r=t(48),a=t(22),i=t(61),o=t(31),s=t(30),u=t(45),c=t(41),p=t(66),l=t(46).getProto,f=t(83)("iterator"),d=!([].keys&&"next"in[].keys()),h="@@iterator",m="keys",v="values",g=function(){return this};e.exports=function(t,e,n,b,y,x,_){c(n,e,b);var w,k,E=function(t){if(!d&&t in O)return O[t];switch(t){case m:return function(){return new n(this,t)};case v:return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",C=y==v,P=!1,O=t.prototype,A=O[f]||O[h]||y&&O[y],T=A||E(y);if(A){var M=l(T.call(new t));p(M,S,!0),!r&&s(O,h)&&o(M,f,g),C&&A.name!==v&&(P=!0,T=function(){return A.call(this)})}if(r&&!_||!d&&!P&&O[f]||o(O,f,T),u[e]=T,u[S]=g,y)if(w={values:C?T:E(v),keys:x?T:E(m),entries:C?E("entries"):T},_)for(k in w)k in O||i(O,k,w[k]);else a(a.P+a.F*(d||P),e,w);return w}},{22:22,30:30,31:31,41:41,45:45,46:46,48:48,61:61,66:66,83:83}],43:[function(t,e,n){var r=t(83)("iterator"),a=!1;try{var i=[7][r]();i["return"]=function(){a=!0},Array.from(i,function(){throw 2})}catch(o){}e.exports=function(t,e){if(!e&&!a)return!1;var n=!1;try{var i=[7],o=i[r]();o.next=function(){return{done:n=!0}},i[r]=function(){return o},t(i)}catch(s){}return n}},{83:83}],44:[function(t,e,n){e.exports=function(t,e){return{value:e,done:!!t}}},{}],45:[function(t,e,n){e.exports={}},{}],46:[function(t,e,n){var r=Object;e.exports={create:r.create,getProto:r.getPrototypeOf,isEnum:{}.propertyIsEnumerable,getDesc:r.getOwnPropertyDescriptor,setDesc:r.defineProperty,setDescs:r.defineProperties,getKeys:r.keys,getNames:r.getOwnPropertyNames,getSymbols:r.getOwnPropertySymbols,each:[].forEach}},{}],47:[function(t,e,n){var r=t(46),a=t(78);e.exports=function(t,e){for(var n,i=a(t),o=r.getKeys(i),s=o.length,u=0;s>u;)if(i[n=o[u++]]===e)return n}},{46:46,78:78}],48:[function(t,e,n){e.exports=!1},{}],49:[function(t,e,n){e.exports=Math.expm1||function(t){return 0==(t=+t)?t:t>-1e-6&&1e-6>t?t+t*t/2:Math.exp(t)-1}},{}],50:[function(t,e,n){e.exports=Math.log1p||function(t){return(t=+t)>-1e-8&&1e-8>t?t-t*t/2:Math.log(1+t)}},{}],51:[function(t,e,n){e.exports=Math.sign||function(t){return 0==(t=+t)||t!=t?t:0>t?-1:1}},{}],52:[function(t,e,n){var r,a,i,o=t(29),s=t(75).set,u=o.MutationObserver||o.WebKitMutationObserver,c=o.process,p=o.Promise,l="process"==t(11)(c),f=function(){var t,e,n;for(l&&(t=c.domain)&&(c.domain=null,t.exit());r;)e=r.domain,n=r.fn,e&&e.enter(),n(),e&&e.exit(),r=r.next;a=void 0,t&&t.enter()};if(l)i=function(){c.nextTick(f)};else if(u){var d=1,h=document.createTextNode("");new u(f).observe(h,{characterData:!0}),i=function(){h.data=d=-d}}else i=p&&p.resolve?function(){p.resolve().then(f)}:function(){s.call(o,f)};e.exports=function(t){var e={fn:t,next:void 0,domain:l&&c.domain};a&&(a.next=e),r||(r=e,i()),a=e}},{11:11,29:29,75:75}],53:[function(t,e,n){var r=t(46),a=t(80),i=t(34);e.exports=t(24)(function(){var t=Object.assign,e={},n={},r=Symbol(),a="abcdefghijklmnopqrst";return e[r]=7,a.split("").forEach(function(t){n[t]=t}),7!=t({},e)[r]||Object.keys(t({},n)).join("")!=a})?function(t,e){for(var n=a(t),o=arguments,s=o.length,u=1,c=r.getKeys,p=r.getSymbols,l=r.isEnum;s>u;)for(var f,d=i(o[u++]),h=p?c(d).concat(p(d)):c(d),m=h.length,v=0;m>v;)l.call(d,f=h[v++])&&(n[f]=d[f]);return n}:Object.assign},{24:24,34:34,46:46,80:80}],54:[function(t,e,n){var r=t(22),a=t(16),i=t(24);e.exports=function(t,e){var n=(a.Object||{})[t]||Object[t],o={};o[t]=e(n),r(r.S+r.F*i(function(){n(1)}),"Object",o)}},{16:16,22:22,24:24}],55:[function(t,e,n){var r=t(46),a=t(78),i=r.isEnum;e.exports=function(t){return function(e){for(var n,o=a(e),s=r.getKeys(o),u=s.length,c=0,p=[];u>c;)i.call(o,n=s[c++])&&p.push(t?[n,o[n]]:o[n]);return p}}},{46:46,78:78}],56:[function(t,e,n){var r=t(46),a=t(4),i=t(29).Reflect;e.exports=i&&i.ownKeys||function(t){var e=r.getNames(a(t)),n=r.getSymbols;return n?e.concat(n(t)):e}},{29:29,4:4,46:46}],57:[function(t,e,n){"use strict";var r=t(58),a=t(33),i=t(2);e.exports=function(){for(var t=i(this),e=arguments.length,n=Array(e),o=0,s=r._,u=!1;e>o;)(n[o]=arguments[o++])===s&&(u=!0);return function(){var r,i=this,o=arguments,c=o.length,p=0,l=0;if(!u&&!c)return a(t,n,i);if(r=n.slice(),u)for(;e>p;p++)r[p]===s&&(r[p]=o[l++]);for(;c>l;)r.push(o[l++]);return a(t,r,i)}}},{2:2,33:33,58:58}],58:[function(t,e,n){e.exports=t(29)},{29:29}],59:[function(t,e,n){e.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},{}],60:[function(t,e,n){var r=t(61);e.exports=function(t,e){for(var n in e)r(t,n,e[n]);return t}},{61:61}],61:[function(t,e,n){var r=t(29),a=t(31),i=t(82)("src"),o="toString",s=Function[o],u=(""+s).split(o);t(16).inspectSource=function(t){return s.call(t)},(e.exports=function(t,e,n,o){"function"==typeof n&&(n.hasOwnProperty(i)||a(n,i,t[e]?""+t[e]:u.join(e+"")),n.hasOwnProperty("name")||a(n,"name",e)),t===r?t[e]=n:(o||delete t[e],a(t,e,n))})(Function.prototype,o,function(){return"function"==typeof this&&this[i]||s.call(this)})},{16:16,29:29,31:31,82:82}],62:[function(t,e,n){e.exports=function(t,e){var n=e===Object(e)?function(t){return e[t]}:e;return function(e){return(e+"").replace(t,n)}}},{}],63:[function(t,e,n){e.exports=Object.is||function(t,e){return t===e?0!==t||1/t===1/e:t!=t&&e!=e}},{}],64:[function(t,e,n){var r=t(46).getDesc,a=t(38),i=t(4),o=function(t,e){if(i(t),!a(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,n,a){try{a=t(17)(Function.call,r(Object.prototype,"__proto__").set,2),a(e,[]),n=!(e instanceof Array)}catch(i){n=!0}return function(t,e){return o(t,e),n?t.__proto__=e:a(t,e),t}}({},!1):void 0),check:o}},{17:17,38:38,4:4,46:46}],65:[function(t,e,n){"use strict";var r=t(29),a=t(46),i=t(19),o=t(83)("species");e.exports=function(t){var e=r[t];i&&e&&!e[o]&&a.setDesc(e,o,{configurable:!0,get:function(){return this}})}},{19:19,29:29,46:46,83:83}],66:[function(t,e,n){var r=t(46).setDesc,a=t(30),i=t(83)("toStringTag");e.exports=function(t,e,n){t&&!a(t=n?t:t.prototype,i)&&r(t,i,{configurable:!0,value:e})}},{30:30,46:46,83:83}],67:[function(t,e,n){var r=t(29),a="__core-js_shared__",i=r[a]||(r[a]={});e.exports=function(t){return i[t]||(i[t]={})}},{29:29}],68:[function(t,e,n){var r=t(4),a=t(2),i=t(83)("species");e.exports=function(t,e){var n,o=r(t).constructor;return void 0===o||void 0==(n=r(o)[i])?e:a(n)}},{2:2,4:4,83:83}],69:[function(t,e,n){e.exports=function(t,e,n){if(!(t instanceof e))throw TypeError(n+": use the 'new' operator!");return t}},{}],70:[function(t,e,n){var r=t(77),a=t(18);e.exports=function(t){return function(e,n){var i,o,s=a(e)+"",u=r(n),c=s.length;return 0>u||u>=c?t?"":void 0:(i=s.charCodeAt(u),55296>i||i>56319||u+1===c||(o=s.charCodeAt(u+1))<56320||o>57343?t?s.charAt(u):i:t?s.slice(u,u+2):(i-55296<<10)+(o-56320)+65536)}}},{18:18,77:77}],71:[function(t,e,n){var r=t(39),a=t(18);e.exports=function(t,e,n){if(r(e))throw TypeError("String#"+n+" doesn't accept regex!");return a(t)+""}},{18:18,39:39}],72:[function(t,e,n){var r=t(79),a=t(73),i=t(18);e.exports=function(t,e,n,o){var s=i(t)+"",u=s.length,c=void 0===n?" ":n+"",p=r(e);if(u>=p)return s;""==c&&(c=" ");var l=p-u,f=a.call(c,Math.ceil(l/c.length));return f.length>l&&(f=f.slice(0,l)),o?f+s:s+f}},{18:18,73:73,79:79}],73:[function(t,e,n){"use strict";var r=t(77),a=t(18);e.exports=function(t){var e=a(this)+"",n="",i=r(t);if(0>i||i==1/0)throw RangeError("Count can't be negative");for(;i>0;(i>>>=1)&&(e+=e))1&i&&(n+=e);return n}},{18:18,77:77}],74:[function(t,e,n){var r=t(22),a=t(18),i=t(24),o=" \n\x0B\f\r \u2028\u2029\ufeff",s="["+o+"]",u="
",c=RegExp("^"+s+s+"*"),p=RegExp(s+s+"*$"),l=function(t,e){var n={};n[t]=e(f),r(r.P+r.F*i(function(){return!!o[t]()||u[t]()!=u}),"String",n)},f=l.trim=function(t,e){return t=a(t)+"",1&e&&(t=t.replace(c,"")),2&e&&(t=t.replace(p,"")),t};e.exports=l},{18:18,22:22,24:24}],75:[function(t,e,n){var r,a,i,o=t(17),s=t(33),u=t(32),c=t(20),p=t(29),l=p.process,f=p.setImmediate,d=p.clearImmediate,h=p.MessageChannel,m=0,v={},g="onreadystatechange",b=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},y=function(t){b.call(t.data)};f&&d||(f=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++m]=function(){s("function"==typeof t?t:Function(t),e)},r(m),m},d=function(t){delete v[t]},"process"==t(11)(l)?r=function(t){l.nextTick(o(b,t,1))}:h?(a=new h,i=a.port2,a.port1.onmessage=y,r=o(i.postMessage,i,1)):p.addEventListener&&"function"==typeof postMessage&&!p.importScripts?(r=function(t){p.postMessage(t+"","*")},p.addEventListener("message",y,!1)):r=g in c("script")?function(t){u.appendChild(c("script"))[g]=function(){u.removeChild(this),b.call(t)}}:function(t){setTimeout(o(b,t,1),0)}),e.exports={set:f,clear:d}},{11:11,17:17,20:20,29:29,32:32,33:33}],76:[function(t,e,n){var r=t(77),a=Math.max,i=Math.min;e.exports=function(t,e){return t=r(t),0>t?a(t+e,0):i(t,e)}},{77:77}],77:[function(t,e,n){var r=Math.ceil,a=Math.floor;e.exports=function(t){return isNaN(t=+t)?0:(t>0?a:r)(t)}},{}],78:[function(t,e,n){var r=t(34),a=t(18);e.exports=function(t){return r(a(t))}},{18:18,34:34}],79:[function(t,e,n){var r=t(77),a=Math.min;e.exports=function(t){return t>0?a(r(t),9007199254740991):0}},{77:77}],80:[function(t,e,n){var r=t(18);e.exports=function(t){return Object(r(t))}},{18:18}],81:[function(t,e,n){var r=t(38);e.exports=function(t,e){if(!r(t))return t;var n,a;if(e&&"function"==typeof(n=t.toString)&&!r(a=n.call(t)))return a;if("function"==typeof(n=t.valueOf)&&!r(a=n.call(t)))return a;if(!e&&"function"==typeof(n=t.toString)&&!r(a=n.call(t)))return a;throw TypeError("Can't convert object to primitive value")}},{38:38}],82:[function(t,e,n){var r=0,a=Math.random();e.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++r+a).toString(36))}},{}],83:[function(t,e,n){var r=t(67)("wks"),a=t(82),i=t(29).Symbol;e.exports=function(t){return r[t]||(r[t]=i&&i[t]||(i||a)("Symbol."+t))}},{29:29,67:67,82:82}],84:[function(t,e,n){var r=t(10),a=t(83)("iterator"),i=t(45);e.exports=t(16).getIteratorMethod=function(t){return void 0!=t?t[a]||t["@@iterator"]||i[r(t)]:void 0}},{10:10,16:16,45:45,83:83}],85:[function(t,e,n){"use strict";var r,a=t(46),i=t(22),o=t(19),s=t(59),u=t(32),c=t(20),p=t(30),l=t(11),f=t(33),d=t(24),h=t(4),m=t(2),v=t(38),g=t(80),b=t(78),y=t(77),x=t(76),_=t(79),w=t(34),k=t(82)("__proto__"),E=t(8),S=t(7)(!1),C=Object.prototype,P=Array.prototype,O=P.slice,A=P.join,T=a.setDesc,M=a.getDesc,j=a.setDescs,L={};o||(r=!d(function(){return 7!=T(c("div"),"a",{get:function(){return 7}}).a}),a.setDesc=function(t,e,n){if(r)try{return T(t,e,n)}catch(a){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(h(t)[e]=n.value),t},a.getDesc=function(t,e){if(r)try{return M(t,e)}catch(n){}return p(t,e)?s(!C.propertyIsEnumerable.call(t,e),t[e]):void 0},a.setDescs=j=function(t,e){h(t);for(var n,r=a.getKeys(e),i=r.length,o=0;i>o;)a.setDesc(t,n=r[o++],e[n]);return t}),i(i.S+i.F*!o,"Object",{getOwnPropertyDescriptor:a.getDesc,defineProperty:a.setDesc,defineProperties:j});var N="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(","),R=N.concat("length","prototype"),F=N.length,D=function(){var t,e=c("iframe"),n=F,r=">";for(e.style.display="none",u.appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("
-
+
+
+
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+ 
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+ 
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+ 
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+ 
+ {{/each}}
+
+
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
Welcome to computer configuration utility. Please consult your system administrator if you have any questions about your device.
diff --git a/tgui/src/interfaces/ntnet_chat.ract b/tgui/src/interfaces/ntnet_chat.ract
new file mode 100644
index 00000000000..65420867924
--- /dev/null
+++ b/tgui/src/interfaces/ntnet_chat.ract
@@ -0,0 +1,103 @@
+
+
+
+
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+
+ {{/each}}
+
+
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
+
+ {{#if data.adminmode}}
+ ADMINISTRATIVE MODE
+ {{/if}}
+
+ {{#if data.title}}
+
+ Current channel:
+
+
+ {{data.title}}
+
+
+ Operator access:
+
+
+ {{#if data.is_operator}}
+ Enabled
+ {{else}}
+ Disabled
+ {{/if}}
+
+
+ Controls:
+
+
+
+ Send message
+ Change nickname
+ Toggle administration mode
+ Leave channel
+ Save log to local drive
+ {{#if data.is_operator}}
+ Rename channel
+ Set password
+ Delete channel
+ {{/if}}
+
+
+ Chat Window
+
+
+
+ {{#each data.messages}}
+ {{msg}}
+ {{/each}}
+
+
+
+ Connected Users
+ {{#each data.clients}}
+ {{name}}
+ {{/each}}
+ {{else}}
+ Controls:
+
+ Change nickname
+ New Channel
+ Toggle administration mode
+
+ Available channels:
+
+ {{#each data.all_channels}}
+ {{id}}
+ {{/each}}
+
+ {{/if}}
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/ntnet_dos.ract b/tgui/src/interfaces/ntnet_dos.ract
index b34ec6c40c1..afff153814d 100644
--- a/tgui/src/interfaces/ntnet_dos.ract
+++ b/tgui/src/interfaces/ntnet_dos.ract
@@ -1,27 +1,58 @@
-
+
+
+
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+
+ {{/each}}
+
+
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
{{#if data.error}}
##SYSTEM ERROR: {{data.error}}RESET
+ {{elseif data.target}}
+ ##DoS traffic generator active. Tx: {{data.speed}}GQ/s
+ {{#each data.dos_strings}}
+ {{nums}}
+ {{/each}}
+ ABORT
{{else}}
- {{#if data.target}}
- ##DoS traffic generator active. Tx: {{data.speed}}GQ/s
- {{#each data.dos_strings}}
- {{value}}
- {{/each}}
- ABORT
+ ##DoS traffic generator ready. Select target device.
+ {{#if data.focus}}
+ Targeted device ID: {{data.focus}}
{{else}}
- ##DoS traffic generator ready. Select target device.
- {{#if data.focus}}
- Targeted device ID: {{data.focus}}
- {{else}}
- Targeted device ID: None
- {{/if}}
- EXECUTE
- Detected devices on network:
- {{#each data.relays}}
- {{value}}
- {{/each}}
+ Targeted device ID: None
{{/if}}
+ EXECUTE
+ Detected devices on network:
+ {{#each data.relays}}
+ {{id}}
+ {{/each}}
{{/if}}
diff --git a/tgui/src/interfaces/ntnet_downloader.ract b/tgui/src/interfaces/ntnet_downloader.ract
index 1c7f4a3324c..da100b50e5a 100644
--- a/tgui/src/interfaces/ntnet_downloader.ract
+++ b/tgui/src/interfaces/ntnet_downloader.ract
@@ -1,42 +1,40 @@
-
-
-
-
-
- {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
-
- {{/if}}
- {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
- {{data.PC_batterypercent}}
- {{/if}}
- {{#if data.PC_ntneticon}}
-
- {{/if}}
- {{#if data.PC_apclinkicon}}
-
- {{/if}}
- {{#if data.PC_stationtime}}
- {{data.PC_stationtime}}
- {{/if}}
- {{#each data.PC_programheaders}}
-
- {{/each}}
-
-
-
-
+
+
- Shutdown
- {{#if data.PC_showexitprogram}}
- EXIT PROGRAM
- Minimize Program
- {{/if}}
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+
+ {{/each}}
-
-
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
+
Welcome to software download utility. Please select which software you wish to download.
{{#if data.error}}
@@ -79,7 +77,7 @@
{{#each data.downloadable_programs}}
- {{value.filename}} ({{size}} GQ)
+ {{filename}} ({{size}} GQ)
{{filedesc}}
diff --git a/tgui/src/interfaces/ntnet_monitor.ract b/tgui/src/interfaces/ntnet_monitor.ract
index 4c01db1f73e..67943650afe 100644
--- a/tgui/src/interfaces/ntnet_monitor.ract
+++ b/tgui/src/interfaces/ntnet_monitor.ract
@@ -69,19 +69,19 @@
Software Downloads
{{data.config_softwaredownload ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
Peer to Peer Traffic
{{data.config_peertopeer ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
Communication Systems
{{data.config_communication ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
Remote System Control
{{data.config_systemcontrol ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
@@ -116,7 +116,7 @@
{{#each data.ntnetlogs}}
- {{value}}
+ {{entry}}
{{/each}}
diff --git a/tgui/src/interfaces/nt_relay.ract b/tgui/src/interfaces/ntnet_relay.ract
similarity index 100%
rename from tgui/src/interfaces/nt_relay.ract
rename to tgui/src/interfaces/ntnet_relay.ract
diff --git a/tgui/src/interfaces/ntnet_transfer.ract b/tgui/src/interfaces/ntnet_transfer.ract
new file mode 100644
index 00000000000..f0c499f8de0
--- /dev/null
+++ b/tgui/src/interfaces/ntnet_transfer.ract
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+
+ {{/each}}
+
+
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
+
+ {{#if data.error}}
+
+ An error has occured during operation...
+ Additional information: {{data.error}}
+ Clear
+
+ {{elseif data.downloading}}
+ Download in progress...
+
+ Downloaded file:
+
+
+ {{data.download_name}}
+
+
+ Download progress:
+
+
+ {{data.download_progress}} / {{data.download_size}} GQ
+
+
+ Transfer speed:
+
+
+ {{data.download_netspeed}}GQ/s
+
+
+ Controls:
+
+
+ Abort download
+
+ {{elseif data.uploading}}
+ Server enabled
+
+ Connected clients:
+
+
+ {{data.upload_clients}}
+
+
+ Provided file:
+
+
+ {{data.upload_filename}}
+
+
+ Server password:
+
+
+ {{#if data.haspassword}}
+ ENABLED
+ {{else}}
+ DISABLED
+ {{/if}}
+
+
+ Commands:
+
+
+ Set password
+ Exit server
+
+ {{elseif data.upload_filelist}}
+ File transfer server ready. Select file to upload:
+
+ File name File size Controls
+ {{#each data.upload_filelist}}
+ {{filename}}
+ {{size}}GQ
+ Select
+ {{/each}}
+
+
+ Set password
+ Return
+ {{else}}
+ Available files:
+ Server UID File Name File Size Password Protection Operations
+ {{#each data.servers}}
+ {{uid}}
+ {{filename}}
+ {{size}}GQ
+ {{#if haspassword}}
+ Enabled
+ {{/if}}
+ {{#if !haspassword}}
+ Disabled
+ {{/if}}
+
+ Download
+ {{/each}}
+
+
+ Send file
+ {{/if}}
+
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/power_monitor_prog.ract b/tgui/src/interfaces/power_monitor_prog.ract
new file mode 100644
index 00000000000..ba40f27ec07
--- /dev/null
+++ b/tgui/src/interfaces/power_monitor_prog.ract
@@ -0,0 +1,112 @@
+
+
+
+
+
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+
+ {{/each}}
+
+
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
+
+
+ {{#if config.fancy}}
+
+ {{data.supply}} W
+
+
+ {{data.demand}} W
+
+ {{/if}}
+
+
+
+ Area
+ Charge
+ Load
+ Status
+ Equipment
+ Lighting
+ Environment
+
+ {{#each data.areas}}
+
+ {{Math.round(adata.areas[@index].charge)}} %
+ {{Math.round(adata.areas[@index].load)}} W
+ {{chargingMode(charging)}}
+ {{channelPower(eqp)}} [{{channelMode(eqp)}}]
+ {{channelPower(lgt)}} [{{channelMode(lgt)}}]
+ {{channelPower(env)}} [{{channelMode(env)}}]
+
+ {{/each}}
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/revelation.ract b/tgui/src/interfaces/revelation.ract
new file mode 100644
index 00000000000..50f2489facb
--- /dev/null
+++ b/tgui/src/interfaces/revelation.ract
@@ -0,0 +1,60 @@
+
+
+
+
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+
+ {{/each}}
+
+
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
+
+
+
+
+ Payload status:
+
+
+ {{#if data.armed}}
+ ARMED
+ {{else}}
+ DISARMED
+ {{/if}}
+
+
+ Controls:
+
+
+
+ OBFUSCATE PROGRAM NAME
+ {{data.armed ? "DISARM" : "ARM"}}
+ ACTIVATE
+
+
+
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/station_alert_prog.ract b/tgui/src/interfaces/station_alert_prog.ract
new file mode 100644
index 00000000000..5ba78cdb91e
--- /dev/null
+++ b/tgui/src/interfaces/station_alert_prog.ract
@@ -0,0 +1,47 @@
+
+
+
+
+ {{#if data.PC_batteryicon && data.PC_showbatteryicon}}
+
+ {{/if}}
+ {{#if data.PC_batterypercent && data.PC_showbatteryicon}}
+ {{data.PC_batterypercent}}
+ {{/if}}
+ {{#if data.PC_ntneticon}}
+
+ {{/if}}
+ {{#if data.PC_apclinkicon}}
+
+ {{/if}}
+ {{#if data.PC_stationtime}}
+ {{data.PC_stationtime}}
+ {{/if}}
+ {{#each data.PC_programheaders}}
+
+ {{/each}}
+
+
+
+
+
+ Shutdown
+ {{#if data.PC_showexitprogram}}
+ EXIT PROGRAM
+ Minimize Program
+ {{/if}}
+
+
+
+
+{{#each data.alarms:class}}
+
+
+ {{#each .}}
+ - {{.}}
+ {{else}}
+ - System Nominal
+ {{/each}}
+
+
+{{/each}}
\ No newline at end of file
+
+
+
+
+| {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
+
+
+
+
+
+
+
+| {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
+
+
+
+
+ {{#if data.adminmode}}
+
+ {{#each data.clients}} + {{name}}
+ {{/each}} + {{else}} + Controls: +
+
+ Available channels:
+
+ {{#each data.all_channels}}
+
+ {{/if}}
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/ntnet_dos.ract b/tgui/src/interfaces/ntnet_dos.ract
index b34ec6c40c1..afff153814d 100644
--- a/tgui/src/interfaces/ntnet_dos.ract
+++ b/tgui/src/interfaces/ntnet_dos.ract
@@ -1,27 +1,58 @@
-
+
{{#if data.error}}
##SYSTEM ERROR: {{data.error}}RESET
+ {{elseif data.target}}
+ ##DoS traffic generator active. Tx: {{data.speed}}GQ/s
+ {{#each data.dos_strings}} + {{nums}}
+ {{/each}} +ABORT
{{else}}
- {{#if data.target}}
- ##DoS traffic generator active. Tx: {{data.speed}}GQ/s
- {{#each data.dos_strings}} - {{value}}
- {{/each}} -ABORT
+ ##DoS traffic generator ready. Select target device.
+ {{#if data.focus}} + Targeted device ID: {{data.focus}} {{else}} - ##DoS traffic generator ready. Select target device.
- {{#if data.focus}} - Targeted device ID: {{data.focus}} - {{else}} - Targeted device ID: None - {{/if}} -EXECUTE
- Detected devices on network:
- {{#each data.relays}} -{{value}}
- {{/each}}
+ Targeted device ID: None
{{/if}}
+ EXECUTE
+ Detected devices on network:
+ {{#each data.relays}} +{{id}}
+ {{/each}}
{{/if}}
diff --git a/tgui/src/interfaces/ntnet_downloader.ract b/tgui/src/interfaces/ntnet_downloader.ract
index 1c7f4a3324c..da100b50e5a 100644
--- a/tgui/src/interfaces/ntnet_downloader.ract
+++ b/tgui/src/interfaces/ntnet_downloader.ract
@@ -1,42 +1,40 @@
-
-
-
ADMINISTRATIVE MODE
+ {{/if}} + + {{#if data.title}} +
+ Current channel:
+
+
+ {{data.title}}
+
+
+ Operator access:
+
+
+ {{#if data.is_operator}}
+ Enabled
+ {{else}}
+ Disabled
+ {{/if}}
+
+
+ Controls:
+
+
+
+
+
+ Chat Window
+
+
+ Connected Users
+
+
+ {{#each data.messages}}
+ {{msg}}
+ {{/each}} +
+ + {{/each}} +
+ {{#each data.clients}} + {{name}}
+ {{/each}} + {{else}} + Controls: +
+ {{/each}} + |
+
+
+
+
+| {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
+
+
++ {{#each data.dos_strings}} + {{nums}}
+ {{/each}} +
- {{#each data.dos_strings}} - {{value}}
- {{/each}} -
+ {{#if data.focus}} + Targeted device ID: {{data.focus}} {{else}} - ##DoS traffic generator ready. Select target device.
- {{#if data.focus}} - Targeted device ID: {{data.focus}} - {{else}} - Targeted device ID: None - {{/if}} -
- {{#each data.relays}} -
+ {{#each data.relays}} +
-
-
-
-
- | {{data.PC_batterypercent}} - {{/if}} - {{#if data.PC_ntneticon}} - | {{data.PC_stationtime}} - {{/if}} - {{#each data.PC_programheaders}} - |
+
+
-
| {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
-
+
+
+
+
+
+
Welcome to software download utility. Please select which software you wish to download.
{{#if data.error}}
@@ -79,7 +77,7 @@
{{#each data.downloadable_programs}}
- {{value.filename}} ({{size}} GQ)
+ {{filename}} ({{size}} GQ)
{{filedesc}}
diff --git a/tgui/src/interfaces/ntnet_monitor.ract b/tgui/src/interfaces/ntnet_monitor.ract
index 4c01db1f73e..67943650afe 100644
--- a/tgui/src/interfaces/ntnet_monitor.ract
+++ b/tgui/src/interfaces/ntnet_monitor.ract
@@ -69,19 +69,19 @@
Software Downloads
{{data.config_softwaredownload ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
Peer to Peer Traffic
{{data.config_peertopeer ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
Communication Systems
{{data.config_communication ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
Remote System Control
{{data.config_systemcontrol ? 'ENABLED' : 'DISABLED'}}
- TOGGLE
+ TOGGLE
@@ -116,7 +116,7 @@
diff --git a/tgui/src/interfaces/nt_relay.ract b/tgui/src/interfaces/ntnet_relay.ract
similarity index 100%
rename from tgui/src/interfaces/nt_relay.ract
rename to tgui/src/interfaces/ntnet_relay.ract
diff --git a/tgui/src/interfaces/ntnet_transfer.ract b/tgui/src/interfaces/ntnet_transfer.ract
new file mode 100644
index 00000000000..f0c499f8de0
--- /dev/null
+++ b/tgui/src/interfaces/ntnet_transfer.ract
@@ -0,0 +1,136 @@
+
+
+
+
{{#if data.error}}
{{#each data.ntnetlogs}}
- {{value}}
+ {{entry}}
{{/each}}
+ {{entry}}
{{/each}}
+
+
+
+
+ | {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
+
+
+
+
+ {{#if data.error}}
+
+
+
+Set password
+ Return
+ {{else}}
+
+
+Send file
+ {{/if}}
+
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/power_monitor_prog.ract b/tgui/src/interfaces/power_monitor_prog.ract
new file mode 100644
index 00000000000..ba40f27ec07
--- /dev/null
+++ b/tgui/src/interfaces/power_monitor_prog.ract
@@ -0,0 +1,112 @@
+
+
+
+
+Clear
+
+ {{elseif data.downloading}}
+ An error has occured during operation...
+ Additional information: {{data.error}}+
Download in progress...
+
+ Downloaded file:
+
+
+ {{data.download_name}}
+
+
+ Download progress:
+
+
+ {{data.download_progress}} / {{data.download_size}} GQ
+
+
+ Transfer speed:
+
+
+ {{data.download_netspeed}}GQ/s
+
+
+ Controls:
+
+
+ Abort download
+
+ {{elseif data.uploading}}
+ Server enabled
+
+ Connected clients:
+
+
+ {{data.upload_clients}}
+
+
+ Provided file:
+
+
+ {{data.upload_filename}}
+
+
+ Server password:
+
+
+ {{#if data.haspassword}}
+ ENABLED
+ {{else}}
+ DISABLED
+ {{/if}}
+
+
+ Commands:
+
+
+ Set password
+ Exit server
+
+ {{elseif data.upload_filelist}}
+ File transfer server ready. Select file to upload:
+| File name | File size | Controls + {{#each data.upload_filelist}} + |
|---|---|---|
| {{filename}} + | {{size}}GQ + |
+
Available files:
+| Server UID | File Name | File Size | Password Protection | Operations + {{#each data.servers}} + | |
|---|---|---|---|---|---|
| {{uid}} + | {{filename}} + | {{size}}GQ + {{#if haspassword}} + | Enabled + {{/if}} + {{#if !haspassword}} + | Disabled + {{/if}} + + |
+
+
+
+
+
+| {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
+
+
+
+
+
+ {{#if config.fancy}}
+
+ {{data.supply}} W
+
+
+ {{data.demand}} W
+
+ {{/if}}
+
+
+
+
+ {{#each data.areas}}
+
+
+ {{/each}}
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/revelation.ract b/tgui/src/interfaces/revelation.ract
new file mode 100644
index 00000000000..50f2489facb
--- /dev/null
+++ b/tgui/src/interfaces/revelation.ract
@@ -0,0 +1,60 @@
+
+
Area
+ Charge
+ Load
+ Status
+ Equipment
+ Lighting
+ Environment
+ {{Math.round(adata.areas[@index].charge)}} %
+ {{Math.round(adata.areas[@index].load)}} W
+ {{chargingMode(charging)}}
+ {{channelPower(eqp)}} [{{channelMode(eqp)}}]
+ {{channelPower(lgt)}} [{{channelMode(lgt)}}]
+ {{channelPower(env)}} [{{channelMode(env)}}]
+
+
+
+
+
+| {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tgui/src/interfaces/station_alert_prog.ract b/tgui/src/interfaces/station_alert_prog.ract
new file mode 100644
index 00000000000..5ba78cdb91e
--- /dev/null
+++ b/tgui/src/interfaces/station_alert_prog.ract
@@ -0,0 +1,47 @@
+
+
+
+
+ Payload status:
+
+
+ {{#if data.armed}}
+ ARMED
+ {{else}}
+ DISARMED
+ {{/if}}
+
+
+ Controls:
+
+
+
+
+
+
+
+
+
+
+| {{data.PC_batterypercent}} + {{/if}} + {{#if data.PC_ntneticon}} + | {{data.PC_stationtime}} + {{/if}} + {{#each data.PC_programheaders}} + |
+
+
+
+
+{{#each data.alarms:class}}
+
+
+{{/each}}
\ No newline at end of file
-
+ {{#each .}}
+
- {{.}} + {{else}} +
- System Nominal + {{/each}} +