Updates Part Four

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

@@ -0,0 +1,11 @@
+/obj/machinery/modular_computer/initial_data()
+	return cpu ? cpu.get_header_data() : ..()
+
+/obj/machinery/modular_computer/update_layout()
+	return TRUE
+
+/obj/item/modular_computer/update_layout()
+	return TRUE
+
+///datum/nano_module/program
+	//adheres_to_NT_standard = FALSE

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

@@ -7,7 +7,7 @@
 	requires_ntnet = 1
 	available_on_ntnet = 0
 	available_on_syndinet = 1
-	nanomodule_path = /datum/nano_module/computer_dos/
+	nanomodule_path = /datum/nano_module/program/computer_dos/
 	var/obj/machinery/ntnet_relay/target = null
 	var/dos_speed = 0
 	var/error = ""
@@ -36,10 +36,10 @@
 
 	..(forced)
 
-/datum/nano_module/computer_dos
+/datum/nano_module/program/computer_dos
 	name = "DoS Traffic Generator"
 
-/datum/nano_module/computer_dos/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+/datum/nano_module/program/computer_dos/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
 	if(!ntnet_global)
 		return
 	var/datum/computer_file/program/ntnet_dos/PRG = program
@@ -87,14 +87,14 @@
 		for(var/obj/machinery/ntnet_relay/R in ntnet_global.relays)
 			if("[R.uid]" == href_list["PRG_target_relay"])
 				target = R
-		return
+		return 1
 	if(href_list["PRG_reset"])
 		if(target)
 			target.dos_sources.Remove(src)
 			target = null
 		executed = 0
 		error = ""
-		return
+		return 1
 	if(href_list["PRG_execute"])
 		if(target)
 			executed = 1
@@ -102,4 +102,4 @@
 			if(ntnet_global.intrusion_detection_enabled)
 				ntnet_global.add_log("IDS WARNING - Excess traffic flood targeting relay [target.uid] detected from device: [computer.network_card.get_network_tag()]")
 				ntnet_global.intrusion_detection_alarm = 1
-		return
+		return 1

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

@@ -7,7 +7,7 @@
 	requires_ntnet = 0
 	available_on_ntnet = 0
 	available_on_syndinet = 1
-	nanomodule_path = /datum/nano_module/revelation/
+	nanomodule_path = /datum/nano_module/program/revelation/
 	var/armed = 0
 
 /datum/computer_file/program/revelation/run_program(var/mob/living/user)
@@ -49,16 +49,17 @@
 		if(!newname)
 			return
 		filedesc = newname
+	return 1
 
 /datum/computer_file/program/revelation/clone()
 	var/datum/computer_file/program/revelation/temp = ..()
 	temp.armed = armed
 	return temp
 
-/datum/nano_module/revelation
+/datum/nano_module/program/revelation
 	name = "Revelation Virus"
 
-/datum/nano_module/revelation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+/datum/nano_module/program/revelation/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 = list()
 	var/datum/computer_file/program/revelation/PRG = program
 	if(!istype(PRG))
@@ -75,3 +76,4 @@
 		ui.set_initial_data(data)
 		ui.open()
 		ui.set_auto_update(1)
+

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

@@ -1,23 +1,21 @@
 /datum/computer_file/program/card_mod
 	filename = "cardmod"
 	filedesc = "ID card modification program"
-	nanomodule_path = /datum/nano_module/card_mod
+	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_hop
 	requires_ntnet = 0
 	size = 8
 
-/datum/nano_module/card_mod
+/datum/nano_module/program/card_mod
 	name = "ID card modification program"
 	var/mod_mode = 1
 	var/is_centcom = 0
 	var/show_assignments = 0
 
-/datum/nano_module/card_mod/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 = list()
-	if(program)
-		data = program.get_header_data()
+/datum/nano_module/program/card_mod/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()
 
 	data["src"] = "\ref[src]"
 	data["station_name"] = station_name()
@@ -84,13 +82,12 @@
 
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
-		ui = new(user, src, ui_key, "identification_computer_lap.tmpl", name, 600, 700, state = state)
+		ui = new(user, src, ui_key, "mod_identification_computer.tmpl", name, 600, 700, state = state)
 		ui.auto_update_layout = 1
 		ui.set_initial_data(data)
 		ui.open()
-		ui.set_auto_update(0)
 
-/datum/nano_module/card_mod/proc/format_jobs(list/jobs)
+/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/list/formatted = list()
 	for(var/job in jobs)
@@ -101,16 +98,18 @@
 
 	return formatted
 
-/datum/nano_module/card_mod/proc/get_accesses(var/is_centcom = 0)
-
+/datum/nano_module/program/card_mod/proc/get_accesses(var/is_centcom = 0)
 	return null
 
 
 /datum/computer_file/program/card_mod/Topic(href, href_list)
-	var/mob/living/user = usr
+	if(..())
+		return 1
+
+	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/datum/nano_module/card_mod/module = NM
+	var/datum/nano_module/program/card_mod/module = NM
 	switch(href_list["action"])
 		if("switchm")
 			if(href_list["target"] == "mod")
@@ -135,14 +134,17 @@
 									<u>Blood Type:</u> [id_card.blood_type]<br><br>
 									<u>Access:</u><br>
 								"}
+
+						var/known_access_rights = get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)
 						for(var/A in id_card.access)
-							contents += "  [get_access_desc(A)]"
+							if(A in known_access_rights)
+								contents += "  [get_access_desc(A)]"
 
 						if(!computer.nano_printer.print_text(contents,"access report"))
 							usr << "<span class='notice'>Hardware error: Printer was unable to print the file. It may be out of paper.</span>"
 							return
 						else
-							computer.visible_message("<span class='notice'>[computer] prints out paper.</span>")
+							computer.visible_message("<span class='notice'>\The [computer] prints out paper.</span>")
 				else
 					var/contents = {"<h4>Crew Manifest</h4>
 									<br>
@@ -152,14 +154,16 @@
 						usr << "<span class='notice'>Hardware error: Printer was unable to print the file. It may be out of paper.</span>"
 						return
 					else
-						computer.visible_message("<span class='notice'>[computer] prints out paper.</span>")
+						computer.visible_message("<span class='notice'>\The [computer] prints out paper.</span>")
 		if("eject")
 			if(computer && computer.card_slot)
+				if(id_card)
+					data_core.manifest_modify(id_card.registered_name, id_card.assignment)
 				computer.proc_eject_id(user)
 		if("terminate")
 			if(computer && can_run(user, 1))
 				id_card.assignment = "Terminated"
-				id_card.access = list()
+				remove_nt_access(id_card)
 				callHook("terminate_employee", list(id_card))
 		if("edit")
 			if(computer && can_run(user, 1))
@@ -197,7 +201,8 @@
 
 						access = jobdatum.get_access()
 
-					id_card.access = access
+					remove_nt_access(id_card)
+					apply_access(id_card, access)
 					id_card.assignment = t1
 					id_card.rank = t1
 
@@ -206,7 +211,7 @@
 			if(href_list["allowed"] && computer && can_run(user, 1))
 				var/access_type = text2num(href_list["access_target"])
 				var/access_allowed = text2num(href_list["allowed"])
-				if(access_type in (get_all_centcom_access() + get_all_station_access()))
+				if(access_type in get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM))
 					id_card.access -= access_type
 					if(!access_allowed)
 						id_card.access += access_type
@@ -214,5 +219,10 @@
 		id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])")
 
 	SSnanoui.update_uis(NM)
-	..(href, href_list)
-	return 1
+	return 1
+
+/datum/computer_file/program/card_mod/proc/remove_nt_access(var/obj/item/weapon/card/id/id_card)
+	id_card.access -= get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)
+
+/datum/computer_file/program/card_mod/proc/apply_access(var/obj/item/weapon/card/id/id_card, var/list/accesses)
+	id_card.access |= accesses

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

@@ -0,0 +1,310 @@
+#define STATE_DEFAULT	1
+#define STATE_MESSAGELIST	2
+#define STATE_VIEWMESSAGE	3
+#define STATE_STATUSDISPLAY	4
+#define STATE_ALERT_LEVEL	5
+/datum/computer_file/program/comm
+	filename = "comm"
+	filedesc = "Command and communications program."
+	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
+	requires_ntnet = 1
+	size = 12
+	usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
+	network_destination = "station long-range communication array"
+	var/datum/comm_message_listener/message_core = new
+
+/datum/computer_file/program/comm/clone()
+	var/datum/computer_file/program/comm/temp = ..()
+	temp.message_core.messages = null
+	temp.message_core.messages = message_core.messages.Copy()
+	return temp
+
+/datum/nano_module/program/comm
+	name = "Command and communications program"
+	var/current_status = STATE_DEFAULT
+	var/msg_line1 = ""
+	var/msg_line2 = ""
+	var/centcomm_message_cooldown = 0
+	var/announcment_cooldown = 0
+	var/datum/announcement/priority/crew_announcement = new
+	var/current_viewing_message_id = 0
+	var/current_viewing_message = null
+
+/datum/nano_module/program/comm/New()
+	..()
+	crew_announcement.newscast = 1
+
+/datum/nano_module/program/comm/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(program)
+		data["emagged"] = program.computer_emagged
+		data["net_comms"] = !!program.get_signal(NTNET_COMMUNICATION) //Double !! is needed to get 1 or 0 answer
+		data["net_syscont"] = !!program.get_signal(NTNET_SYSTEMCONTROL)
+		if(program.computer)
+			data["have_printer"] = !!program.computer.nano_printer
+		else
+			data["have_printer"] = 0
+	else
+		data["emagged"] = 0
+		data["net_comms"] = 1
+		data["net_syscont"] = 1
+		data["have_printer"] = 0
+
+	data["message_line1"] = msg_line1
+	data["message_line2"] = msg_line2
+	data["state"] = current_status
+	data["isAI"] = issilicon(usr)
+	data["authenticated"] = is_autenthicated(user)
+	data["current_security_level"] = security_level
+	data["current_security_level_title"] = num2seclevel(security_level)
+
+	data["def_SEC_LEVEL_DELTA"] = SEC_LEVEL_DELTA
+	data["def_SEC_LEVEL_BLUE"] = SEC_LEVEL_BLUE
+	data["def_SEC_LEVEL_GREEN"] = SEC_LEVEL_GREEN
+
+	var/datum/comm_message_listener/l = obtain_message_listener()
+	data["messages"] = l.messages
+	data["message_deletion_allowed"] = l != global_message_listener
+	data["message_current_id"] = current_viewing_message_id
+	if(current_viewing_message)
+		data["message_current"] = current_viewing_message
+
+	if(emergency_shuttle.location())
+		data["have_shuttle"] = 1
+		if(emergency_shuttle.online())
+			data["have_shuttle_called"] = 1
+		else
+			data["have_shuttle_called"] = 0
+	else
+		data["have_shuttle"] = 0
+
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "mod_communication.tmpl", name, 550, 420, state = state)
+		ui.auto_update_layout = 1
+		ui.set_initial_data(data)
+		ui.open()
+
+/datum/nano_module/program/comm/proc/is_autenthicated(var/mob/user)
+	if(program)
+		return program.can_run(user)
+	return 1
+
+/datum/nano_module/program/comm/proc/obtain_message_listener()
+	if(program)
+		var/datum/computer_file/program/comm/P = program
+		return P.message_core
+	return global_message_listener
+
+/datum/nano_module/program/comm/Topic(href, href_list)
+	if(..())
+		return 1
+	var/mob/user = usr
+	var/ntn_comm = !!program.get_signal(NTNET_COMMUNICATION)
+	var/ntn_cont = !!program.get_signal(NTNET_SYSTEMCONTROL)
+	var/datum/comm_message_listener/l = obtain_message_listener()
+	switch(href_list["action"])
+		if("sw_menu")
+			current_status = text2num(href_list["target"])
+		if("announce")
+			if(is_autenthicated(user) && !issilicon(usr) && ntn_comm)
+				if(user)
+					var/obj/item/weapon/card/id/id_card = user.GetIdCard()
+					crew_announcement.announcer = GetNameAndAssignmentFromId(id_card)
+				else
+					crew_announcement.announcer = "Unknown"
+				if(announcment_cooldown)
+					usr << "Please allow at least one minute to pass between announcements"
+					SSnanoui.update_uis(src)
+					return
+				var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|text
+				if(!input || !can_still_topic())
+					SSnanoui.update_uis(src)
+					return
+				crew_announcement.Announce(input)
+				announcment_cooldown = 1
+				spawn(600)//One minute cooldown
+					announcment_cooldown = 0
+		if("message")
+			if(href_list["target"] == "emagged")
+				if(program)
+					if(is_autenthicated(user) && program.computer_emagged && !issilicon(usr) && ntn_comm)
+						if(centcomm_message_cooldown)
+							usr << "<span class='warning'>Arrays recycling. Please stand by.</span>"
+							SSnanoui.update_uis(src)
+							return
+						var/input = sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") as null|text)
+						if(!input || !can_still_topic())
+							SSnanoui.update_uis(src)
+							return
+						Syndicate_announce(input, usr)
+						usr << "<span class='notice'>Message transmitted.</span>"
+						log_say("[key_name(usr)] has made an illegal announcement: [input]")
+						centcomm_message_cooldown = 1
+						spawn(300)//30 second cooldown
+							centcomm_message_cooldown = 0
+			else if(href_list["target"] == "regular")
+				if(is_autenthicated(user) && !issilicon(usr) && ntn_comm)
+					if(centcomm_message_cooldown)
+						usr << "<span class='warning'>Arrays recycling. Please stand by.</span>"
+						SSnanoui.update_uis(src)
+						return
+					if(!is_relay_online())//Contact Centcom has a check, Syndie doesn't to allow for Traitor funs.
+						usr <<"<span class='warning'>No Emergency Bluespace Relay detected. Unable to transmit message.</span>"
+						SSnanoui.update_uis(src)
+						return
+					var/input = sanitize(input("Please choose a message to transmit to Centcomm via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") as null|text)
+					if(!input || !can_still_topic())
+						SSnanoui.update_uis(src)
+						return
+					CentCom_announce(input, usr)
+					usr << "<span class='notice'>Message transmitted.</span>"
+					log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]")
+					centcomm_message_cooldown = 1
+					spawn(300) //30 second cooldown
+						centcomm_message_cooldown = 0
+		if("shuttle")
+			if(is_autenthicated(user) && ntn_cont)
+				if(href_list["target"] == "call")
+					var/confirm = alert("Are you sure you want to call the shuttle?", name, "No", "Yes")
+					if(confirm == "Yes" && can_still_topic())
+						call_shuttle_proc(usr)
+				if(href_list["target"] == "cancel" && !issilicon(usr))
+					var/confirm = alert("Are you sure you want to cancel the shuttle?", name, "No", "Yes")
+					if(confirm == "Yes" && can_still_topic())
+						cancel_call_proc(usr)
+		if("setstatus")
+			if(is_autenthicated(user) && ntn_cont)
+				switch(href_list["target"])
+					if("line1")
+						var/linput = reject_bad_text(sanitize(input("Line 1", "Enter Message Text", msg_line1) as text|null, 40), 40)
+						if(can_still_topic())
+							msg_line1 = linput
+					if("line2")
+						var/linput = reject_bad_text(sanitize(input("Line 2", "Enter Message Text", msg_line2) as text|null, 40), 40)
+						if(can_still_topic())
+							msg_line2 = linput
+					if("message")
+						post_status("message", msg_line1, msg_line2)
+					if("alert")
+						post_status("alert", href_list["alert"])
+					else
+						post_status(href_list["target"])
+
+		if("setalert")
+			if(is_autenthicated(user) && !issilicon(usr) && ntn_cont && ntn_comm)
+				var/current_level = text2num(href_list["target"])
+				var/confirm = alert("Are you sure you want to change alert level to [num2seclevel(current_level)]?", name, "No", "Yes")
+				if(confirm == "Yes" && can_still_topic())
+					var/old_level = security_level
+					if(!current_level) current_level = SEC_LEVEL_GREEN
+					if(current_level < SEC_LEVEL_GREEN) current_level = SEC_LEVEL_GREEN
+					if(current_level > SEC_LEVEL_BLUE) current_level = SEC_LEVEL_BLUE //Cannot engage delta with this
+					set_security_level(current_level)
+					if(security_level != old_level)
+						log_game("[key_name(usr)] has changed the security level to [get_security_level()].")
+						message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
+						switch(security_level)
+							if(SEC_LEVEL_GREEN)
+								feedback_inc("alert_comms_green",1)
+							if(SEC_LEVEL_BLUE)
+								feedback_inc("alert_comms_blue",1)
+			else
+				usr << "You press button, but red light flashes and nothing happens." //This should never happen
+			current_status = STATE_DEFAULT
+		if("viewmessage")
+			if(is_autenthicated(user) && ntn_comm)
+				current_viewing_message_id = text2num(href_list["target"])
+				for(var/list/m in l.messages)
+					if(m["id"] == current_viewing_message_id)
+						current_viewing_message = m
+				current_status = STATE_VIEWMESSAGE
+		if("delmessage")
+			if(is_autenthicated(user) && ntn_comm && l != global_message_listener)
+				l.Remove(current_viewing_message)
+			current_status = STATE_MESSAGELIST
+		if("printmessage")
+			if(is_autenthicated(user) && ntn_comm)
+				if(program && program.computer && program.computer.nano_printer)
+					if(!program.computer.nano_printer.print_text(current_viewing_message["contents"],current_viewing_message["title"]))
+						usr << "<span class='notice'>Hardware error: Printer was unable to print the file. It may be out of paper.</span>"
+					else
+						program.computer.visible_message("<span class='notice'>\The [program.computer] prints out paper.</span>")
+
+	SSnanoui.update_uis(src)
+
+/datum/nano_module/program/comm/proc/post_status(var/command, var/data1, var/data2)
+
+	var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
+
+	if(!frequency) return
+
+
+	var/datum/signal/status_signal = new
+	status_signal.source = src
+	status_signal.transmission_method = 1
+	status_signal.data["command"] = command
+
+	switch(command)
+		if("message")
+			status_signal.data["msg1"] = data1
+			status_signal.data["msg2"] = data2
+			log_admin("STATUS: [key_name(usr)] set status screen message with [src]: [data1] [data2]")
+		if("alert")
+			status_signal.data["picture_state"] = data1
+
+	frequency.post_signal(src, status_signal)
+
+#undef STATE_DEFAULT
+#undef STATE_MESSAGELIST
+#undef STATE_VIEWMESSAGE
+#undef STATE_STATUSDISPLAY
+#undef STATE_ALERT_LEVEL
+
+/*
+General message handling stuff
+*/
+var/list/comm_message_listeners = list() //We first have to initialize list then we can use it.
+var/datum/comm_message_listener/global_message_listener = new //May be used by admins
+var/last_message_id = 0
+
+proc/get_comm_message_id()
+	last_message_id = last_message_id + 1
+	return last_message_id
+
+proc/post_comm_message(var/message_title, var/message_text)
+	var/list/message = list()
+	message["id"] = get_comm_message_id()
+	message["title"] = message_title
+	message["contents"] = message_text
+
+	for (var/datum/comm_message_listener/l in comm_message_listeners)
+		l.Add(message)
+
+	//Old console support
+	for (var/obj/machinery/computer/communications/comm in machines)
+		if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept)
+			var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc )
+			intercept.name = message_title
+			intercept.info = message_text
+
+			comm.messagetitle.Add(message_title)
+			comm.messagetext.Add(message_text)
+
+/datum/comm_message_listener
+	var/list/messages
+
+/datum/comm_message_listener/New()
+	..()
+	messages = list()
+	comm_message_listeners.Add(src)
+
+/datum/comm_message_listener/proc/Add(var/list/message)
+	messages[++messages.len] = message
+
+/datum/comm_message_listener/proc/Remove(var/list/message)
+	messages -= list(message)

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

@@ -12,16 +12,15 @@
 	size = 4
 	available_on_ntnet = 0
 	requires_ntnet = 0
-	nanomodule_path = /datum/nano_module/computer_configurator/
+	nanomodule_path = /datum/nano_module/program/computer_configurator/
 
-/datum/nano_module/computer_configurator
+/datum/nano_module/program/computer_configurator
 	name = "NTOS Computer Configuration Tool"
 	var/obj/item/modular_computer/movable = null
 
-/datum/nano_module/computer_configurator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+/datum/nano_module/program/computer_configurator/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)
 		movable = program.computer
-
 	if(!istype(movable))
 		movable = null
 
@@ -60,5 +59,4 @@
 		ui = new(user, src, ui_key, "laptop_configuration.tmpl", "NTOS Configuration Utility", 575, 700, state = state)
 		ui.auto_update_layout = 1
 		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(0)
+		ui.open()

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

@@ -7,71 +7,82 @@
 	requires_ntnet = 0
 	available_on_ntnet = 0
 	undeletable = 1
-	nanomodule_path = /datum/nano_module/computer_filemanager/
+	nanomodule_path = /datum/nano_module/program/computer_filemanager/
 	var/open_file
 	var/error
 
 /datum/computer_file/program/filemanager/Topic(href, href_list)
+	if(..())
+		return 1
+
 	if(href_list["PRG_openfile"])
+		. = 1
 		open_file = href_list["PRG_openfile"]
 	if(href_list["PRG_newtextfile"])
+		. = 1
 		var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename"))
 		if(!newname)
-			return
+			return 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		if(!HDD)
-			return
+			return 1
 		var/datum/computer_file/data/F = new/datum/computer_file/data()
 		F.filename = newname
 		F.filetype = "TXT"
 		HDD.store_file(F)
 	if(href_list["PRG_deletefile"])
+		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		if(!HDD)
-			return
+			return 1
 		var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_deletefile"])
 		if(!file || file.undeletable)
-			return
+			return 1
 		HDD.remove_file(file)
 	if(href_list["PRG_usbdeletefile"])
+		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive
 		if(!RHDD)
-			return
+			return 1
 		var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_usbdeletefile"])
 		if(!file || file.undeletable)
-			return
+			return 1
 		RHDD.remove_file(file)
 	if(href_list["PRG_closefile"])
+		. = 1
 		open_file = null
 		error = null
 	if(href_list["PRG_clone"])
+		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		if(!HDD)
-			return
+			return 1
 		var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_clone"])
 		if(!F || !istype(F))
-			return
+			return 1
 		var/datum/computer_file/C = F.clone(1)
 		HDD.store_file(C)
 	if(href_list["PRG_rename"])
+		. = 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		if(!HDD)
-			return
+			return 1
 		var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_rename"])
 		if(!file || !istype(file))
-			return
+			return 1
 		var/newname = sanitize(input(usr, "Enter new file name:", "File rename", file.filename))
 		if(file && newname)
 			file.filename = newname
 	if(href_list["PRG_edit"])
+		. = 1
 		if(!open_file)
-			return
+			return 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		if(!HDD)
-			return
+			return 1
 		var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
 		if(!F || !istype(F))
-			return
+			return 1
 		// 16384 is the limit for file length in characters. Currently, papers have value of 2048 so this is 8 times as long, since we can't edit parts of the file independently.
 		var/newtext = sanitize(html_decode(input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", F.stored_data) as message), 16384)
 		if(F)
@@ -86,41 +97,45 @@
 				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>"
 				HDD.store_file(backup)
 	if(href_list["PRG_printfile"])
+		. = 1
 		if(!open_file)
-			return
+			return 1
 		var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
 		if(!HDD)
-			return
+			return 1
 		var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
 		if(!F || !istype(F))
-			return
+			return 1
 		if(!computer.nano_printer)
 			error = "Missing Hardware: Your computer does not have required hardware to complete this operation."
-			return
+			return 1
 		if(!computer.nano_printer.print_text(parse_tags(F.stored_data)))
 			error = "Hardware error: Printer was unable to print the file. It may be out of paper."
-			return
+			return 1
 	if(href_list["PRG_copytousb"])
+		. = 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)
-			return
+			return 1
 		var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_copytousb"])
 		if(!F || !istype(F))
-			return
+			return 1
 		var/datum/computer_file/C = F.clone(0)
 		RHDD.store_file(C)
 	if(href_list["PRG_copyfromusb"])
+		. = 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)
-			return
+			return 1
 		var/datum/computer_file/F = RHDD.find_file_by_name(href_list["PRG_copyfromusb"])
 		if(!F || !istype(F))
-			return
+			return 1
 		var/datum/computer_file/C = F.clone(0)
 		HDD.store_file(C)
-	..(href, href_list)
+	if(.)
+		SSnanoui.update_uis(NM)
 
 /datum/computer_file/program/filemanager/proc/parse_tags(var/t)
 	t = replacetext(t, "\[center\]", "<center>")
@@ -160,18 +175,13 @@
 	return t
 
 
-/datum/nano_module/computer_filemanager
+/datum/nano_module/program/computer_filemanager
 	name = "NTOS File Manager"
 
-/datum/nano_module/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)
-
+/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
-	var/list/data = list()
-	if(program)
-		data = program.get_header_data()
-		PRG = program
-	else
-		return
+	PRG = program
 
 	var/obj/item/weapon/computer_hardware/hard_drive/HDD
 	var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD
@@ -223,5 +233,5 @@
 		ui.auto_update_layout = 1
 		ui.set_initial_data(data)
 		ui.open()
-		ui.set_auto_update(0)
+
 

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

@@ -9,7 +9,7 @@
 	requires_ntnet = 1
 	requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD
 	available_on_ntnet = 0
-	nanomodule_path = /datum/nano_module/computer_ntnetdownload/
+	nanomodule_path = /datum/nano_module/program/computer_ntnetdownload/
 	ui_header = "downloader_finished.gif"
 	var/datum/computer_file/program/downloaded_file = null
 	var/hacked_download = 0
@@ -89,22 +89,21 @@
 	if(href_list["PRG_downloadfile"])
 		if(!downloaded_file)
 			begin_file_download(href_list["PRG_downloadfile"])
-		return
+		return 1
 	if(href_list["PRG_reseterror"])
 		if(downloaderror)
 			download_completion = 0
 			download_netspeed = 0
 			downloaded_file = null
 			downloaderror = ""
-		return
+		return 1
 	return 0
 
-
-/datum/nano_module/computer_ntnetdownload
+/datum/nano_module/program/computer_ntnetdownload
 	name = "Network Downloader"
 	var/obj/item/modular_computer/my_computer = null
 
-/datum/nano_module/computer_ntnetdownload/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+/datum/nano_module/program/computer_ntnetdownload/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)
 		my_computer = program.computer
 
@@ -162,4 +161,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/ntmonitor.dm

@@ -15,11 +15,7 @@
 /datum/nano_module/computer_ntnetmonitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
 	if(!ntnet_global)
 		return
-
-	var/list/data = list()
-	if(program)
-		data = program.get_header_data()
-
+	var/list/data = host.initial_data()
 
 	data["ntnetstatus"] = ntnet_global.check_function()
 	data["ntnetrelays"] = ntnet_global.relays.len
@@ -38,7 +34,8 @@
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
 		ui = new(user, src, ui_key, "ntnet_monitor.tmpl", "NTNet Diagnostics and Monitoring Tool", 575, 700, state = state)
-		ui.auto_update_layout = 1
+		if(host.update_layout())
+			ui.auto_update_layout = 1
 		ui.set_initial_data(data)
 		ui.open()
 		ui.set_auto_update(1)
@@ -47,14 +44,17 @@
 	if(..())
 		return 1
 	if(href_list["resetIDS"])
+		. = 1
 		if(ntnet_global)
 			ntnet_global.resetIDS()
 		return 1
 	if(href_list["toggleIDS"])
+		. = 1
 		if(ntnet_global)
 			ntnet_global.toggleIDS()
 		return 1
 	if(href_list["toggleWireless"])
+		. = 1
 		if(!ntnet_global)
 			return 1
 
@@ -66,20 +66,23 @@
 		// NTNet is enabled and user is about to shut it down. Let's ask them if they really want to do it, as wirelessly connected computers won't connect without NTNet being enabled (which may prevent people from turning it back on)
 		var/mob/user = usr
 		if(!user)
-			return
+			return 1
 		var/response = alert(user, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No")
 		if(response == "Yes")
 			ntnet_global.setting_disabled = 1
 		return 1
 	if(href_list["purgelogs"])
+		. = 1
 		if(ntnet_global)
 			ntnet_global.purge_logs()
 	if(href_list["updatemaxlogs"])
+		. = 1
 		var/mob/user = usr
 		var/logcount = text2num(input(user,"Enter amount of logs to keep in memory ([MIN_NTNET_LOGS]-[MAX_NTNET_LOGS]):"))
 		if(ntnet_global)
 			ntnet_global.update_max_log_count(logcount)
 	if(href_list["toggle_function"])
+		. = 1
 		if(!ntnet_global)
-			return
-		ntnet_global.toggle_function(href_list["toggle_function"])
+			return 1
+		ntnet_global.toggle_function(href_list["toggle_function"])

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

@@ -9,7 +9,7 @@
 	network_destination = "NTNRC server"
 	ui_header = "ntnrc_idle.gif"
 	available_on_ntnet = 1
-	nanomodule_path = /datum/nano_module/computer_chatclient/
+	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
@@ -20,9 +20,13 @@
 	username = "DefaultUser[rand(100, 999)]"
 
 /datum/computer_file/program/chatclient/Topic(href, href_list)
+	if(..())
+		return 1
+
 	if(href_list["PRG_speak"])
+		. = 1
 		if(!channel)
-			return
+			return 1
 		var/mob/living/user = usr
 		var/message = sanitize(input(user, "Enter message or leave blank to cancel: "))
 		if(!message || !channel)
@@ -30,6 +34,7 @@
 		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"]))
@@ -37,11 +42,11 @@
 				break
 
 		if(!C)
-			return
+			return 1
 
 		if(netadmin_mode)
 			channel = C		// Bypasses normal leave/join and passwords. Technically makes the user invisible to others.
-			return
+			return 1
 
 		if(C.password)
 			var/mob/living/user = usr
@@ -49,14 +54,16 @@
 			if(C && (password == C.password))
 				C.add_client(src)
 				channel = C
-			return
+			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)
@@ -67,12 +74,13 @@
 		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
+			return 1
 		var/mob/living/user = usr
 		if(can_run(usr, 1, access_network))
 			if(channel)
@@ -85,21 +93,23 @@
 					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
+			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
+			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
@@ -112,14 +122,15 @@
 			if(!computer)
 				// This program shouldn't even be runnable without computer.
 				CRASH("Var computer is null!")
-				return
+				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
+			return 1
 		var/mob/living/user = usr
 		var/newname = sanitize(input(user, "Enter new channel name or leave blank to cancel:"))
 		if(!newname || !channel)
@@ -127,24 +138,25 @@
 		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))
-			del(channel)
+			qdel(channel)
+			channel = null
 	if(href_list["PRG_setpassword"])
+		. = 1
 		if(!channel || ((channel.operator != src) && !netadmin_mode))
-			return
+			return 1
 
 		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
+			return 1
 
 		if(newpassword == "nopassword")
 			channel.password = ""
 		else
 			channel.password = newpassword
 
-	..(href, href_list)
-
 /datum/computer_file/program/chatclient/process_tick()
 	..()
 	if(program_state != PROGRAM_STATE_KILLED)
@@ -166,10 +178,10 @@
 		channel = null
 	..(forced)
 
-/datum/nano_module/computer_chatclient
+/datum/nano_module/program/computer_chatclient
 	name = "NTNet Relay Chat Client"
 
-/datum/nano_module/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)
+/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)
 	if(!ntnet_global || !ntnet_global.chat_channels)
 		return
 
@@ -215,4 +227,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/nttransfer.dm

@@ -10,7 +10,7 @@ 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/computer_nttransfer/
+	nanomodule_path = /datum/nano_module/program/computer_nttransfer/
 
 	var/error = ""										// Error screen
 	var/server_password = ""							// Optional password to download the file.
@@ -87,13 +87,10 @@ var/global/nttransfer_uid = 0
 	download_completion = 0
 
 
-
-
-
-/datum/nano_module/computer_nttransfer
+/datum/nano_module/program/computer_nttransfer
 	name = "NTNet P2P Transfer Client"
 
-/datum/nano_module/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)
+/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
@@ -161,7 +158,7 @@ var/global/nttransfer_uid = 0
 				return
 		downloaded_file = remote.provided_file.clone()
 		remote.connected_clients.Add(src)
-		return
+		return 1
 	if(href_list["PRG_reset"])
 		error = ""
 		upload_menu = 0
@@ -171,7 +168,7 @@ var/global/nttransfer_uid = 0
 		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
+		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)
@@ -180,7 +177,7 @@ var/global/nttransfer_uid = 0
 			server_password = ""
 			return
 		server_password = pass
-		return
+		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"])
@@ -191,7 +188,7 @@ var/global/nttransfer_uid = 0
 				ntnet_global.fileservers.Add(src)
 				return
 		error = "I/O Error: Unable to locate file on hard drive."
-		return
+		return 1
 	if(href_list["PRG_uploadmenu"])
 		upload_menu = 1
-	return 0
+	return 0