Yet Another Circuit Update (#5549)

* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.

code/modules/integrated_electronics/core/printer.dm

@@ -2,16 +2,17 @@
 /obj/item/device/integrated_circuit_printer
 	name = "integrated circuit printer"
 	desc = "A portable(ish) machine made to print tiny modular circuitry out of metal."
-	icon = 'icons/obj/electronic_assemblies.dmi'
+	icon = 'icons/obj/integrated_electronics/electronic_tools.dmi'
 	icon_state = "circuit_printer"
 	w_class = ITEMSIZE_LARGE
 	var/metal = 0
 	var/max_metal = 100
 	var/metal_per_sheet = 10 // One sheet equals this much metal.
+	var/debug = FALSE // If true, metal is infinite.
 
 	var/upgraded = FALSE		// When hit with an upgrade disk, will turn true, allowing it to print the higher tier circuits.
-	var/can_clone = FALSE		// Same for above, but will allow the printer to duplicate a specific assembly.
-	var/static/list/recipe_list = list()
+	var/can_clone = FALSE		// Same for above, but will allow the printer to duplicate a specific assembly. (Not implemented)
+//	var/static/list/recipe_list = list()
 	var/current_category = null
 	var/obj/item/device/electronic_assembly/assembly_to_clone = null
 
@@ -19,67 +20,32 @@
 	upgraded = TRUE
 	can_clone = TRUE
 
-/obj/item/device/integrated_circuit_printer/initialize()
-	. = ..()
-	if(!recipe_list.len)
-		// Unfortunately this needed a lot of loops, but it should only be run once at init.
-
-		// First loop is to seperate the actual circuits from base circuits.
-		var/list/circuits_to_use = list()
-		for(var/obj/item/integrated_circuit/IC in all_integrated_circuits)
-			if((IC.spawn_flags & IC_SPAWN_DEFAULT) || (IC.spawn_flags & IC_SPAWN_RESEARCH))
-				circuits_to_use.Add(IC)
-
-		// Second loop is to find all categories.
-		var/list/found_categories = list()
-		for(var/obj/item/integrated_circuit/IC in circuits_to_use)
-			if(!(IC.category_text in found_categories))
-				found_categories.Add(IC.category_text)
-
-		// Third loop is to initialize lists by category names, then put circuits matching the category inside.
-		for(var/category in found_categories)
-			recipe_list[category] = list()
-			var/list/current_list = recipe_list[category]
-			for(var/obj/item/integrated_circuit/IC in circuits_to_use)
-				if(IC.category_text == category)
-					current_list.Add(IC)
-
-		// Now for non-circuit things.
-		var/list/assembly_list = list()
-		assembly_list.Add(
-			new /obj/item/device/electronic_assembly(null),
-			new /obj/item/device/electronic_assembly/medium(null),
-			new /obj/item/device/electronic_assembly/large(null),
-			new /obj/item/device/electronic_assembly/drone(null),
-			new /obj/item/weapon/implant/integrated_circuit(null),
-			new /obj/item/device/assembly/electronic_assembly(null)
-		)
-		recipe_list["Assemblies"] = assembly_list
-
-		var/list/tools_list = list()
-		tools_list.Add(
-			new /obj/item/device/integrated_electronics/wirer(null),
-			new /obj/item/device/integrated_electronics/debugger(null)
-		)
-		recipe_list["Tools"] = tools_list
-
+/obj/item/device/integrated_circuit_printer/debug
+	name = "fractal integrated circuit printer"
+	desc = "A portable(ish) machine that makes modular circuitry seemingly out of thin air."
+	upgraded = TRUE
+	can_clone = TRUE
+	debug = TRUE
 
 /obj/item/device/integrated_circuit_printer/attackby(var/obj/item/O, var/mob/user)
 	if(istype(O,/obj/item/stack/material))
 		var/obj/item/stack/material/stack = O
 		if(stack.material.name == DEFAULT_WALL_MATERIAL)
+			if(debug)
+				to_chat(user, span("warning", "\The [src] does not need any material."))
+				return
 			var/num = min((max_metal - metal) / metal_per_sheet, stack.amount)
 			if(num < 1)
-				to_chat(user, "<span class='warning'>\The [src] is too full to add more metal.</span>")
+				to_chat(user, span("warning", "\The [src] is too full to add more metal."))
 				return
 			if(stack.use(num))
-				to_chat(user, "<span class='notice'>You add [num] sheet\s to \the [src].</span>")
+				to_chat(user, span("notice", "You add [num] sheet\s to \the [src]."))
 				metal += num * metal_per_sheet
 				interact(user)
 				return TRUE
 
 	if(istype(O,/obj/item/integrated_circuit))
-		to_chat(user, "<span class='notice'>You insert the circuit into \the [src]. </span>")
+		to_chat(user, span("notice", "You insert the circuit into \the [src]."))
 		user.unEquip(O)
 		metal = min(metal + O.w_class, max_metal)
 		qdel(O)
@@ -88,18 +54,18 @@
 
 	if(istype(O,/obj/item/weapon/disk/integrated_circuit/upgrade/advanced))
 		if(upgraded)
-			to_chat(user, "<span class='warning'>\The [src] already has this upgrade. </span>")
+			to_chat(user, span("warning", "\The [src] already has this upgrade."))
 			return TRUE
-		to_chat(user, "<span class='notice'>You install \the [O] into  \the [src]. </span>")
+		to_chat(user, span("notice", "You install \the [O] into  \the [src]."))
 		upgraded = TRUE
 		interact(user)
 		return TRUE
 
 	if(istype(O,/obj/item/weapon/disk/integrated_circuit/upgrade/clone))
 		if(can_clone)
-			to_chat(user, "<span class='warning'>\The [src] already has this upgrade. </span>")
+			to_chat(user, span("warning", "\The [src] already has this upgrade."))
 			return TRUE
-		to_chat(user, "<span class='notice'>You install \the [O] into  \the [src]. </span>")
+		to_chat(user, span("notice", "You install \the [O] into  \the [src]."))
 		can_clone = TRUE
 		interact(user)
 		return TRUE
@@ -114,18 +80,21 @@
 	var/window_width = 500
 
 	if(isnull(current_category))
-		current_category = recipe_list[1]
+		current_category = SScircuit.circuit_fabricator_recipe_list[1]
 
 	var/HTML = "<center><h2>Integrated Circuit Printer</h2></center><br>"
-	HTML += "Metal: [metal/metal_per_sheet]/[max_metal/metal_per_sheet] sheets.<br>"
-	HTML += "Circuits available: [upgraded ? "Regular":"Advanced"]."
-	HTML += "Assembly Cloning: [can_clone ? "Available": "Unavailable"]."
+	if(!debug)
+		HTML += "Metal: [metal/metal_per_sheet]/[max_metal/metal_per_sheet] sheets.<br>"
+	else
+		HTML += "Metal: INFINITY.<br>"
+	HTML += "Circuits available: [upgraded ? "Advanced":"Regular"].<br>"
+	HTML += "Assembly Cloning: [can_clone ? "Available": "Unavailable"].<br>"
 	if(assembly_to_clone)
-		HTML += "Assembly '[assembly_to_clone.name]' loaded."
+		HTML += "Assembly '[assembly_to_clone.name]' loaded.<br>"
 	HTML += "Crossed out circuits mean that the printer is not sufficentally upgraded to create that circuit.<br>"
 	HTML += "<hr>"
 	HTML += "Categories:"
-	for(var/category in recipe_list)
+	for(var/category in SScircuit.circuit_fabricator_recipe_list)
 		if(category != current_category)
 			HTML += " <a href='?src=\ref[src];category=[category]'>\[[category]\]</a> "
 		else // Bold the button if it's already selected.
@@ -133,20 +102,22 @@
 	HTML += "<hr>"
 	HTML += "<center><h4>[current_category]</h4></center>"
 
-	var/list/current_list = recipe_list[current_category]
-	for(var/obj/O in current_list)
+	var/list/current_list = SScircuit.circuit_fabricator_recipe_list[current_category]
+	for(var/path in current_list)
+		var/obj/O = path
 		var/can_build = TRUE
-		if(istype(O, /obj/item/integrated_circuit))
-			var/obj/item/integrated_circuit/IC = O
-			if((IC.spawn_flags & IC_SPAWN_RESEARCH) && (!(IC.spawn_flags & IC_SPAWN_DEFAULT)) && !upgraded)
+		if(ispath(path, /obj/item/integrated_circuit))
+			var/obj/item/integrated_circuit/IC = path
+			if((initial(IC.spawn_flags) & IC_SPAWN_RESEARCH) && (!(initial(IC.spawn_flags) & IC_SPAWN_DEFAULT)) && !upgraded)
 				can_build = FALSE
 		if(can_build)
-			HTML += "<A href='?src=\ref[src];build=[O.type]'>\[[O.name]\]</A>: [O.desc]<br>"
+			HTML += "<A href='?src=\ref[src];build=[path]'>\[[initial(O.name)]\]</A>: [initial(O.desc)]<br>"
 		else
-			HTML += "<s>\[[O.name]\]: [O.desc]</s><br>"
+			HTML += "<s>\[[initial(O.name)]\]</s>: [initial(O.desc)]<br>"
 
 	user << browse(jointext(HTML, null), "window=integrated_printer;size=[window_width]x[window_height];border=1;can_resize=1;can_close=1;can_minimize=1")
 
+
 /obj/item/device/integrated_circuit_printer/Topic(href, href_list)
 	if(..())
 		return 1
@@ -162,31 +133,36 @@
 			return 1
 
 		var/cost = 1
-		
+
 		if(isnull(current_category))
-			current_category = recipe_list[1]
+			current_category = SScircuit.circuit_fabricator_recipe_list[1]
 		if(ispath(build_type, /obj/item/device/electronic_assembly))
 			var/obj/item/device/electronic_assembly/E = build_type
 			cost = round( (initial(E.max_complexity) + initial(E.max_components) ) / 4)
 		else
 			var/obj/item/I = build_type
 			cost = initial(I.w_class)
-		if(!(locate(build_type) in recipe_list[current_category]))
+		if(!build_type in SScircuit.circuit_fabricator_recipe_list[current_category])
 			return
 
-		if(metal - cost < 0)
-			to_chat(usr, "<span class='warning'>You need [cost] metal to build that!.</span>")
-			return 1
-		metal -= cost
-		new build_type(get_turf(loc))
+		if(!debug)
+			if(metal - cost < 0)
+				to_chat(usr, "<span class='warning'>You need [cost] metal to build that!.</span>")
+				return 1
+			metal -= cost
+		var/obj/item/built = new build_type(get_turf(loc))
+		usr.put_in_hands(built)
+		to_chat(usr, "<span class='notice'>[capitalize(built.name)] printed.</span>")
+		playsound(src, 'sound/items/jaws_pry.ogg', 50, TRUE)
 
 	interact(usr)
 
+
 // FUKKEN UPGRADE DISKS
 /obj/item/weapon/disk/integrated_circuit/upgrade
 	name = "integrated circuit printer upgrade disk"
 	desc = "Install this into your integrated circuit printer to enhance it."
-	icon = 'icons/obj/electronic_assemblies.dmi'
+	icon = 'icons/obj/integrated_electronics/electronic_tools.dmi'
 	icon_state = "upgrade_disk"
 	item_state = "card-id"
 	w_class = ITEMSIZE_SMALL