Modern Modular Computers

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

@@ -1,85 +0,0 @@
-// These programs are associated with engineering.
-
-/datum/computer_file/program/power_monitor
-	filename = "powermonitor"
-	filedesc = "Power Monitoring"
-	nanomodule_path = /datum/nano_module/power_monitor/
-	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
-	requires_ntnet = 1
-	network_destination = "power monitoring system"
-	size = 9
-	var/has_alert = 0
-
-/datum/computer_file/program/power_monitor/process_tick()
-	..()
-	var/datum/nano_module/power_monitor/NMA = NM
-	if(istype(NMA) && NMA.has_alarm())
-		if(!has_alert)
-			program_icon_state = "power_monitor_warn"
-			ui_header = "power_warn.gif"
-			update_computer_icon()
-			has_alert = 1
-	else
-		if(has_alert)
-			program_icon_state = "power_monitor"
-			ui_header = "power_norm.gif"
-			update_computer_icon()
-			has_alert = 0
-
-/datum/computer_file/program/alarm_monitor
-	filename = "alarmmonitor"
-	filedesc = "Alarm Monitoring"
-	nanomodule_path = /datum/nano_module/alarm_monitor/engineering
-	ui_header = "alarm_green.gif"
-	program_icon_state = "alert-green"
-	extended_desc = "This program provides visual interface for station's alarm system."
-	requires_ntnet = 1
-	network_destination = "alarm monitoring network"
-	size = 5
-	var/has_alert = 0
-
-/datum/computer_file/program/alarm_monitor/process_tick()
-	..()
-	var/datum/nano_module/alarm_monitor/NMA = NM
-	if(istype(NMA) && NMA.has_major_alarms())
-		if(!has_alert)
-			program_icon_state = "alert-red"
-			ui_header = "alarm_red.gif"
-			update_computer_icon()
-			has_alert = 1
-	else
-		if(has_alert)
-			program_icon_state = "alert-green"
-			ui_header = "alarm_green.gif"
-			update_computer_icon()
-			has_alert = 0
-	return 1
-
-/datum/computer_file/program/atmos_control
-	filename = "atmoscontrol"
-	filedesc = "Atmosphere Control"
-	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
-	requires_ntnet = 1
-	network_destination = "atmospheric control system"
-	requires_ntnet_feature = NTNET_SYSTEMCONTROL
-	usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE
-	size = 17
-
-/datum/computer_file/program/rcon_console
-	filename = "rconconsole"
-	filedesc = "RCON Remote Control"
-	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
-	requires_ntnet = 1
-	network_destination = "RCON remote control system"
-	requires_ntnet_feature = NTNET_SYSTEMCONTROL
-	usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE
-	size = 19 

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

@@ -1,10 +0,0 @@
-/datum/computer_file/program/suit_sensors
-	filename = "sensormonitor"
-	filedesc = "Suit Sensors Monitoring"
-	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
-	requires_ntnet = 1
-	network_destination = "crew lifesigns monitoring system"
-	size = 11 

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

@@ -1,31 +0,0 @@
-/obj/machinery/modular_computer/initial_data()
-	return cpu ? cpu.get_header_data() : ..()
-
-/obj/machinery/modular_computer/update_layout()
-	return TRUE
-
-/obj/item/modular_computer/initial_data()
-	return get_header_data()
-
-/obj/machinery/modular_computer/update_layout()
-	return TRUE
-
-/datum/nano_module/program
-	//available_to_ai = FALSE
-	var/datum/computer_file/program/program = null	// Program-Based computer program that runs this nano module. Defaults to null.
-
-/datum/nano_module/program/New(var/host, var/topic_manager, var/program)
-	..()
-	src.program = program
-
-/datum/topic_manager/program
-	var/datum/program
-
-/datum/topic_manager/program/New(var/datum/program)
-	..()
-	src.program = program
-
-// Calls forwarded to PROGRAM itself should begin with "PRG_"
-// Calls forwarded to COMPUTER running the program should begin with "PC_"
-/datum/topic_manager/program/Topic(href, href_list)
-	return program && program.Topic(href, href_list) 

code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm

@@ -16,7 +16,7 @@
 	var/datum/nano_module/camera_monitor/hacked/HNM = NM
 
 	// The program is active and connected to one of the station's networks. Has a very small chance to trigger IDS alarm every tick.
-	if(HNM.current_network && (HNM.current_network in using_map.station_networks) && prob(0.1))
+	if(HNM && HNM.current_network && (HNM.current_network in using_map.station_networks) && prob(0.1))
 		if(ntnet_global.intrusion_detection_enabled)
 			ntnet_global.add_log("IDS WARNING - Unauthorised access detected to camera network [HNM.current_network] by device with NID [computer.network_card.get_network_tag()]")
 			ntnet_global.intrusion_detection_alarm = 1

code/modules/modular_computers/file_system/programs/antagonist/revelation.dm

@@ -16,25 +16,24 @@
 		activate()
 
 /datum/computer_file/program/revelation/proc/activate()
-	if(computer)
-		computer.visible_message("<span class='notice'>\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.</span>")
-		computer.enabled = 0
-		computer.update_icon()
+	if(!computer)
+		return
+
+	computer.visible_message("<span class='notice'>\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.</span>")
+	computer.enabled = 0
+	computer.update_icon()
+	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	s.set_up(10, 1, computer.loc)
+	s.start()
+
+	if(computer.hard_drive)
 		qdel(computer.hard_drive)
-		if(computer.battery_module && prob(25))
-			qdel(computer.battery_module)
-			computer.visible_message("<span class='notice'>\The [computer]'s battery explodes in rain of sparks.</span>")
-			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-			s.set_up(10, 1, computer.loc)
-			s.start()
-		if(istype(computer, /obj/item/modular_computer/processor))
-			var/obj/item/modular_computer/processor/P = computer
-			if(P.tesla_link && prob(50))
-				qdel(P.tesla_link)
-				computer.visible_message("<span class='notice'>\The [computer]'s tesla link explodes in rain of sparks.</span>")
-				var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-				s.set_up(10, 1, computer.loc)
-				s.start()
+
+	if(computer.battery_module && prob(25))
+		qdel(computer.battery_module)
+
+	if(computer.tesla_link && prob(50))
+		qdel(computer.tesla_link)
 
 /datum/computer_file/program/revelation/Topic(href, href_list)
 	if(..())

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

@@ -42,7 +42,7 @@
 		data["id_owner"] = id_card && id_card.registered_name ? id_card.registered_name : "-----"
 		data["id_name"] = id_card ? id_card.name : "-----"
 
-
+	data["command_jobs"] = format_jobs(command_positions)
 	data["engineering_jobs"] = format_jobs(engineering_positions)
 	data["medical_jobs"] = format_jobs(medical_positions)
 	data["science_jobs"] = format_jobs(science_positions)
@@ -54,7 +54,7 @@
 	data["all_centcom_access"] = is_centcom ? get_accesses(1) : null
 	data["regions"] = get_accesses()
 
-	if(program.computer.card_slot.stored_card)
+	if(program.computer.card_slot && program.computer.card_slot.stored_card)
 		var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
 		if(is_centcom)
 			var/list/all_centcom_access = list()
@@ -88,7 +88,7 @@
 		ui.open()
 
 /datum/nano_module/program/card_mod/proc/format_jobs(list/jobs)
-	var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
+	var/obj/item/weapon/card/id/id_card = program.computer.card_slot ? program.computer.card_slot.stored_card : null
 	var/list/formatted = list()
 	for(var/job in jobs)
 		formatted.Add(list(list(
@@ -108,7 +108,10 @@
 
 	var/mob/user = usr
 	var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
-	var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
+	var/obj/item/weapon/card/id/id_card
+	if (computer.card_slot)
+		id_card = computer.card_slot.stored_card
+
 	var/datum/nano_module/program/card_mod/module = NM
 	switch(href_list["action"])
 		if("switchm")
@@ -168,7 +171,7 @@
 		if("edit")
 			if(computer && can_run(user, 1))
 				if(href_list["name"])
-					var/temp_name = sanitizeName(input("Enter name.", "Name", id_card.registered_name))
+					var/temp_name = sanitizeName(input("Enter name.", "Name", id_card.registered_name),allow_numbers=TRUE)
 					if(temp_name)
 						id_card.registered_name = temp_name
 					else

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

@@ -0,0 +1,132 @@
+/datum/computer_file/program/alarm_monitor
+	filename = "alarmmonitor"
+	filedesc = "Alarm Monitoring"
+	nanomodule_path = /datum/nano_module/alarm_monitor/engineering
+	ui_header = "alarm_green.gif"
+	program_icon_state = "alert-green"
+	extended_desc = "This program provides visual interface for the alarm system."
+	requires_ntnet = 1
+	network_destination = "alarm monitoring network"
+	size = 5
+	var/has_alert = 0
+
+/datum/computer_file/program/alarm_monitor/process_tick()
+	..()
+	var/datum/nano_module/alarm_monitor/NMA = NM
+	if(istype(NMA) && NMA.has_major_alarms())
+		if(!has_alert)
+			program_icon_state = "alert-red"
+			ui_header = "alarm_red.gif"
+			update_computer_icon()
+			has_alert = 1
+	else
+		if(has_alert)
+			program_icon_state = "alert-green"
+			ui_header = "alarm_green.gif"
+			update_computer_icon()
+			has_alert = 0
+	return 1
+
+/datum/nano_module/alarm_monitor
+	name = "Alarm monitor"
+	var/list_cameras = 0						// Whether or not to list camera references. A future goal would be to merge this with the enginering/security camera console. Currently really only for AI-use.
+	var/list/datum/alarm_handler/alarm_handlers // The particular list of alarm handlers this alarm monitor should present to the user.
+	//available_to_ai = FALSE
+
+/datum/nano_module/alarm_monitor/New()
+	..()
+	alarm_handlers = list()
+
+/datum/nano_module/alarm_monitor/all/New()
+	..()
+	alarm_handlers = alarm_manager.all_handlers
+
+/datum/nano_module/alarm_monitor/engineering/New()
+	..()
+	alarm_handlers = list(atmosphere_alarm, fire_alarm, power_alarm)
+
+/datum/nano_module/alarm_monitor/security/New()
+	..()
+	alarm_handlers = list(camera_alarm, motion_alarm)
+
+/datum/nano_module/alarm_monitor/proc/register_alarm(var/object, var/procName)
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		AH.register_alarm(object, procName)
+
+/datum/nano_module/alarm_monitor/proc/unregister_alarm(var/object)
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		AH.unregister_alarm(object)
+
+/datum/nano_module/alarm_monitor/proc/all_alarms()
+	var/list/all_alarms = new()
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		all_alarms += AH.visible_alarms()
+
+	return all_alarms
+
+/datum/nano_module/alarm_monitor/proc/major_alarms()
+	var/list/all_alarms = new()
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		all_alarms += AH.major_alarms()
+
+	return all_alarms
+
+// Modified version of above proc that uses slightly less resources, returns 1 if there is a major alarm, 0 otherwise.
+/datum/nano_module/alarm_monitor/proc/has_major_alarms()
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		if(AH.has_major_alarms())
+			return 1
+
+	return 0
+
+/datum/nano_module/alarm_monitor/proc/minor_alarms()
+	var/list/all_alarms = new()
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		all_alarms += AH.minor_alarms()
+
+	return all_alarms
+
+/datum/nano_module/alarm_monitor/Topic(ref, href_list)
+	if(..())
+		return 1
+	if(href_list["switchTo"])
+		var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras
+		if(!C)
+			return
+
+		usr.switch_to_camera(C)
+		return 1
+
+/datum/nano_module/alarm_monitor/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/categories[0]
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		categories[++categories.len] = list("category" = AH.category, "alarms" = list())
+		for(var/datum/alarm/A in AH.major_alarms())
+			var/cameras[0]
+			var/lost_sources[0]
+
+			if(isAI(user))
+				for(var/obj/machinery/camera/C in A.cameras())
+					cameras[++cameras.len] = C.nano_structure()
+			for(var/datum/alarm_source/AS in A.sources)
+				if(!AS.source)
+					lost_sources[++lost_sources.len] = AS.source_name
+
+			categories[categories.len]["alarms"] += list(list(
+					"name" = sanitize(A.alarm_name()),
+					"origin_lost" = A.origin == null,
+					"has_cameras" = cameras.len,
+					"cameras" = cameras,
+					"lost_sources" = lost_sources.len ? sanitize(english_list(lost_sources, nothing_text = "", and_text = ", ")) : ""))
+	data["categories"] = categories
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring Console", 800, 800, state = state)
+		if(host.update_layout()) // This is necessary to ensure the status bar remains updated along with rest of the UI.
+			ui.auto_update_layout = 1
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)

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

@@ -0,0 +1,101 @@
+/datum/computer_file/program/atmos_control
+	filename = "atmoscontrol"
+	filedesc = "Atmosphere Control"
+	nanomodule_path = /datum/nano_module/atmos_control
+	program_icon_state = "atmos_control"
+	extended_desc = "This program allows remote control of air alarms. This program can not be run on tablet computers."
+	required_access = access_atmospherics
+	requires_ntnet = 1
+	network_destination = "atmospheric control system"
+	requires_ntnet_feature = NTNET_SYSTEMCONTROL
+	usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE
+	size = 17
+
+/datum/nano_module/atmos_control
+	name = "Atmospherics Control"
+	var/obj/access = new()
+	var/emagged = 0
+	var/ui_ref
+	var/list/monitored_alarms = list()
+
+/datum/nano_module/atmos_control/New(atmos_computer, req_access, req_one_access, monitored_alarm_ids)
+	..()
+	access.req_access = req_access
+	access.req_one_access = req_one_access
+
+	if(monitored_alarm_ids)
+		for(var/obj/machinery/alarm/alarm in machines)
+			if(alarm.alarm_id && alarm.alarm_id in monitored_alarm_ids)
+				monitored_alarms += alarm
+		// machines may not yet be ordered at this point
+		monitored_alarms = dd_sortedObjectList(monitored_alarms)
+
+/datum/nano_module/atmos_control/Topic(href, href_list)
+	if(..())
+		return 1
+
+	if(href_list["alarm"])
+		if(ui_ref)
+			var/obj/machinery/alarm/alarm = locate(href_list["alarm"]) in (monitored_alarms.len ? monitored_alarms : machines)
+			if(alarm)
+				var/datum/topic_state/TS = generate_state(alarm)
+				alarm.ui_interact(usr, master_ui = ui_ref, state = TS)
+		return 1
+
+/datum/nano_module/atmos_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+	var/list/data = host.initial_data()
+	var/alarms[0]
+	var/turf/T = get_turf(nano_host())
+
+	// TODO: Move these to a cache, similar to cameras
+	for(var/obj/machinery/alarm/alarm in (monitored_alarms.len ? monitored_alarms : machines))
+		if(!monitored_alarms.len && alarm.alarms_hidden)
+			continue
+		alarms[++alarms.len] = list(
+			"name" = sanitize(alarm.name),
+			"ref"= "\ref[alarm]",
+			"danger" = max(alarm.danger_level, alarm.alarm_area.atmosalm),
+			"x" = alarm.x,
+			"y" = alarm.y,
+			"z" = alarm.z)
+	data["alarms"] = alarms
+	data["map_levels"] = using_map.get_map_levels(T.z)
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_control.tmpl", src.name, 625, 625, state = state)
+		if(host.update_layout()) // This is necessary to ensure the status bar remains updated along with rest of the UI.
+			ui.auto_update_layout = 1
+		// adding a template with the key "mapContent" enables the map ui functionality
+		ui.add_template("mapContent", "atmos_control_map_content.tmpl")
+		// adding a template with the key "mapHeader" replaces the map header content
+		ui.add_template("mapHeader", "atmos_control_map_header.tmpl")
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(0)
+	ui_ref = ui
+
+/datum/nano_module/atmos_control/proc/generate_state(air_alarm)
+	var/datum/topic_state/air_alarm/state = new()
+	state.atmos_control = src
+	state.air_alarm = air_alarm
+	return state
+
+/datum/topic_state/air_alarm
+	var/datum/nano_module/atmos_control/atmos_control	= null
+	var/obj/machinery/alarm/air_alarm					= null
+
+/datum/topic_state/air_alarm/can_use_topic(var/src_object, var/mob/user)
+	if(has_access(user))
+		return STATUS_INTERACTIVE
+	return STATUS_UPDATE
+
+/datum/topic_state/air_alarm/href_list(var/mob/user)
+	var/list/extra_href = list()
+	extra_href["remote_connection"] = 1
+	extra_href["remote_access"] = has_access(user)
+
+	return extra_href
+
+/datum/topic_state/air_alarm/proc/has_access(var/mob/user)
+	return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))

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

@@ -0,0 +1,111 @@
+/datum/computer_file/program/power_monitor
+	filename = "powermonitor"
+	filedesc = "Power Monitoring"
+	nanomodule_path = /datum/nano_module/power_monitor/
+	program_icon_state = "power_monitor"
+	extended_desc = "This program connects to sensors to provide information about electrical systems"
+	ui_header = "power_norm.gif"
+	required_access = access_engine
+	requires_ntnet = 1
+	network_destination = "power monitoring system"
+	size = 9
+	var/has_alert = 0
+
+/datum/computer_file/program/power_monitor/process_tick()
+	..()
+	var/datum/nano_module/power_monitor/NMA = NM
+	if(istype(NMA) && NMA.has_alarm())
+		if(!has_alert)
+			program_icon_state = "power_monitor_warn"
+			ui_header = "power_warn.gif"
+			update_computer_icon()
+			has_alert = 1
+	else
+		if(has_alert)
+			program_icon_state = "power_monitor"
+			ui_header = "power_norm.gif"
+			update_computer_icon()
+			has_alert = 0
+
+/datum/nano_module/power_monitor
+	name = "Power monitor"
+	var/list/grid_sensors
+	var/active_sensor = null	//name_tag of the currently selected sensor
+
+/datum/nano_module/power_monitor/New()
+	..()
+	refresh_sensors()
+
+// Checks whether there is an active alarm, if yes, returns 1, otherwise returns 0.
+/datum/nano_module/power_monitor/proc/has_alarm()
+	for(var/obj/machinery/power/sensor/S in grid_sensors)
+		if(S.check_grid_warning())
+			return 1
+	return 0
+
+// If PC is not null header template is loaded. Use PC.get_header_data() to get relevant nanoui data from it. All data entries begin with "PC_...."
+// In future it may be expanded to other modular computer devices.
+/datum/nano_module/power_monitor/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/list/sensors = list()
+	// Focus: If it remains null if no sensor is selected and UI will display sensor list, otherwise it will display sensor reading.
+	var/obj/machinery/power/sensor/focus = null
+	var/turf/T = get_turf(nano_host())
+
+	// Build list of data from sensor readings.
+	for(var/obj/machinery/power/sensor/S in grid_sensors)
+		sensors.Add(list(list(
+		"name" = S.name_tag,
+		"alarm" = S.check_grid_warning()
+		)))
+		if(S.name_tag == active_sensor)
+			focus = S
+
+	data["all_sensors"] = sensors
+	if(focus)
+		data["focus"] = focus.return_reading_data()
+	data["map_levels"] = using_map.get_map_levels(T.z)
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "power_monitor.tmpl", "Power Monitoring Console", 800, 500, state = state)
+		if(host.update_layout()) // This is necessary to ensure the status bar remains updated along with rest of the UI.
+			ui.auto_update_layout = 1
+		// adding a template with the key "mapContent" enables the map ui functionality
+		ui.add_template("mapContent", "power_monitor_map_content.tmpl")
+		// adding a template with the key "mapHeader" replaces the map header content
+		ui.add_template("mapHeader", "power_monitor_map_header.tmpl")
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+
+// Refreshes list of active sensors kept on this computer.
+/datum/nano_module/power_monitor/proc/refresh_sensors()
+	grid_sensors = list()
+	var/turf/T = get_turf(nano_host())
+	var/list/levels = list()
+	if(!T) // Safety check
+		return
+	if(T)
+		levels += using_map.get_map_levels(T.z, FALSE)
+	for(var/obj/machinery/power/sensor/S in machines)
+		if(T && (S.loc.z == T.z) || (S.loc.z in levels) || (S.long_range)) // Consoles have range on their Z-Level. Sensors with long_range var will work between Z levels.
+			if(S.name_tag == "#UNKN#") // Default name. Shouldn't happen!
+				warning("Powernet sensor with unset ID Tag! [S.x]X [S.y]Y [S.z]Z")
+			else
+				grid_sensors += S
+
+// Allows us to process UI clicks, which are relayed in form of hrefs.
+/datum/nano_module/power_monitor/Topic(href, href_list)
+	if(..())
+		return 1
+	if( href_list["clear"] )
+		active_sensor = null
+		. = 1
+	if( href_list["refresh"] )
+		refresh_sensors()
+		. = 1
+	else if( href_list["setsensor"] )
+		active_sensor = href_list["setsensor"]
+		. = 1

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

@@ -0,0 +1,130 @@
+/datum/computer_file/program/rcon_console
+	filename = "rconconsole"
+	filedesc = "RCON Remote Control"
+	nanomodule_path = /datum/nano_module/rcon
+	program_icon_state = "generic"
+	extended_desc = "This program allows remote control of power distribution systems. This program can not be run on tablet computers."
+	required_access = access_engine
+	requires_ntnet = 1
+	network_destination = "RCON remote control system"
+	requires_ntnet_feature = NTNET_SYSTEMCONTROL
+	usage_flags = PROGRAM_LAPTOP | PROGRAM_CONSOLE
+	size = 19
+
+/datum/nano_module/rcon
+	name = "Power RCON"
+	var/list/known_SMESs = null
+	var/list/known_breakers = null
+	// Allows you to hide specific parts of the UI
+	var/hide_SMES = 0
+	var/hide_SMES_details = 0
+	var/hide_breakers = 0
+
+/datum/nano_module/rcon/ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=1, var/datum/topic_state/state = default_state)
+	FindDevices() // Update our devices list
+	var/list/data = host.initial_data()
+
+	// SMES DATA (simplified view)
+	var/list/smeslist[0]
+	for(var/obj/machinery/power/smes/buildable/SMES in known_SMESs)
+		smeslist.Add(list(list(
+		"charge" = round(SMES.Percentage()),
+		"input_set" = SMES.input_attempt,
+		"input_val" = round(SMES.input_level/1000, 0.1),
+		"output_set" = SMES.output_attempt,
+		"output_val" = round(SMES.output_level/1000, 0.1),
+		"output_load" = round(SMES.output_used/1000, 0.1),
+		"RCON_tag" = SMES.RCon_tag
+		)))
+
+	data["smes_info"] = sortByKey(smeslist, "RCON_tag")
+
+	// BREAKER DATA (simplified view)
+	var/list/breakerlist[0]
+	for(var/obj/machinery/power/breakerbox/BR in known_breakers)
+		breakerlist.Add(list(list(
+		"RCON_tag" = BR.RCon_tag,
+		"enabled" = BR.on
+		)))
+	data["breaker_info"] = breakerlist
+	data["hide_smes"] = hide_SMES
+	data["hide_smes_details"] = hide_SMES_details
+	data["hide_breakers"] = hide_breakers
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "rcon.tmpl", "RCON Console", 600, 400, state = state)
+		if(host.update_layout()) // This is necessary to ensure the status bar remains updated along with rest of the UI.
+			ui.auto_update_layout = 1
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+
+// Proc: Topic()
+// Parameters: 2 (href, href_list - allows us to process UI clicks)
+// Description: Allows us to process UI clicks, which are relayed in form of hrefs.
+/datum/nano_module/rcon/Topic(href, href_list)
+	if(..())
+		return
+
+	if(href_list["smes_in_toggle"])
+		var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(href_list["smes_in_toggle"])
+		if(SMES)
+			SMES.toggle_input()
+	if(href_list["smes_out_toggle"])
+		var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(href_list["smes_out_toggle"])
+		if(SMES)
+			SMES.toggle_output()
+	if(href_list["smes_in_set"])
+		var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(href_list["smes_in_set"])
+		if(SMES)
+			var/inputset = (input(usr, "Enter new input level (0-[SMES.input_level_max/1000] kW)", "SMES Input Power Control", SMES.input_level/1000) as num) * 1000
+			SMES.set_input(inputset)
+	if(href_list["smes_out_set"])
+		var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(href_list["smes_out_set"])
+		if(SMES)
+			var/outputset = (input(usr, "Enter new output level (0-[SMES.output_level_max/1000] kW)", "SMES Output Power Control", SMES.output_level/1000) as num) * 1000
+			SMES.set_output(outputset)
+
+	if(href_list["toggle_breaker"])
+		var/obj/machinery/power/breakerbox/toggle = null
+		for(var/obj/machinery/power/breakerbox/breaker in known_breakers)
+			if(breaker.RCon_tag == href_list["toggle_breaker"])
+				toggle = breaker
+		if(toggle)
+			if(toggle.update_locked)
+				to_chat(usr, "The breaker box was recently toggled. Please wait before toggling it again.")
+			else
+				toggle.auto_toggle()
+	if(href_list["hide_smes"])
+		hide_SMES = !hide_SMES
+	if(href_list["hide_smes_details"])
+		hide_SMES_details = !hide_SMES_details
+	if(href_list["hide_breakers"])
+		hide_breakers = !hide_breakers
+
+
+// Proc: GetSMESByTag()
+// Parameters: 1 (tag - RCON tag of SMES we want to look up)
+// Description: Looks up and returns SMES which has matching RCON tag
+/datum/nano_module/rcon/proc/GetSMESByTag(var/tag)
+	if(!tag)
+		return
+
+	for(var/obj/machinery/power/smes/buildable/S in known_SMESs)
+		if(S.RCon_tag == tag)
+			return S
+
+// Proc: FindDevices()
+// Parameters: None
+// Description: Refreshes local list of known devices.
+/datum/nano_module/rcon/proc/FindDevices()
+	known_SMESs = new /list()
+	for(var/obj/machinery/power/smes/buildable/SMES in machines)
+		if(SMES.RCon_tag && (SMES.RCon_tag != "NO_TAG") && SMES.RCon)
+			known_SMESs.Add(SMES)
+
+	known_breakers = new /list()
+	for(var/obj/machinery/power/breakerbox/breaker in machines)
+		if(breaker.RCon_tag != "NO_TAG")
+			known_breakers.Add(breaker)

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

@@ -0,0 +1,130 @@
+/datum/computer_file/program/supermatter_monitor
+	filename = "supmon"
+	filedesc = "Supermatter Monitoring"
+	nanomodule_path = /datum/nano_module/supermatter_monitor/
+	program_icon_state = "smmon_0"
+	extended_desc = "This program connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines."
+	ui_header = "smmon_0.gif"
+	required_access = access_engine
+	requires_ntnet = 1
+	network_destination = "supermatter monitoring system"
+	size = 5
+	var/last_status = 0
+
+/datum/computer_file/program/supermatter_monitor/process_tick()
+	..()
+	var/datum/nano_module/supermatter_monitor/NMS = NM
+	var/new_status = istype(NMS) ? NMS.get_status() : 0
+	if(last_status != new_status)
+		last_status = new_status
+		ui_header = "smmon_[last_status].gif"
+		program_icon_state = "smmon_[last_status]"
+		if(istype(computer))
+			computer.update_icon()
+
+/datum/nano_module/supermatter_monitor
+	name = "Supermatter monitor"
+	var/list/supermatters
+	var/obj/machinery/power/supermatter/active = null		// Currently selected supermatter crystal.
+
+/datum/nano_module/supermatter_monitor/Destroy()
+	. = ..()
+	active = null
+	supermatters = null
+
+/datum/nano_module/supermatter_monitor/New()
+	..()
+	refresh()
+
+// Refreshes list of active supermatter crystals
+/datum/nano_module/supermatter_monitor/proc/refresh()
+	supermatters = list()
+	var/turf/T = get_turf(nano_host())
+	if(!T)
+		return
+	var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels)
+	for(var/obj/machinery/power/supermatter/S in machines)
+		// Delaminating, not within coverage, not on a tile.
+		if(S.grav_pulling || S.exploded || !(S.z in valid_z_levels) || !istype(S.loc, /turf/))
+			continue
+		supermatters.Add(S)
+
+	if(!(active in supermatters))
+		active = null
+
+/datum/nano_module/supermatter_monitor/proc/get_status()
+	. = SUPERMATTER_INACTIVE
+	for(var/obj/machinery/power/supermatter/S in supermatters)
+		. = max(., S.get_status())
+
+/datum/nano_module/supermatter_monitor/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()
+
+	if(istype(active))
+		var/turf/T = get_turf(active)
+		if(!T)
+			active = null
+			return
+		var/datum/gas_mixture/air = T.return_air()
+		if(!istype(air))
+			active = null
+			return
+
+		data["active"] = 1
+		data["SM_integrity"] = active.get_integrity()
+		data["SM_power"] = active.power
+		data["SM_ambienttemp"] = air.temperature
+		data["SM_ambientpressure"] = air.return_pressure()
+		//data["SM_EPR"] = active.get_epr()
+		if(air.total_moles)
+			data["SM_gas_O2"] = round(100*air.gas["oxygen"]/air.total_moles,0.01)
+			data["SM_gas_CO2"] = round(100*air.gas["carbon_dioxide"]/air.total_moles,0.01)
+			data["SM_gas_N2"] = round(100*air.gas["nitrogen"]/air.total_moles,0.01)
+			data["SM_gas_PH"] = round(100*air.gas["phoron"]/air.total_moles,0.01)
+			data["SM_gas_N2O"] = round(100*air.gas["sleeping_agent"]/air.total_moles,0.01)
+		else
+			data["SM_gas_O2"] = 0
+			data["SM_gas_CO2"] = 0
+			data["SM_gas_N2"] = 0
+			data["SM_gas_PH"] = 0
+			data["SM_gas_N2O"] = 0
+	else
+		var/list/SMS = list()
+		for(var/obj/machinery/power/supermatter/S in supermatters)
+			var/area/A = get_area(S)
+			if(!A)
+				continue
+
+			SMS.Add(list(list(
+			"area_name" = A.name,
+			"integrity" = S.get_integrity(),
+			"uid" = S.uid
+			)))
+
+		data["active"] = 0
+		data["supermatters"] = SMS
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "supermatter_monitor.tmpl", "Supermatter Monitoring", 600, 400, state = state)
+		if(host.update_layout())
+			ui.auto_update_layout = 1
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+
+/datum/nano_module/supermatter_monitor/Topic(href, href_list)
+	if(..())
+		return 1
+	if( href_list["clear"] )
+		active = null
+		return 1
+	if( href_list["refresh"] )
+		refresh()
+		return 1
+	if( href_list["set"] )
+		var/newuid = text2num(href_list["set"])
+		for(var/obj/machinery/power/supermatter/S in supermatters)
+			if(S.uid == newuid)
+				active = S
+		return 1

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

@@ -2,6 +2,9 @@
 /proc/get_camera_access(var/network)
 	if(!network)
 		return 0
+	. = using_map.get_network_access(network)
+	if(.)
+		return
 
 	switch(network)
 		if(NETWORK_THUNDER)
@@ -25,8 +28,8 @@
 	filename = "cammon"
 	filedesc = "Camera Monitoring"
 	nanomodule_path = /datum/nano_module/camera_monitor
-	program_icon_state = "generic"
-	extended_desc = "This program allows remote access to station's camera system. Some camera networks may have additional access requirements."
+	program_icon_state = "cameras"
+	extended_desc = "This program allows remote access to the camera system. Some camera networks may have additional access requirements."
 	size = 12
 	available_on_ntnet = 1
 	requires_ntnet = 1
@@ -154,7 +157,7 @@
 /datum/computer_file/program/camera_monitor/ert
 	filename = "ntcammon"
 	filedesc = "Advanced Camera Monitoring"
-	extended_desc = "This program allows remote access to station's camera system. Some camera networks may have additional access requirements. This version has an integrated database with additional encrypted keys."
+	extended_desc = "This program allows remote access to the camera system. Some camera networks may have additional access requirements. This version has an integrated database with additional encrypted keys."
 	size = 14
 	nanomodule_path = /datum/nano_module/camera_monitor/ert
 	available_on_ntnet = 0
@@ -168,4 +171,14 @@
 	..()
 	networks.Add(list(list("tag" = NETWORK_ERT, "has_access" = 1)))
 	networks.Add(list(list("tag" = NETWORK_CRESCENT, "has_access" = 1)))
-	return networks
+	return networks
+
+/datum/nano_module/camera_monitor/apply_visual(mob/M)
+	if(current_camera)
+		current_camera.apply_visual(M)
+	else
+		remove_visual(M)
+
+/datum/nano_module/camera_monitor/remove_visual(mob/M)
+	if(current_camera)
+		current_camera.remove_visual(M)

code/modules/modular_computers/file_system/programs/generic/email_client.dm

@@ -0,0 +1,497 @@
+/datum/computer_file/program/email_client
+	filename = "emailc"
+	filedesc = "Email Client"
+	extended_desc = "This program may be used to log in into your email account."
+	program_icon_state = "generic"
+	size = 7
+	requires_ntnet = 1
+	available_on_ntnet = 1
+	var/stored_login = ""
+	var/stored_password = ""
+
+	nanomodule_path = /datum/nano_module/email_client
+
+// Persistency. Unless you log out, or unless your password changes, this will pre-fill the login data when restarting the program
+/datum/computer_file/program/email_client/kill_program()
+	if(NM)
+		var/datum/nano_module/email_client/NME = NM
+		if(NME.current_account)
+			stored_login = NME.stored_login
+			stored_password = NME.stored_password
+		else
+			stored_login = ""
+			stored_password = ""
+	. = ..()
+
+/datum/computer_file/program/email_client/run_program()
+	. = ..()
+	if(NM)
+		var/datum/nano_module/email_client/NME = NM
+		NME.stored_login = stored_login
+		NME.stored_password = stored_password
+		NME.log_in()
+		NME.error = ""
+		NME.check_for_new_messages(1)
+
+/datum/computer_file/program/email_client/proc/new_mail_notify()
+	computer.visible_message("\The [computer] beeps softly, indicating a new email has been received.", 1)
+
+/datum/computer_file/program/email_client/process_tick()
+	..()
+	var/datum/nano_module/email_client/NME = NM
+	if(!istype(NME))
+		return
+	NME.relayed_process(ntnet_speed)
+
+	var/check_count = NME.check_for_new_messages()
+	if(check_count)
+		if(check_count == 2)
+			new_mail_notify()
+		ui_header = "ntnrc_new.gif"
+	else
+		ui_header = "ntnrc_idle.gif"
+
+/datum/nano_module/email_client/
+	name = "Email Client"
+	var/stored_login = ""
+	var/stored_password = ""
+	var/error = ""
+
+	var/msg_title = ""
+	var/msg_body = ""
+	var/msg_recipient = ""
+	var/datum/computer_file/msg_attachment = null
+	var/folder = "Inbox"
+	var/addressbook = FALSE
+	var/new_message = FALSE
+
+	var/last_message_count = 0	// How many messages were there during last check.
+	var/read_message_count = 0	// How many messages were there when user has last accessed the UI.
+
+	var/datum/computer_file/downloading = null
+	var/download_progress = 0
+	var/download_speed = 0
+
+	var/datum/computer_file/data/email_account/current_account = null
+	var/datum/computer_file/data/email_message/current_message = null
+
+/datum/nano_module/email_client/proc/log_in()
+	for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts)
+		if(!account.can_login)
+			continue
+		if(account.login == stored_login)
+			if(account.password == stored_password)
+				if(account.suspended)
+					error = "This account has been suspended. Please contact the system administrator for assistance."
+					return 0
+				current_account = account
+				return 1
+			else
+				error = "Invalid Password"
+				return 0
+	error = "Invalid Login"
+	return 0
+
+// Returns 0 if no new messages were received, 1 if there is an unread message but notification has already been sent.
+// and 2 if there is a new message that appeared in this tick (and therefore notification should be sent by the program).
+/datum/nano_module/email_client/proc/check_for_new_messages(var/messages_read = FALSE)
+	if(!current_account)
+		return 0
+
+	var/list/allmails = current_account.all_emails()
+
+	if(allmails.len > last_message_count)
+		. = 2
+	else if(allmails.len > read_message_count)
+		. = 1
+	else
+		. = 0
+
+	last_message_count = allmails.len
+	if(messages_read)
+		read_message_count = allmails.len
+
+
+/datum/nano_module/email_client/proc/log_out()
+	current_account = null
+	downloading = null
+	download_progress = 0
+	last_message_count = 0
+	read_message_count = 0
+
+/datum/nano_module/email_client/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()
+
+	// Password has been changed by other client connected to this email account
+	if(current_account)
+		if(current_account.password != stored_password)
+			log_out()
+			error = "Invalid Password"
+		// Banned.
+		if(current_account.suspended)
+			log_out()
+			error = "This account has been suspended. Please contact the system administrator for assistance."
+
+	if(error)
+		data["error"] = error
+	else if(downloading)
+		data["downloading"] = 1
+		data["down_filename"] = "[downloading.filename].[downloading.filetype]"
+		data["down_progress"] = download_progress
+		data["down_size"] = downloading.size
+		data["down_speed"] = download_speed
+
+	else if(istype(current_account))
+		data["current_account"] = current_account.login
+		if(addressbook)
+			var/list/all_accounts = list()
+			for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts)
+				if(!account.can_login)
+					continue
+				all_accounts.Add(list(list(
+					"login" = account.login
+				)))
+			data["addressbook"] = 1
+			data["accounts"] = all_accounts
+		else if(new_message)
+			data["new_message"] = 1
+			data["msg_title"] = msg_title
+			data["msg_body"] = pencode2html(msg_body)
+			data["msg_recipient"] = msg_recipient
+			if(msg_attachment)
+				data["msg_hasattachment"] = 1
+				data["msg_attachment_filename"] = "[msg_attachment.filename].[msg_attachment.filetype]"
+				data["msg_attachment_size"] = msg_attachment.size
+		else if (current_message)
+			data["cur_title"] = current_message.title
+			data["cur_body"] = pencode2html(current_message.stored_data)
+			data["cur_timestamp"] = current_message.timestamp
+			data["cur_source"] = current_message.source
+			data["cur_uid"] = current_message.uid
+			if(istype(current_message.attachment))
+				data["cur_hasattachment"] = 1
+				data["cur_attachment_filename"] = "[current_message.attachment.filename].[current_message.attachment.filetype]"
+				data["cur_attachment_size"] = current_message.attachment.size
+		else
+			data["label_inbox"] = "Inbox ([current_account.inbox.len])"
+			data["label_spam"] = "Spam ([current_account.spam.len])"
+			data["label_deleted"] = "Deleted ([current_account.deleted.len])"
+			var/list/message_source
+			if(folder == "Inbox")
+				message_source = current_account.inbox
+			else if(folder == "Spam")
+				message_source = current_account.spam
+			else if(folder == "Deleted")
+				message_source = current_account.deleted
+
+			if(message_source)
+				data["folder"] = folder
+				var/list/all_messages = list()
+				for(var/datum/computer_file/data/email_message/message in message_source)
+					all_messages.Add(list(list(
+						"title" = message.title,
+						"body" = pencode2html(message.stored_data),
+						"source" = message.source,
+						"timestamp" = message.timestamp,
+						"uid" = message.uid
+					)))
+				data["messages"] = all_messages
+				data["messagecount"] = all_messages.len
+	else
+		data["stored_login"] = stored_login
+		data["stored_password"] = stars(stored_password, 0)
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "email_client.tmpl", "Email Client", 600, 450, state = state)
+		if(host.update_layout())
+			ui.auto_update_layout = 1
+		ui.set_auto_update(1)
+		ui.set_initial_data(data)
+		ui.open()
+
+/datum/nano_module/email_client/proc/find_message_by_fuid(var/fuid)
+	if(!istype(current_account))
+		return
+
+	// href_list works with strings, so this makes it a bit easier for us
+	if(istext(fuid))
+		fuid = text2num(fuid)
+
+	for(var/datum/computer_file/data/email_message/message in current_account.all_emails())
+		if(message.uid == fuid)
+			return message
+
+/datum/nano_module/email_client/proc/clear_message()
+	new_message = FALSE
+	msg_title = ""
+	msg_body = ""
+	msg_recipient = ""
+	msg_attachment = null
+	current_message = null
+
+/datum/nano_module/email_client/proc/relayed_process(var/netspeed)
+	download_speed = netspeed
+	if(!downloading)
+		return
+	download_progress = min(download_progress + netspeed, downloading.size)
+	if(download_progress >= downloading.size)
+		var/obj/item/modular_computer/MC = nano_host()
+		if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality())
+			error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?"
+			downloading = null
+			download_progress = 0
+			return 1
+
+		if(MC.hard_drive.store_file(downloading))
+			error = "File successfully downloaded to local device."
+		else
+			error = "Error saving file: I/O Error: The hard drive may be full or nonfunctional."
+		downloading = null
+		download_progress = 0
+	return 1
+
+
+/datum/nano_module/email_client/Topic(href, href_list)
+	if(..())
+		return 1
+	var/mob/living/user = usr
+	check_for_new_messages(1)		// Any actual interaction (button pressing) is considered as acknowledging received message, for the purpose of notification icons.
+	if(href_list["login"])
+		log_in()
+		return 1
+
+	if(href_list["logout"])
+		log_out()
+		return 1
+
+	if(href_list["reset"])
+		error = ""
+		return 1
+
+	if(href_list["new_message"])
+		new_message = TRUE
+		return 1
+
+	if(href_list["cancel"])
+		if(addressbook)
+			addressbook = FALSE
+		else
+			clear_message()
+		return 1
+
+	if(href_list["addressbook"])
+		addressbook = TRUE
+		return 1
+
+	if(href_list["set_recipient"])
+		msg_recipient = sanitize(href_list["set_recipient"])
+		addressbook = FALSE
+		return 1
+
+	if(href_list["edit_title"])
+		var/newtitle = sanitize(input(user,"Enter title for your message:", "Message title", msg_title), 100)
+		if(newtitle)
+			msg_title = newtitle
+		return 1
+
+	// This uses similar editing mechanism as the FileManager program, therefore it supports various paper tags and remembers formatting.
+	if(href_list["edit_body"])
+		var/oldtext = html_decode(msg_body)
+		oldtext = replacetext(oldtext, "\[editorbr\]", "\n")
+
+		var/newtext = sanitize(replacetext(input(usr, "Enter your message. You may use most tags from paper formatting", "Message Editor", oldtext) as message|null, "\n", "\[editorbr\]"), 20000)
+		if(newtext)
+			msg_body = newtext
+		return 1
+
+	if(href_list["edit_recipient"])
+		var/newrecipient = sanitize(input(user,"Enter recipient's email address:", "Recipient", msg_recipient), 100)
+		if(newrecipient)
+			msg_recipient = newrecipient
+		return 1
+
+	if(href_list["edit_login"])
+		var/newlogin = sanitize(input(user,"Enter login", "Login", stored_login), 100)
+		if(newlogin)
+			stored_login = newlogin
+		return 1
+
+	if(href_list["edit_password"])
+		var/newpass = sanitize(input(user,"Enter password", "Password"), 100)
+		if(newpass)
+			stored_password = newpass
+		return 1
+
+	if(href_list["delete"])
+		if(!istype(current_account))
+			return 1
+		var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["delete"])
+		if(!istype(M))
+			return 1
+		if(folder == "Deleted")
+			current_account.deleted.Remove(M)
+			qdel(M)
+		else
+			current_account.deleted.Add(M)
+			current_account.inbox.Remove(M)
+			current_account.spam.Remove(M)
+		if(current_message == M)
+			current_message = null
+		return 1
+
+	if(href_list["send"])
+		if(!current_account)
+			return 1
+		if((msg_title == "") || (msg_body == "") || (msg_recipient == ""))
+			error = "Error sending mail: Title or message body is empty!"
+			return 1
+
+		var/datum/computer_file/data/email_message/message = new()
+		message.title = msg_title
+		message.stored_data = msg_body
+		message.source = current_account.login
+		message.attachment = msg_attachment
+		if(!current_account.send_mail(msg_recipient, message))
+			error = "Error sending email: this address doesn't exist."
+			return 1
+		else
+			error = "Email successfully sent."
+			clear_message()
+			return 1
+
+	if(href_list["set_folder"])
+		folder = href_list["set_folder"]
+		return 1
+
+	if(href_list["reply"])
+		var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["reply"])
+		if(!istype(M))
+			return 1
+
+		new_message = TRUE
+		msg_recipient = M.source
+		msg_title = "Re: [M.title]"
+		msg_body = "\[editorbr\]\[editorbr\]\[editorbr\]\[br\]==============================\[br\]\[editorbr\]"
+		msg_body += "Received by [current_account.login] at [M.timestamp]\[br\]\[editorbr\][M.stored_data]"
+		return 1
+
+	if(href_list["view"])
+		var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["view"])
+		if(istype(M))
+			current_message = M
+		return 1
+
+	if(href_list["changepassword"])
+		var/oldpassword = sanitize(input(user,"Please enter your old password:", "Password Change"), 100)
+		if(!oldpassword)
+			return 1
+		var/newpassword1 = sanitize(input(user,"Please enter your new password:", "Password Change"), 100)
+		if(!newpassword1)
+			return 1
+		var/newpassword2 = sanitize(input(user,"Please re-enter your new password:", "Password Change"), 100)
+		if(!newpassword2)
+			return 1
+
+		if(!istype(current_account))
+			error = "Please log in before proceeding."
+			return 1
+
+		if(current_account.password != oldpassword)
+			error = "Incorrect original password"
+			return 1
+
+		if(newpassword1 != newpassword2)
+			error = "The entered passwords do not match."
+			return 1
+
+		current_account.password = newpassword1
+		stored_password = newpassword1
+		error = "Your password has been successfully changed!"
+		return 1
+
+	// The following entries are Modular Computer framework only, and therefore won't do anything in other cases (like AI View)
+
+	if(href_list["save"])
+		// Fully dependant on modular computers here.
+		var/obj/item/modular_computer/MC = nano_host()
+
+		if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality())
+			error = "Error exporting file. Are you using a functional and NTOS-compliant device?"
+			return 1
+
+		var/filename = sanitize(input(user,"Please specify file name:", "Message export"), 100)
+		if(!filename)
+			return 1
+
+		var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["save"])
+		var/datum/computer_file/data/mail = istype(M) ? M.export() : null
+		if(!istype(mail))
+			return 1
+		mail.filename = filename
+		if(!MC.hard_drive || !MC.hard_drive.store_file(mail))
+			error = "Internal I/O error when writing file, the hard drive may be full."
+		else
+			error = "Email exported successfully"
+		return 1
+
+	if(href_list["addattachment"])
+		var/obj/item/modular_computer/MC = nano_host()
+		msg_attachment = null
+
+		if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality())
+			error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?"
+			return 1
+
+		var/list/filenames = list()
+		for(var/datum/computer_file/CF in MC.hard_drive.stored_files)
+			if(CF.unsendable)
+				continue
+			filenames.Add(CF.filename)
+		var/picked_file = input(user, "Please pick a file to send as attachment (max 32GQ)") as null|anything in filenames
+
+		if(!picked_file)
+			return 1
+
+		if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality())
+			error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?"
+			return 1
+
+		for(var/datum/computer_file/CF in MC.hard_drive.stored_files)
+			if(CF.unsendable)
+				continue
+			if(CF.filename == picked_file)
+				msg_attachment = CF.clone()
+				break
+		if(!istype(msg_attachment))
+			msg_attachment = null
+			error = "Unknown error when uploading attachment."
+			return 1
+
+		if(msg_attachment.size > 32)
+			error = "Error uploading attachment: File exceeds maximal permitted file size of 32GQ."
+			msg_attachment = null
+		else
+			error = "File [msg_attachment.filename].[msg_attachment.filetype] has been successfully uploaded."
+		return 1
+
+	if(href_list["downloadattachment"])
+		if(!current_account || !current_message || !current_message.attachment)
+			return 1
+		var/obj/item/modular_computer/MC = nano_host()
+		if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality())
+			error = "Error downloading file. Are you using a functional and NTOSv2-compliant device?"
+			return 1
+
+		downloading = current_message.attachment.clone()
+		download_progress = 0
+		return 1
+
+	if(href_list["canceldownload"])
+		downloading = null
+		download_progress = 0
+		return 1
+
+	if(href_list["remove_attachment"])
+		msg_attachment = null
+		return 1

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

@@ -104,7 +104,7 @@
 			// This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space.
 			// They will be able to copy-paste the text from error screen and store it in notepad or something.
 			if(!HDD.store_file(F))
-				error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:<br><br>[F.stored_data]<br><br>"
+				error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:<br><br>[html_decode(F.stored_data)]<br><br>"
 				HDD.store_file(backup)
 	if(href_list["PRG_printfile"])
 		. = 1
@@ -119,7 +119,7 @@
 		if(!computer.nano_printer)
 			error = "Missing Hardware: Your computer does not have required hardware to complete this operation."
 			return 1
-		if(!computer.nano_printer.print_text(parse_tags(F.stored_data)))
+		if(!computer.nano_printer.print_text(pencode2html(F.stored_data)))
 			error = "Hardware error: Printer was unable to print the file. It may be out of paper."
 			return 1
 	if(href_list["PRG_copytousb"])
@@ -147,44 +147,6 @@
 	if(.)
 		SSnanoui.update_uis(NM)
 
-/datum/computer_file/program/filemanager/proc/parse_tags(var/t)
-	t = replacetext(t, "\[center\]", "<center>")
-	t = replacetext(t, "\[/center\]", "</center>")
-	t = replacetext(t, "\[br\]", "<BR>")
-	t = replacetext(t, "\[b\]", "<B>")
-	t = replacetext(t, "\[/b\]", "</B>")
-	t = replacetext(t, "\[i\]", "<I>")
-	t = replacetext(t, "\[/i\]", "</I>")
-	t = replacetext(t, "\[u\]", "<U>")
-	t = replacetext(t, "\[/u\]", "</U>")
-	t = replacetext(t, "\[time\]", "[stationtime2text()]")
-	t = replacetext(t, "\[date\]", "[stationdate2text()]")
-	t = replacetext(t, "\[large\]", "<font size=\"4\">")
-	t = replacetext(t, "\[/large\]", "</font>")
-	t = replacetext(t, "\[h1\]", "<H1>")
-	t = replacetext(t, "\[/h1\]", "</H1>")
-	t = replacetext(t, "\[h2\]", "<H2>")
-	t = replacetext(t, "\[/h2\]", "</H2>")
-	t = replacetext(t, "\[h3\]", "<H3>")
-	t = replacetext(t, "\[/h3\]", "</H3>")
-	t = replacetext(t, "\[*\]", "<li>")
-	t = replacetext(t, "\[hr\]", "<HR>")
-	t = replacetext(t, "\[small\]", "<font size = \"1\">")
-	t = replacetext(t, "\[/small\]", "</font>")
-	t = replacetext(t, "\[list\]", "<ul>")
-	t = replacetext(t, "\[/list\]", "</ul>")
-	t = replacetext(t, "\[table\]", "<table border=1 cellspacing=0 cellpadding=3 style='border: 1px solid black;'>")
-	t = replacetext(t, "\[/table\]", "</td></tr></table>")
-	t = replacetext(t, "\[grid\]", "<table>")
-	t = replacetext(t, "\[/grid\]", "</td></tr></table>")
-	t = replacetext(t, "\[row\]", "</td><tr>")
-	t = replacetext(t, "\[tr\]", "</td><tr>")
-	t = replacetext(t, "\[td\]", "<td>")
-	t = replacetext(t, "\[cell\]", "<td>")
-	t = replacetext(t, "\[logo\]", "<img src = ntlogo.png>")
-	return t
-
-
 /datum/nano_module/program/computer_filemanager
 	name = "NTOS File Manager"
 
@@ -208,7 +170,7 @@
 			if(!istype(file))
 				data["error"] = "I/O ERROR: Unable to open file."
 			else
-				data["filedata"] = PRG.parse_tags(file.stored_data)
+				data["filedata"] = pencode2html(file.stored_data)
 				data["filename"] = "[file.filename].[file.filetype]"
 	else
 		if(!PRG.computer || !PRG.computer.hard_drive)

code/modules/modular_computers/file_system/programs/generic/news_browser.dm

@@ -3,7 +3,7 @@
 	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
+	size = 4
 	requires_ntnet = 1
 	available_on_ntnet = 1
 
@@ -13,6 +13,7 @@
 	var/download_netspeed = 0
 	var/downloading = 0
 	var/message = ""
+	var/show_archived = 0
 
 /datum/computer_file/program/newsbrowser/process_tick()
 	if(!downloading)
@@ -38,6 +39,7 @@
 	loaded_article = null
 	download_progress = 0
 	downloading = 0
+	show_archived = 0
 
 /datum/computer_file/program/newsbrowser/Topic(href, href_list)
 	if(..())
@@ -75,6 +77,9 @@
 		var/datum/computer_file/data/news_article/N = loaded_article.clone()
 		N.filename = savename
 		HDD.store_file(N)
+	if(href_list["PRG_toggle_archived"])
+		. = 1
+		show_archived = !show_archived
 	if(.)
 		SSnanoui.update_uis(NM)
 
@@ -95,6 +100,7 @@
 	data["message"] = PRG.message
 	if(PRG.loaded_article && !PRG.downloading) 	// Viewing an article.
 		data["title"] = PRG.loaded_article.filename
+		data["cover"] = PRG.loaded_article.cover
 		data["article"] = PRG.loaded_article.stored_data
 	else if(PRG.downloading)					// Downloading an article.
 		data["download_running"] = 1
@@ -104,16 +110,20 @@
 	else										// Viewing list of articles
 		var/list/all_articles[0]
 		for(var/datum/computer_file/data/news_article/F in ntnet_global.available_news)
+			if(!PRG.show_archived && F.archived)
+				continue
 			all_articles.Add(list(list(
 				"name" = F.filename,
 				"size" = F.size,
-				"uid" = F.uid
+				"uid" = F.uid,
+				"archived" = F.archived
 			)))
 		data["all_articles"] = all_articles
+		data["showing_archived"] = PRG.show_archived
 
 	ui = SSnanoui.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 = new(user, src, ui_key, "news_browser.tmpl", "NTNet/ExoNet News Browser", 575, 750, state = state)
 		ui.auto_update_layout = 1
 		ui.set_initial_data(data)
 		ui.open()

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

@@ -17,6 +17,14 @@
 	var/download_netspeed = 0
 	var/downloaderror = ""
 
+/datum/computer_file/program/ntnetdownload/kill_program()
+	..()
+	downloaded_file = null
+	download_completion = 0
+	download_netspeed = 0
+	downloaderror = ""
+	ui_header = "downloader_finished.gif"
+
 /datum/computer_file/program/ntnetdownload/proc/begin_file_download(var/filename)
 	if(downloaded_file)
 		return 0

code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm

@@ -28,7 +28,7 @@
 		if(!channel)
 			return 1
 		var/mob/living/user = usr
-		var/message = sanitize(input(user, "Enter message or leave blank to cancel: "))
+		var/message = sanitize(input(user, "Enter message or leave blank to cancel: "), 512)
 		if(!message || !channel)
 			return
 		channel.add_message(message, username)
@@ -65,7 +65,7 @@
 	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:"))
+		var/channel_title = sanitizeSafe(input(user,"Enter channel name or leave blank to cancel:"), 64)
 		if(!channel_title)
 			return
 		var/datum/ntnet_conversation/C = new/datum/ntnet_conversation()
@@ -95,7 +95,7 @@
 	if(href_list["PRG_changename"])
 		. = 1
 		var/mob/living/user = usr
-		var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:"))
+		var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:"), 20)
 		if(!newname)
 			return 1
 		if(channel)
@@ -132,7 +132,7 @@
 		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:"))
+		var/newname = sanitize(input(user, "Enter new channel name or leave blank to cancel:"), 64)
 		if(!newname || !channel)
 			return
 		channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.")

code/modules/modular_computers/file_system/programs/generic/nttransfer.dm

@@ -19,7 +19,6 @@ var/global/nttransfer_uid = 0
 	var/list/connected_clients = list()					// List of connected clients.
 	var/datum/computer_file/program/nttransfer/remote	// Client var, specifies who are we downloading from.
 	var/download_completion = 0							// Download progress in GQ
-	var/download_netspeed = 0							// Our connectivity speed in GQ/s
 	var/actual_netspeed = 0								// Displayed in the UI, this is the actual transfer speed.
 	var/unique_token 									// UID of this program
 	var/upload_menu = 0									// Whether we show the program list and upload menu
@@ -31,13 +30,12 @@ var/global/nttransfer_uid = 0
 
 /datum/computer_file/program/nttransfer/process_tick()
 	// Server mode
-	update_netspeed()
 	if(provided_file)
 		for(var/datum/computer_file/program/nttransfer/C in connected_clients)
 			// Transfer speed is limited by device which uses slower connectivity.
 			// We can have multiple clients downloading at same time, but let's assume we use some sort of multicast transfer
 			// so they can all run on same speed.
-			C.actual_netspeed = min(C.download_netspeed, download_netspeed)
+			C.actual_netspeed = min(C.ntnet_speed, ntnet_speed)
 			C.download_completion += C.actual_netspeed
 			if(C.download_completion >= provided_file.size)
 				C.finish_download()
@@ -55,18 +53,6 @@ var/global/nttransfer_uid = 0
 		downloaded_file = null
 	..(forced)
 
-
-
-/datum/computer_file/program/nttransfer/proc/update_netspeed()
-	download_netspeed = 0
-	switch(ntnet_status)
-		if(1)
-			download_netspeed = NTNETSPEED_LOWSIGNAL
-		if(2)
-			download_netspeed = NTNETSPEED_HIGHSIGNAL
-		if(3)
-			download_netspeed = NTNETSPEED_ETHERNET
-
 // Finishes download and attempts to store the file on HDD
 /datum/computer_file/program/nttransfer/proc/finish_download()
 	if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(downloaded_file))
@@ -125,6 +111,8 @@ var/global/nttransfer_uid = 0
 	else
 		var/list/all_servers[0]
 		for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers)
+			if(!P.provided_file)
+				continue
 			all_servers.Add(list(list(
 			"uid" = P.unique_token,
 			"filename" = "[P.provided_file.filename].[P.provided_file.filetype]",

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

@@ -0,0 +1,63 @@
+/datum/computer_file/program/suit_sensors
+	filename = "sensormonitor"
+	filedesc = "Suit Sensors Monitoring"
+	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
+	requires_ntnet = 1
+	network_destination = "crew lifesigns monitoring system"
+	size = 11
+
+/datum/nano_module/crew_monitor
+	name = "Crew monitor"
+
+/datum/nano_module/crew_monitor/Topic(href, href_list)
+	if(..()) return 1
+	var/turf/T = get_turf(nano_host())	// TODO: Allow setting any using_map.contact_levels from the interface.
+	if (!T || !(T.z in using_map.player_levels))
+		usr << "<span class='warning'>Unable to establish a connection</span>: You're too far away from the station!"
+		return 0
+	if(href_list["track"])
+		if(isAI(usr))
+			var/mob/living/silicon/ai/AI = usr
+			var/mob/living/carbon/human/H = locate(href_list["track"]) in mob_list
+			if(hassensorlevel(H, SUIT_SENSOR_TRACKING))
+				AI.ai_actual_track(H)
+		return 1
+
+/datum/nano_module/crew_monitor/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/turf/T = get_turf(nano_host())
+
+	data["isAI"] = isAI(user)
+	data["map_levels"] = using_map.get_map_levels(T.z, FALSE)
+	data["crewmembers"] = list()
+	for(var/z in (data["map_levels"] | T.z))  // Always show crew from the current Z even if we can't show a map
+		data["crewmembers"] += crew_repository.health_data(z)
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800, state = state)
+
+		// adding a template with the key "mapContent" enables the map ui functionality
+		ui.add_template("mapContent", "crew_monitor_map_content.tmpl")
+		// adding a template with the key "mapHeader" replaces the map header content
+		ui.add_template("mapHeader", "crew_monitor_map_header.tmpl")
+		if(!(ui.map_z_level in data["map_levels"]))
+			ui.set_map_z_level(data["map_levels"][1])
+
+		ui.set_initial_data(data)
+		ui.open()
+
+		// should make the UI auto-update; doesn't seem to?
+		ui.set_auto_update(1)
+
+/*/datum/nano_module/crew_monitor/proc/scan()
+	for(var/mob/living/carbon/human/H in mob_list)
+		if(istype(H.w_uniform, /obj/item/clothing/under))
+			var/obj/item/clothing/under/C = H.w_uniform
+			if (C.has_sensor)
+				tracked |= C
+	return 1
+*/

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

@@ -0,0 +1,142 @@
+/datum/computer_file/program/email_administration
+	filename = "emailadmin"
+	filedesc = "Email Administration Utility"
+	extended_desc = "This program may be used to administrate NTNet's emailing service."
+	program_icon_state = "comm_monitor"
+	size = 12
+	requires_ntnet = 1
+	available_on_ntnet = 1
+	nanomodule_path = /datum/nano_module/email_administration
+	required_access = access_network
+
+
+
+
+/datum/nano_module/email_administration/
+	name = "Email Client"
+	var/datum/computer_file/data/email_account/current_account = null
+	var/datum/computer_file/data/email_message/current_message = null
+	var/error = ""
+
+/datum/nano_module/email_administration/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()
+
+	if(error)
+		data["error"] = error
+	else if(istype(current_message))
+		data["msg_title"] = current_message.title
+		data["msg_body"] = pencode2html(current_message.stored_data)
+		data["msg_timestamp"] = current_message.timestamp
+		data["msg_source"] = current_message.source
+	else if(istype(current_account))
+		data["current_account"] = current_account.login
+		data["cur_suspended"] = current_account.suspended
+		var/list/all_messages = list()
+		for(var/datum/computer_file/data/email_message/message in (current_account.inbox | current_account.spam | current_account.deleted))
+			all_messages.Add(list(list(
+				"title" = message.title,
+				"source" = message.source,
+				"timestamp" = message.timestamp,
+				"uid" = message.uid
+			)))
+		data["messages"] = all_messages
+		data["messagecount"] = all_messages.len
+	else
+		var/list/all_accounts = list()
+		for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts)
+			if(!account.can_login)
+				continue
+			all_accounts.Add(list(list(
+				"login" = account.login,
+				"uid" = account.uid
+			)))
+		data["accounts"] = all_accounts
+		data["accountcount"] = all_accounts.len
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "email_administration.tmpl", "Email Administration Utility", 600, 450, state = state)
+		if(host.update_layout())
+			ui.auto_update_layout = 1
+		ui.set_auto_update(1)
+		ui.set_initial_data(data)
+		ui.open()
+
+
+/datum/nano_module/email_administration/Topic(href, href_list)
+	if(..())
+		return 1
+
+	var/mob/user = usr
+	if(!istype(user))
+		return 1
+
+	// High security - can only be operated when the user has an ID with access on them.
+	var/obj/item/weapon/card/id/I = user.GetIdCard()
+	if(!istype(I) || !(access_network in I.access))
+		return 1
+
+	if(href_list["back"])
+		if(error)
+			error = ""
+		else if(current_message)
+			current_message = null
+		else
+			current_account = null
+		return 1
+
+	if(href_list["ban"])
+		if(!current_account)
+			return 1
+
+		current_account.suspended = !current_account.suspended
+		ntnet_global.add_log_with_ids_check("EMAIL LOG: SA-EDIT Account [current_account.login] has been [current_account.suspended ? "" : "un" ]suspended by SA [I.registered_name] ([I.assignment]).")
+		error = "Account [current_account.login] has been [current_account.suspended ? "" : "un" ]suspended."
+		return 1
+
+	if(href_list["changepass"])
+		if(!current_account)
+			return 1
+
+		var/newpass = sanitize(input(user,"Enter new password for account [current_account.login]", "Password"), 100)
+		if(!newpass)
+			return 1
+		current_account.password = newpass
+		ntnet_global.add_log_with_ids_check("EMAIL LOG: SA-EDIT Password for account [current_account.login] has been changed by SA [I.registered_name] ([I.assignment]).")
+		return 1
+
+	if(href_list["viewmail"])
+		if(!current_account)
+			return 1
+
+		for(var/datum/computer_file/data/email_message/received_message in (current_account.inbox | current_account.spam | current_account.deleted))
+			if(received_message.uid == text2num(href_list["viewmail"]))
+				current_message = received_message
+				break
+		return 1
+
+	if(href_list["viewaccount"])
+		for(var/datum/computer_file/data/email_account/email_account in ntnet_global.email_accounts)
+			if(email_account.uid == text2num(href_list["viewaccount"]))
+				current_account = email_account
+				break
+		return 1
+
+	if(href_list["newaccount"])
+		var/newdomain = sanitize(input(user,"Pick domain:", "Domain name") as null|anything in using_map.usable_email_tlds)
+		if(!newdomain)
+			return 1
+		var/newlogin = sanitize(input(user,"Pick account name (@[newdomain]):", "Account name"), 100)
+		if(!newlogin)
+			return 1
+
+		var/complete_login = "[newlogin]@[newdomain]"
+		if(ntnet_global.does_email_exist(complete_login))
+			error = "Error creating account: An account with same address already exists."
+			return 1
+
+		var/datum/computer_file/data/email_account/new_account = new/datum/computer_file/data/email_account()
+		new_account.login = complete_login
+		new_account.password = GenerateKey()
+		error = "Email [new_account.login] has been created, with generated password [new_account.password]"
+		return 1

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

@@ -2,7 +2,7 @@
 	filename = "ntmonitor"
 	filedesc = "NTNet Diagnostics and Monitoring"
 	program_icon_state = "comm_monitor"
-	extended_desc = "This program monitors stationwide NTNet network, provides access to logging systems, and allows for configuration changes"
+	extended_desc = "This program monitors the local NTNet network, provides access to logging systems, and allows for configuration changes"
 	size = 12
 	requires_ntnet = 1
 	required_access = access_network

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

@@ -0,0 +1,141 @@
+var/warrant_uid = 0
+/datum/datacore/var/list/warrants[] = list()
+/datum/data/record/warrant
+	var/warrant_id
+
+/datum/data/record/warrant/New()
+	..()
+	warrant_id = warrant_uid++
+
+
+/datum/computer_file/program/digitalwarrant
+	filename = "digitalwarrant"
+	filedesc = "Warrant Assistant"
+	extended_desc = "Official NTsec program for creation and handling of warrants."
+	size = 8
+	program_icon_state = "warrant"
+	requires_ntnet = 1
+	available_on_ntnet = 1
+	required_access = access_security
+	usage_flags = PROGRAM_ALL
+	nanomodule_path = /datum/nano_module/program/digitalwarrant/
+
+/datum/nano_module/program/digitalwarrant/
+	name = "Warrant Assistant"
+	var/datum/data/record/warrant/activewarrant
+
+/datum/nano_module/program/digitalwarrant/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()
+
+	if(activewarrant)
+		data["warrantname"] = activewarrant.fields["namewarrant"]
+		data["warrantcharges"] = activewarrant.fields["charges"]
+		data["warrantauth"] = activewarrant.fields["auth"]
+		data["type"] = activewarrant.fields["arrestsearch"]
+	else
+		var/list/allwarrants = list()
+		for(var/datum/data/record/warrant/W in data_core.warrants)
+			allwarrants.Add(list(list(
+			"warrantname" = W.fields["namewarrant"],
+			"charges" = "[copytext(W.fields["charges"],1,min(length(W.fields["charges"]) + 1, 50))]...",
+			"auth" = W.fields["auth"],
+			"id" = W.warrant_id,
+			"arrestsearch" = W.fields["arrestsearch"]
+		)))
+		data["allwarrants"] = allwarrants
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "digitalwarrant.tmpl", name, 500, 350, state = state)
+		ui.auto_update_layout = 1
+		ui.set_initial_data(data)
+		ui.open()
+
+/datum/nano_module/program/digitalwarrant/Topic(href, href_list)
+	if(..())
+		return 1
+
+	if(href_list["sw_menu"])
+		activewarrant = null
+
+	if(href_list["editwarrant"])
+		. = 1
+		for(var/datum/data/record/warrant/W in data_core.warrants)
+			if(W.warrant_id == text2num(href_list["editwarrant"]))
+				activewarrant = W
+				break
+
+	// The following actions will only be possible if the user has an ID with security access equipped. This is in line with modular computer framework's authentication methods,
+	// which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet
+	// to someone who is to be arrested, which allows them to change the stuff there.
+
+	var/mob/user = usr
+	if(!istype(user))
+		return
+	var/obj/item/weapon/card/id/I = user.GetIdCard()
+	if(!istype(I) || !I.registered_name || !(access_security in I.access))
+		to_chat(user, "Authentication error: Unable to locate ID with apropriate access to allow this operation.")
+		return
+
+	if(href_list["addwarrant"])
+		. = 1
+		var/datum/data/record/warrant/W = new()
+		var/temp = sanitize(input(usr, "Do you want to create a search-, or an arrest warrant?") as null|anything in list("search","arrest"))
+		if(CanInteract(user, default_state))
+			if(temp == "arrest")
+				W.fields["namewarrant"] = "Unknown"
+				W.fields["charges"] = "No charges present"
+				W.fields["auth"] = "Unauthorized"
+				W.fields["arrestsearch"] = "arrest"
+			if(temp == "search")
+				W.fields["namewarrant"] = "No location given"
+				W.fields["charges"] = "No reason given"
+				W.fields["auth"] = "Unauthorized"
+				W.fields["arrestsearch"] = "search"
+			activewarrant = W
+
+	if(href_list["savewarrant"])
+		. = 1
+		data_core.warrants |= activewarrant
+		activewarrant = null
+
+	if(href_list["deletewarrant"])
+		. = 1
+		data_core.warrants -= activewarrant
+		activewarrant = null
+
+	if(href_list["editwarrantname"])
+		. = 1
+		var/namelist = list()
+		for(var/datum/data/record/t in data_core.general)
+			namelist += t.fields["name"]
+		var/new_name = sanitize(input(usr, "Please input name") as null|anything in namelist)
+		if(CanInteract(user, default_state))
+			if (!new_name)
+				return
+			activewarrant.fields["namewarrant"] = new_name
+
+	if(href_list["editwarrantnamecustom"])
+		. = 1
+		var/new_name = sanitize(input("Please input name") as null|text)
+		if(CanInteract(user, default_state))
+			if (!new_name)
+				return
+			activewarrant.fields["namewarrant"] = new_name
+
+	if(href_list["editwarrantcharges"])
+		. = 1
+		var/new_charges = sanitize(input("Please input charges", "Charges", activewarrant.fields["charges"]) as null|text)
+		if(CanInteract(user, default_state))
+			if (!new_charges)
+				return
+			activewarrant.fields["charges"] = new_charges
+
+	if(href_list["editwarrantauth"])
+		. = 1
+
+		activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
+
+	if(href_list["back"])
+		. = 1
+		activewarrant = null