Various Tweaks to modular computers (#1320)

Added different run and download access levels
Added the possibility to check for one access, one in a list, all in a list
Tweaked the access levels required to download software.
Generally speaking, only departmental heads can now download departmental software
Locked down the software of the preset consoles. (No downloading games on them)
Fixed being unable to eject portable storage devices
Locked down work consoles dont accept portable storage devices
Added a software backup crate to secure storage

code/modules/modular_computers/file_system/programs/command/card.dm

@@ -4,7 +4,9 @@
 	nanomodule_path = /datum/nano_module/program/card_mod
 	program_icon_state = "id"
 	extended_desc = "Program for programming employee ID cards to access parts of the station."
-	required_access = access_change_ids
+	required_access_run = access_change_ids
+	required_access_download = access_change_ids
+	usage_flags = PROGRAM_CONSOLE
 	requires_ntnet = 0
 	size = 8
 

code/modules/modular_computers/file_system/programs/command/comm.dm

@@ -9,10 +9,11 @@
 	program_icon_state = "comm"
 	nanomodule_path = /datum/nano_module/program/comm
 	extended_desc = "Used to command and control the station. Can relay long-range communications."
-	required_access = access_heads
+	required_access_run = access_heads
+	required_access_download = access_heads
 	requires_ntnet = 1
 	size = 12
-	usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
+	usage_flags = PROGRAM_CONSOLE
 	network_destination = "station long-range communication array"
 	var/datum/comm_message_listener/message_core = new
 

code/modules/modular_computers/file_system/programs/engineering/_engineering.dm

@@ -7,7 +7,8 @@
 	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
+	required_access_run = access_engine
+	required_access_download = access_ce
 	requires_ntnet = 1
 	network_destination = "power monitoring system"
 	size = 9
@@ -64,11 +65,12 @@
 	nanomodule_path = /datum/nano_module/atmos_control
 	program_icon_state = "atmos_control"
 	extended_desc = "This program allows remote control of air alarms around the station. This program can not be run on tablet computers."
-	required_access = access_atmospherics
+	required_access_run = access_atmospherics
+	required_access_download = access_ce
 	requires_ntnet = 1
 	network_destination = "atmospheric control system"
 	requires_ntnet_feature = NTNET_SYSTEMCONTROL
-	usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE
+	usage_flags = PROGRAM_CONSOLE
 	size = 17
 
 /datum/computer_file/program/rcon_console
@@ -77,11 +79,12 @@
 	nanomodule_path = /datum/nano_module/rcon
 	program_icon_state = "generic"
 	extended_desc = "This program allows remote control of power distribution systems around the station. This program can not be run on tablet computers."
-	required_access = access_engine
+	required_access_run = access_engine
+	required_access_download = access_ce
 	requires_ntnet = 1
 	network_destination = "RCON remote control system"
 	requires_ntnet_feature = NTNET_SYSTEMCONTROL
-	usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE
+	usage_flags = PROGRAM_CONSOLE
 	size = 19
 
 // Night-Mode Toggle for CE
@@ -91,9 +94,10 @@
 	nanomodule_path = /datum/nano_module/lighting_ctrl
 	program_icon_state = "comm_monitor"
 	extended_desc = "This program allows mass-control of the station's lighting systems. This program cannot be run on tablet computers."
-	required_access = access_ce
+	required_access_run = access_heads
+	required_access_download = access_ce
 	requires_ntnet = 1
 	network_destination = "APC Coordinator"
 	requires_ntnet_feature = NTNET_SYSTEMCONTROL
-	usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE
-	size = 9
+	usage_flags = PROGRAM_CONSOLE
+	size = 9

code/modules/modular_computers/file_system/programs/file_browser.dm

@@ -125,7 +125,7 @@
 		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
-		if(!HDD || !RHDD)
+		if(!HDD || !RHDD || computer.software_locked)
 			return 1
 		var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_copytousb"])
 		if(!F || !istype(F))
@@ -136,7 +136,7 @@
 		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
-		if(!HDD || !RHDD)
+		if(!HDD || !RHDD || computer.software_locked)
 			return 1
 		var/datum/computer_file/F = RHDD.find_file_by_name(href_list["PRG_copyfromusb"])
 		if(!F || !istype(F))
@@ -205,4 +205,4 @@
 		ui.auto_update_layout = 1
 		ui.set_initial_data(data)
 		ui.open()
-#undef MAX_TEXTFILE_LENGTH
+#undef MAX_TEXTFILE_LENGTH

code/modules/modular_computers/file_system/programs/medical/_medical.dm

@@ -4,7 +4,9 @@
 	nanomodule_path = /datum/nano_module/crew_monitor
 	program_icon_state = "crew"
 	extended_desc = "This program connects to life signs monitoring system to provide basic information on crew health."
-	required_access = access_medical
+	required_access_run = access_medical
+	required_access_download = access_cmo
 	requires_ntnet = 1
 	network_destination = "crew lifesigns monitoring system"
 	size = 11
+	usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP

code/modules/modular_computers/file_system/programs/ntdownloader.dm

@@ -32,7 +32,7 @@
 	if(PRG.available_on_syndinet && !computer_emagged)
 		return 0
 
-	if(!computer || !computer.hard_drive || !computer.hard_drive.try_store_file(PRG))
+	if(!computer || !computer.hard_drive || !computer.hard_drive.try_store_file(PRG) || computer.software_locked)
 		return 0
 
 	ui_header = "downloader_running.gif"
@@ -85,8 +85,10 @@
 	switch(ntnet_status)
 		if(1)
 			download_netspeed = NTNETSPEED_LOWSIGNAL
+			downstream_variance = 0.3
 		if(2)
 			download_netspeed = NTNETSPEED_HIGHSIGNAL
+			downstream_variance = 0.2
 		if(3)
 			download_netspeed = NTNETSPEED_ETHERNET
 
@@ -162,28 +164,29 @@
 		data["disk_size"] = my_computer.hard_drive.max_capacity
 		data["disk_used"] = my_computer.hard_drive.used_capacity
 		var/list/all_entries[0]
-		for(var/datum/computer_file/program/P in ntnet_global.available_station_software)
-			// Only those programs our user can run will show in the list
-			if(!P.can_run(user) && P.requires_access_to_download)
-				continue
-			all_entries.Add(list(list(
-			"filename" = P.filename,
-			"filedesc" = P.filedesc,
-			"fileinfo" = P.extended_desc,
-			"size" = P.size
-			)))
-		data["hackedavailable"] = 0
-		if(prog.computer_emagged) // If we are running on emagged computer we have access to some "bonus" software
-			var/list/hacked_programs[0]
-			for(var/datum/computer_file/program/P in ntnet_global.available_antag_software)
-				data["hackedavailable"] = 1
-				hacked_programs.Add(list(list(
+		if(!my_computer.software_locked) //To lock installation of software on work computers until the IT Department is properly implemented
+			for(var/datum/computer_file/program/P in ntnet_global.available_station_software)
+				// Only those programs our user can run will show in the list
+				if(!P.can_download(user) && P.requires_access_to_download)
+					continue
+				all_entries.Add(list(list(
 				"filename" = P.filename,
 				"filedesc" = P.filedesc,
 				"fileinfo" = P.extended_desc,
 				"size" = P.size
 				)))
-			data["hacked_programs"] = hacked_programs
+			data["hackedavailable"] = 0
+			if(prog.computer_emagged) // If we are running on emagged computer we have access to some "bonus" software
+				var/list/hacked_programs[0]
+				for(var/datum/computer_file/program/P in ntnet_global.available_antag_software)
+					data["hackedavailable"] = 1
+					hacked_programs.Add(list(list(
+					"filename" = P.filename,
+					"filedesc" = P.filedesc,
+					"fileinfo" = P.extended_desc,
+					"size" = P.size
+					)))
+				data["hacked_programs"] = hacked_programs
 
 		data["downloadable_programs"] = all_entries
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)

code/modules/modular_computers/file_system/programs/research/_research.dm

@@ -4,6 +4,8 @@
 	nanomodule_path = /datum/nano_module/exosuit_control
 	program_icon_state = "mecha"
 	extended_desc = "This program allows remote monitoring and administration of exosuits with tracking beacons installed."
-	required_access = access_robotics
+	required_access_run = access_robotics
+	required_access_download = access_rd
+	usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
 	requires_ntnet = 1
-	size = 8
+	size = 8

code/modules/modular_computers/file_system/programs/research/ai_restorer.dm

@@ -5,8 +5,8 @@
 	extended_desc = "This program is capable of reconstructing damaged AI systems. It can also be used to upload basic laws to the AI. Requires direct AI connection via intellicard slot."
 	size = 12
 	requires_ntnet = 0
-	required_access = access_heads
 	requires_access_to_run = 0
+	required_access_download = access_heads
 	available_on_ntnet = 1
 	nanomodule_path = /datum/nano_module/program/computer_aidiag/
 	var/restoring = 0
@@ -114,4 +114,4 @@
 			ui.auto_update_layout = 1
 		ui.set_initial_data(data)
 		ui.open()
-		ui.set_auto_update(1)
+		ui.set_auto_update(1)

code/modules/modular_computers/file_system/programs/research/ntmonitor.dm

@@ -5,7 +5,10 @@
 	extended_desc = "This program monitors stationwide NTNet network, provides access to logging systems, and allows for configuration changes"
 	size = 12
 	requires_ntnet = 1
-	required_access = access_network
+	required_access_run = access_network
+	required_access_download = access_heads
+	usage_flags = PROGRAM_CONSOLE
+	
 	available_on_ntnet = 1
 	nanomodule_path = /datum/nano_module/computer_ntnetmonitor/
 

code/modules/modular_computers/file_system/programs/security/camera.dm

@@ -30,6 +30,7 @@
 	size = 12
 	available_on_ntnet = 1
 	requires_ntnet = 1
+	required_access_download = access_heads
 
 /datum/nano_module/camera_monitor
 	name = "Camera Monitoring program"