Modular computers now use list of components (#20557)

* Bringing computers to the light side

Bringing computers to the light side

* Lighter and lighter

Lighter and lighter

* Missed some lists

Missed some lists

* Text to defines

Text to defines

* Last commit

Last commit

* How did this even get here

How did this even get here

* Removing bad stuff

Removing bad stuff

* Fixes verb adding and idle check

Fixes verb adding and idle check

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

@@ -69,7 +69,8 @@
 				executed = 1
 				target.dos_sources.Add(src)
 				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()]")
+					var/obj/item/weapon/computer_hardware/network_card/network_card = computer.all_components[MC_NET]
+					ntnet_global.add_log("IDS WARNING - Excess traffic flood targeting relay [target.uid] detected from device: [network_card.get_network_tag()]")
 					ntnet_global.intrusion_detection_alarm = 1
 			return 1
 

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

@@ -19,16 +19,19 @@
 		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()
-		qdel(computer.hard_drive)
+		var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+		var/obj/item/weapon/computer_hardware/battery/battery_module = computer.all_components[MC_CELL]
+		var/obj/item/weapon/computer_hardware/recharger/recharger = computer.all_components[MC_CHARGE]
+		qdel(hard_drive)
 		computer.take_damage(25, 10, 1, 1)
-		if(computer.battery_module && prob(25))
-			qdel(computer.battery_module)
+		if(battery_module && prob(25))
+			qdel(battery_module)
 			computer.visible_message("<span class='notice'>\The [computer]'s battery explodes in rain of sparks.</span>")
 			var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
 			spark_system.start()
 
-		if(computer.recharger && prob(50))
-			qdel(computer.recharger)
+		if(recharger && prob(50))
+			qdel(recharger)
 			computer.visible_message("<span class='notice'>\The [computer]'s recharger explodes in rain of sparks.</span>")
 			var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
 			spark_system.start()

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

@@ -88,7 +88,8 @@
 
 
 /datum/computer_file/program/card_mod/proc/format_jobs(list/jobs)
-	var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
+	var/obj/item/weapon/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
+	var/obj/item/weapon/card/id/id_card = card_slot.stored_card
 	var/list/formatted = list()
 	for(var/job in jobs)
 		formatted.Add(list(list(
@@ -102,11 +103,19 @@
 	if(..())
 		return 1
 
+	var/obj/item/weapon/computer_hardware/card_slot/card_slot
+	var/obj/item/weapon/computer_hardware/printer/printer
+	if(computer)
+		card_slot = computer.all_components[MC_CARD]
+		printer = computer.all_components[MC_PRINT]
+		if(!card_slot)
+			return
+
 	var/obj/item/weapon/card/id/user_id_card = null
 	var/mob/user = usr
 
-	var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
-	var/obj/item/weapon/card/id/auth_card = computer.card_slot.stored_card2
+	var/obj/item/weapon/card/id/id_card = card_slot.stored_card
+	var/obj/item/weapon/card/id/auth_card = card_slot.stored_card2
 
 	if(auth_card)
 		user_id_card = auth_card
@@ -129,7 +138,7 @@
 			else
 				show_assignments = 1
 		if("PRG_print")
-			if(computer && computer.printer) //This option should never be called if there is no printer
+			if(computer && printer) //This option should never be called if there is no printer
 				if(mod_mode)
 					if(authorized())
 						var/contents = {"<h4>Access Report</h4>
@@ -145,7 +154,7 @@
 							if(A in known_access_rights)
 								contents += "  [get_access_desc(A)]"
 
-						if(!computer.printer.print_text(contents,"access report"))
+						if(!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
@@ -155,26 +164,26 @@
 									<br>
 									[data_core ? data_core.get_manifest(0) : ""]
 									"}
-					if(!computer.printer.print_text(contents,text("crew manifest ([])", worldtime2text())))
+					if(!printer.print_text(contents,text("crew manifest ([])", worldtime2text())))
 						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'>\The [computer] prints out paper.</span>")
 		if("PRG_eject")
-			if(computer && computer.card_slot)
+			if(computer && card_slot)
 				var/select = params["target"]
 				switch(select)
 					if("id")
 						if(id_card)
 							data_core.manifest_modify(id_card.registered_name, id_card.assignment)
-							computer.proc_eject_id(user, 1)
+							card_slot.try_eject(, user)
 						else
 							var/obj/item/I = usr.get_active_held_item()
 							if (istype(I, /obj/item/weapon/card/id))
 								if(!usr.drop_item())
 									return
 								I.forceMove(computer)
-								computer.card_slot.stored_card = I
+								card_slot.stored_card = I
 					if("auth")
 						if(auth_card)
 							if(id_card)
@@ -183,14 +192,14 @@
 							region_access = null
 							authenticated = 0
 							minor = 0
-							computer.proc_eject_id(user, 2)
+							card_slot.try_eject(, user)
 						else
 							var/obj/item/I = usr.get_active_held_item()
 							if (istype(I, /obj/item/weapon/card/id))
 								if(!usr.drop_item())
 									return
 								I.forceMove(computer)
-								computer.card_slot.stored_card2 = I
+								card_slot.stored_card2 = I
 		if("PRG_terminate")
 			if(computer && ((id_card.assignment in head_subordinates) || id_card.assignment == "Assistant"))
 				id_card.assignment = "Unassigned"
@@ -292,13 +301,21 @@
 
 	var/list/data = get_header_data()
 
+	var/obj/item/weapon/computer_hardware/card_slot/card_slot
+	var/obj/item/weapon/computer_hardware/printer/printer
+
+	if(computer)
+		card_slot = computer.all_components[MC_CARD]
+		printer = computer.all_components[MC_PRINT]
+
 	data["mmode"] = mod_mode
 
 	var/authed = 0
-	if(computer && computer.card_slot)
-		var/obj/item/weapon/card/id/auth_card = computer.card_slot.stored_card2
-		data["auth_name"] = auth_card ? strip_html_simple(auth_card.name) : "-----"
-		authed = authorized()
+	if(computer)
+		if(card_slot)
+			var/obj/item/weapon/card/id/auth_card = card_slot.stored_card2
+			data["auth_name"] = auth_card ? strip_html_simple(auth_card.name) : "-----"
+			authed = authorized()
 
 
 	if(mod_mode == 2)
@@ -336,9 +353,9 @@
 		data["manifest"] = crew
 	data["assignments"] = show_assignments
 	if(computer)
-		data["have_id_slot"] = !!computer.card_slot
-		data["have_printer"] = !!computer.printer
-		if(!computer.card_slot && mod_mode == 1)
+		data["have_id_slot"] = !!card_slot
+		data["have_printer"] = !!printer
+		if(!card_slot && mod_mode == 1)
 			mod_mode = 0 //We can't modify IDs when there is no card reader
 	else
 		data["have_id_slot"] = 0
@@ -350,10 +367,9 @@
 	data["authenticated"] = authed
 
 
-	if(mod_mode == 1)
-
-		if(computer && computer.card_slot)
-			var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
+	if(mod_mode == 1 && computer)
+		if(card_slot)
+			var/obj/item/weapon/card/id/id_card = card_slot.stored_card
 
 			data["has_id"] = !!id_card
 			data["id_rank"] = id_card && id_card.assignment ? html_encode(id_card.assignment) : "Unassigned"
@@ -370,8 +386,8 @@
 				data["centcom_jobs"] = format_jobs(get_all_centcom_jobs())
 
 
-		if(computer.card_slot.stored_card)
-			var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
+		if(card_slot.stored_card)
+			var/obj/item/weapon/card/id/id_card = card_slot.stored_card
 			if(is_centcom)
 				var/list/all_centcom_access = list()
 				for(var/access in get_all_centcom_access())
@@ -431,9 +447,10 @@
 
 
 /datum/computer_file/program/card_mod/proc/authorized()
-	if(!authenticated)
-		if(computer && computer.card_slot)
-			var/obj/item/weapon/card/id/auth_card = computer.card_slot.stored_card2
+	if(!authenticated && computer)
+		var/obj/item/weapon/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
+		if(card_slot)
+			var/obj/item/weapon/card/id/auth_card = card_slot.stored_card2
 			if(auth_card)
 				region_access = list()
 				if(transfer_access in auth_card.GetAccess())

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

@@ -29,6 +29,8 @@
 
 /datum/computer_file/program/computerconfig/ui_data(mob/user)
 	movable = computer
+	var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = movable.all_components[MC_HDD]
+	var/obj/item/weapon/computer_hardware/battery/battery_module = movable.all_components[MC_CELL]
 	if(!istype(movable))
 		movable = null
 
@@ -38,20 +40,20 @@
 
 	var/list/data = get_header_data()
 
-	data["disk_size"] = movable.hard_drive.max_capacity
-	data["disk_used"] = movable.hard_drive.used_capacity
+	data["disk_size"] = hard_drive.max_capacity
+	data["disk_used"] = hard_drive.used_capacity
 	data["power_usage"] = movable.last_power_usage
-	data["battery_exists"] = movable.battery_module ? 1 : 0
-	if(movable.battery_module && movable.battery_module.battery)
-		data["battery_rating"] = movable.battery_module.battery.maxcharge
-		data["battery_percent"] = round(movable.battery_module.battery.percent())
+	data["battery_exists"] = battery_module ? 1 : 0
+	if(battery_module && battery_module.battery)
+		data["battery_rating"] = battery_module.battery.maxcharge
+		data["battery_percent"] = round(battery_module.battery.percent())
 
-	if(movable.battery_module && movable.battery_module.battery)
-		data["battery"] = list("max" = movable.battery_module.battery.maxcharge, "charge" = round(movable.battery_module.battery.charge))
+	if(battery_module && battery_module.battery)
+		data["battery"] = list("max" = battery_module.battery.maxcharge, "charge" = round(battery_module.battery.charge))
 
 	var/list/all_entries[0]
 	for(var/I in movable.all_components)
-		var/obj/item/weapon/computer_hardware/H = I
+		var/obj/item/weapon/computer_hardware/H = movable.all_components[I]
 		all_entries.Add(list(list(
 		"name" = H.name,
 		"desc" = H.desc,

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

@@ -14,8 +14,9 @@
 	if(..())
 		return 1
 
-	var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
-	var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive
+	var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
+	var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.all_components[MC_HDD]
+	var/obj/item/weapon/computer_hardware/printer/printer = computer.all_components[MC_PRINT]
 
 	switch(action)
 		if("PRG_openfile")
@@ -106,10 +107,10 @@
 			var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
 			if(!F || !istype(F))
 				return 1
-			if(!computer.printer)
+			if(!printer)
 				error = "Missing Hardware: Your computer does not have required hardware to complete this operation."
 				return 1
-			if(!computer.printer.print_text(parse_tags(F.stored_data)))
+			if(!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 1
 		if("PRG_copytousb")
@@ -185,17 +186,16 @@
 /datum/computer_file/program/filemanager/ui_data(mob/user)
 	var/list/data = get_header_data()
 
-	var/obj/item/weapon/computer_hardware/hard_drive/HDD
-	var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD
+	var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
+	var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.all_components[MC_SDD]
 	if(error)
 		data["error"] = error
 	if(open_file)
 		var/datum/computer_file/data/file
 
-		if(!computer || !computer.hard_drive)
+		if(!computer || !HDD)
 			data["error"] = "I/O ERROR: Unable to access hard drive."
 		else
-			HDD = computer.hard_drive
 			file = HDD.find_file_by_name(open_file)
 			if(!istype(file))
 				data["error"] = "I/O ERROR: Unable to open file."
@@ -203,11 +203,9 @@
 				data["filedata"] = parse_tags(file.stored_data)
 				data["filename"] = "[file.filename].[file.filetype]"
 	else
-		if(!computer || !computer.hard_drive)
+		if(!computer || !HDD)
 			data["error"] = "I/O ERROR: Unable to access hard drive."
 		else
-			HDD = computer.hard_drive
-			RHDD = computer.portable_drive
 			var/list/files[0]
 			for(var/datum/computer_file/F in HDD.stored_files)
 				files.Add(list(list(

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

@@ -30,7 +30,9 @@
 	if(PRG.available_on_syndinet && !computer.emagged)
 		return 0
 
-	if(!computer || !computer.hard_drive || !computer.hard_drive.can_store_file(PRG))
+	var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+
+	if(!computer || !hard_drive || !hard_drive.can_store_file(PRG))
 		return 0
 
 	ui_header = "downloader_running.gif"
@@ -59,7 +61,8 @@
 	if(!downloaded_file)
 		return
 	generate_network_log("Completed download of file [hacked_download ? "**ENCRYPTED**" : "[downloaded_file.filename].[downloaded_file.filetype]"].")
-	if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(downloaded_file))
+	var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+	if(!computer || !hard_drive || !hard_drive.store_file(downloaded_file))
 		// The download failed
 		downloaderror = "I/O ERROR - Unable to save file. Check whether you have enough free space on your hard drive and whether your hard drive is properly connected. If the issue persists contact your system administrator for assistance."
 	downloaded_file = null
@@ -129,8 +132,9 @@
 		data["downloadspeed"] = download_netspeed
 		data["downloadcompletion"] = round(download_completion, 0.1)
 	else // No download running, pick file.
-		data["disk_size"] = my_computer.hard_drive.max_capacity
-		data["disk_used"] = my_computer.hard_drive.used_capacity
+		var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = my_computer.all_components[MC_HDD]
+		data["disk_size"] = hard_drive.max_capacity
+		data["disk_used"] = hard_drive.used_capacity
 		var/list/all_entries[0]
 		for(var/A in ntnet_global.available_station_software)
 			var/datum/computer_file/program/P = A

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

@@ -119,12 +119,13 @@
 				logfile.stored_data += "[logstring]\[BR\]"
 			logfile.stored_data += "\[b\]Logfile dump completed.\[/b\]"
 			logfile.calculate_size()
-			if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile))
+			var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+			if(!computer || !hard_drive || !hard_drive.store_file(logfile))
 				if(!computer)
 					// This program shouldn't even be runnable without computer.
 					CRASH("Var computer is null!")
 					return 1
-				if(!computer.hard_drive)
+				if(!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.")

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

@@ -66,7 +66,8 @@ var/global/nttransfer_uid = 0
 
 // 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))
+	var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+	if(!computer || !hard_drive || !hard_drive.store_file(downloaded_file))
 		error = "I/O Error:  Unable to save file. Check your hard drive and try again."
 	finalize_download()
 
@@ -136,7 +137,8 @@ var/global/nttransfer_uid = 0
 			server_password = pass
 			return 1
 		if("PRG_uploadfile")
-			for(var/datum/computer_file/F in computer.hard_drive.stored_files)
+			var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+			for(var/datum/computer_file/F in hard_drive.stored_files)
 				if("[F.uid]" == params["id"])
 					if(F.unsendable)
 						error = "I/O Error: File locked."
@@ -174,7 +176,8 @@ var/global/nttransfer_uid = 0
 		data["upload_filename"] = "[provided_file.filename].[provided_file.filetype]"
 	else if (upload_menu)
 		var/list/all_files[0]
-		for(var/datum/computer_file/F in computer.hard_drive.stored_files)
+		var/obj/item/weapon/computer_hardware/hard_drive/hard_drive = computer.all_components[MC_HDD]
+		for(var/datum/computer_file/F in hard_drive.stored_files)
 			all_files.Add(list(list(
 			"uid" = F.uid,
 			"filename" = "[F.filename].[F.filetype]",