diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm index d7b5042d3b2..0e24c7a26f4 100644 --- a/code/modules/modular_computers/computers/item/computer_ui.dm +++ b/code/modules/modular_computers/computers/item/computer_ui.dm @@ -67,7 +67,7 @@ if("PC_minimize") var/mob/user = usr if(!active_program || !all_components[MC_CPU]) - return + return 1 idle_threads.Add(active_program) active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs @@ -85,7 +85,7 @@ P = hard_drive.find_file_by_name(prog) if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED) - return + return 1 P.kill_program(forced = TRUE) user << "Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed." @@ -99,12 +99,12 @@ if(!P || !istype(P)) // Program not found or it's not executable program. user << "\The [src]'s screen shows \"I/O ERROR - Unable to run program\" warning." - return + return 1 P.computer = src if(!P.is_supported_by_hardware(hardware_flag, 1, user)) - return + return 1 // The program is already running. Resume it. if(P in idle_threads) @@ -118,11 +118,11 @@ if(idle_threads.len > PU.max_idle_programs) user << "\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error." - return + return 1 if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) // The program requires NTNet connection, but we are not connected to NTNet. user << "\The [src]'s screen shows \"Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning." - return + return 1 if(P.run_program(user)) active_program = P update_icon() diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm index 768ca343669..17e2187eb81 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm @@ -40,7 +40,7 @@ if(!ui) var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers) assets.send(user) - ui = new(user, src, ui_key, "ntnet_dos.tmpl", "DoS Traffic Generator", 400, 250) + ui = new(user, src, ui_key, "ntnet_dos.tmpl", "DoS Traffic Generator", 575, 250) ui.set_auto_update(1) ui.open() 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 aac18a2f53b..753eadbdb2a 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -68,7 +68,7 @@ var/mob/living/user = usr var/channel_title = reject_bad_text(input(user,"Enter channel name or leave blank to cancel:")) if(!channel_title) - return + return 1 var/datum/ntnet_conversation/C = new/datum/ntnet_conversation() C.add_client(src) C.operator = src @@ -91,7 +91,7 @@ channel.remove_client(src) channel = null else - return + return 1 netadmin_mode = 1 if("PRG_changename") . = 1 @@ -106,7 +106,7 @@ if("PRG_savelog") . = 1 if(!channel) - return + return 1 var/mob/living/user = usr var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:") if(!logname || !channel) @@ -136,7 +136,7 @@ var/mob/living/user = usr var/newname = reject_bad_text(input(user, "Enter new channel name or leave blank to cancel:")) if(!newname || !channel) - return + return 1 channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.") channel.title = newname if("PRG_deletechannel") diff --git a/code/modules/modular_computers/file_system/programs/nttransfer.dm b/code/modules/modular_computers/file_system/programs/nttransfer.dm index f647675c078..d35a5127e18 100644 --- a/code/modules/modular_computers/file_system/programs/nttransfer.dm +++ b/code/modules/modular_computers/file_system/programs/nttransfer.dm @@ -109,7 +109,7 @@ var/global/nttransfer_uid = 0 var/pass = reject_bad_text(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) if(pass != remote.server_password) error = "Incorrect Password" - return + return 1 downloaded_file = remote.provided_file.clone() remote.connected_clients.Add(src) return 1 diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 3385ac01df5..9c25971c582 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -44,8 +44,8 @@ var/global/ntnet_card_uid = 1 if(ethernet) // Computer is connected via wired connection. return 3 - //if(!ntnet_global || !ntnet_global.check_function(specific_action)) // NTNet is down and we are not connected via wired connection. No signal. - // return 0 + if(!ntnet_global || !ntnet_global.check_function(specific_action)) // NTNet is down and we are not connected via wired connection. No signal. + return 0 if(holder) diff --git a/nano/templates/ntnet_dos.tmpl b/nano/templates/ntnet_dos.tmpl index 701a13e8aa9..7243901cbd8 100644 --- a/nano/templates/ntnet_dos.tmpl +++ b/nano/templates/ntnet_dos.tmpl @@ -40,13 +40,21 @@ {{for data.dos_strings}} {{:value.nums}}
{{/for}} - ABORT + {{:helper.link('ABORT', null, {'action' : 'PRG_reset'})}} {{else}} ##DoS traffic generator ready. Select target device.
- Targeted device ID: {{if data.focus}}{{:data.focus}}{{else}}None{{/if}} - {{:helper.link('EXECUTE', null, {'action' : 'PRG_execute'})}}
+
+
Targeted device ID:
+
{{if data.focus}}{{:data.focus}}{{else}}None{{/if}}
+
+ +
+ {{:helper.link('EXECUTE', null, {'action' : 'PRG_execute'})}}
+
Detected devices on network:
- {{for data.relays}} - {{:helper.link(value.id, null, {'action' : 'PRG_target_relay', 'targid' : value.id})}} - {{/for}} + + {{for data.relays}} +
{{:helper.link(value.id, null, {'action' : 'PRG_target_relay', 'targid' : value.id})}} + {{/for}} +
{{/if}} \ No newline at end of file diff --git a/nano/templates/ntnet_downloader.tmpl b/nano/templates/ntnet_downloader.tmpl index 839347b5e06..5a60e7d0556 100644 --- a/nano/templates/ntnet_downloader.tmpl +++ b/nano/templates/ntnet_downloader.tmpl @@ -130,7 +130,7 @@
{{:helper.link('DOWNLOAD', 'download', {'action' : 'PRG_downloadfile', 'filename' : value.filename})}}
{{/for}} - + {{/if}} {{/if}} {{/if}}