Merge pull request #9199 from Techhead0/voidmachine-englishlists

Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc

code/game/machinery/computer3/buildandrepair.dm

@@ -15,7 +15,6 @@
 	var/list/req_components = null
 	var/powernet = null
 	var/list/records = null
-	var/frame_desc = null
 
 	var/datum/file/program/OS = new/datum/file/program/ntos
 

code/game/machinery/constructable_frame.dm

@@ -18,15 +18,11 @@
 	proc/update_desc()
 		var/D
 		if(req_components)
-			D = "Requires "
+			var/list/component_list = new
-			var/first = 1
 			for(var/I in req_components)
 				if(req_components[I] > 0)
-					D += "[first?"":", "][num2text(req_components[I])] [req_component_names[I]]"
+					component_list += "[num2text(req_components[I])] [req_component_names[I]]"
-					first = 0
+			D = "Requires [english_list(component_list)]."
-			if(first) // nothing needs to be added, then
-				D += "nothing"
-			D += "."
 		desc = D
 
 /obj/machinery/constructable_frame/machine_frame
@@ -74,10 +70,7 @@
 							var/cp = text2path(A)
 							var/obj/ct = new cp() // have to quickly instantiate it get name
 							req_component_names[A] = ct.name
-						if(circuit.frame_desc)
+						update_desc()
-							desc = circuit.frame_desc
-						else
-							update_desc()
 						user << desc
 					else
 						user << "\red This frame does not accept circuit boards of this type!"

code/game/objects/items/weapons/circuitboards/circuitboard.dm

@@ -21,7 +21,6 @@
 	var/build_path = null
 	var/board_type = "computer"
 	var/list/req_components = null
-	var/frame_desc = null
 	var/contain_parts = 1
 
 //Called when the circuitboard is used to contruct a new machine.

code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm

@@ -7,7 +7,6 @@
 	build_path = "/obj/machinery/biogenerator"
 	board_type = "machine"
 	origin_tech = "programming=2"
-	frame_desc = "Requires 1 Manipulator, and 1 Matter Bin."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
 							"/obj/item/weapon/stock_parts/manipulator" = 1)

code/game/objects/items/weapons/circuitboards/machinery/cloning.dm

@@ -7,7 +7,6 @@
 	build_path = "/obj/machinery/clonepod"
 	board_type = "machine"
 	origin_tech = "programming=3;biotech=3"
-	frame_desc = "Requires 2 Manipulator, 2 Scanning Module, 2 pieces of cable and 1 Console Screen."
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 2,
 							"/obj/item/weapon/stock_parts/scanning_module" = 2,
@@ -19,7 +18,6 @@
 	build_path = "/obj/machinery/dna_scannernew"
 	board_type = "machine"
 	origin_tech = "programming=2;biotech=2"
-	frame_desc = "Requires 1 Scanning module, 1 Micro Manipulator, 1 Micro-Laser, 2 pieces of cable and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/scanning_module" = 1,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,

code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm

@@ -7,7 +7,6 @@
 	build_path = "/obj/machinery/bluespacerelay"
 	board_type = "machine"
 	origin_tech = "bluespace=4,programming=4"
-	frame_desc = "Requires 30 Cable Coil, 1 Hyperwave Filter and 1 Ansible Crystal, and 2 Micro-Manipulators"
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 30,
 							"/obj/item/weapon/stock_parts/manipulator" = 2,

code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm

@@ -7,7 +7,6 @@
 	build_path = "/obj/machinery/mining/drill"
 	board_type = "machine"
 	origin_tech = "programming=1;engineering=1"
-	frame_desc = "Requires 1 capacitor, 1 cell, 1 matter bin, and 1 micro laser."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/capacitor" = 1,
 							"/obj/item/weapon/cell" = 1,

code/game/objects/items/weapons/circuitboards/machinery/pacman.dm

@@ -7,7 +7,6 @@
 	build_path = "/obj/machinery/power/port_gen/pacman"
 	board_type = "machine"
 	origin_tech = "programming=3;powerstorage=3;phorontech=3;engineering=3"
-	frame_desc = "Requires 1 Matter Bin, 1 Micro-Laser, 2 Pieces of Cable, and 1 Capacitor."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
 							"/obj/item/weapon/stock_parts/micro_laser" = 1,

code/game/objects/items/weapons/circuitboards/machinery/power.dm

@@ -7,7 +7,6 @@
 	build_path = "/obj/machinery/power/smes/buildable"
 	board_type = "machine"
 	origin_tech = "powerstorage=6;engineering=4"
-	frame_desc = "Requires 1 superconducting magnetic coil and 30 wires."
 	req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30)
 
 /obj/item/weapon/circuitboard/batteryrack
@@ -15,7 +14,6 @@
 	build_path = "/obj/machinery/power/smes/batteryrack"
 	board_type = "machine"
 	origin_tech = "powerstorage=3;engineering=2"
-	frame_desc = "Requires 3 power cells."
 	req_components = list("/obj/item/weapon/cell" = 3)
 
 /obj/item/weapon/circuitboard/ghettosmes
@@ -23,5 +21,4 @@
 	desc = "An APC circuit repurposed into some power storage device controller"
 	build_path = "/obj/machinery/power/smes/batteryrack/makeshift"
 	board_type = "machine"
-	frame_desc = "Requires 3 power cells."
 	req_components = list("/obj/item/weapon/cell" = 3)

code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm

@@ -7,7 +7,6 @@
 	build_path = "/obj/machinery/recharge_station"
 	board_type = "machine"
 	origin_tech = "programming=3;engineering=3"
-	frame_desc = "Requires 2 Manipulator, 2 Capacitor, 1 Cell, and 5 pieces of cable."
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 5,
 							"/obj/item/weapon/stock_parts/capacitor" = 2,

code/game/objects/items/weapons/circuitboards/machinery/research.dm

@@ -7,7 +7,6 @@ obj/item/weapon/circuitboard/rdserver
 	build_path = "/obj/machinery/r_n_d/server"
 	board_type = "machine"
 	origin_tech = "programming=3"
-	frame_desc = "Requires 2 pieces of cable, and 1 Scanning Module."
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 2,
 							"/obj/item/weapon/stock_parts/scanning_module" = 1)
@@ -17,7 +16,6 @@ obj/item/weapon/circuitboard/rdserver
 	build_path = "/obj/machinery/r_n_d/destructive_analyzer"
 	board_type = "machine"
 	origin_tech = "magnets=2;engineering=2;programming=2"
-	frame_desc = "Requires 1 Scanning Module, 1 Micro Manipulator, and 1 Micro-Laser."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/scanning_module" = 1,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,
@@ -28,7 +26,6 @@ obj/item/weapon/circuitboard/rdserver
 	build_path = "/obj/machinery/autolathe"
 	board_type = "machine"
 	origin_tech = "engineering=2;programming=2"
-	frame_desc = "Requires 3 Matter Bins, 1 Micro Manipulator, and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 3,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,
@@ -39,7 +36,6 @@ obj/item/weapon/circuitboard/rdserver
 	build_path = "/obj/machinery/r_n_d/protolathe"
 	board_type = "machine"
 	origin_tech = "engineering=2;programming=2"
-	frame_desc = "Requires 2 Matter Bins, 2 Micro Manipulators, and 2 Beakers."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 2,
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
@@ -51,7 +47,6 @@ obj/item/weapon/circuitboard/rdserver
 	build_path = "/obj/machinery/r_n_d/circuit_imprinter"
 	board_type = "machine"
 	origin_tech = "engineering=2;programming=2"
-	frame_desc = "Requires 1 Matter Bin, 1 Micro Manipulator, and 2 Beakers."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,
@@ -62,7 +57,6 @@ obj/item/weapon/circuitboard/rdserver
 	build_path = "/obj/machinery/mecha_part_fabricator"
 	board_type = "machine"
 	origin_tech = "programming=3;engineering=3"
-	frame_desc = "Requires 2 Matter Bins, 1 Micro Manipulator, 1 Micro-Laser and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/matter_bin" = 2,
 							"/obj/item/weapon/stock_parts/manipulator" = 1,

code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm

@@ -7,7 +7,6 @@
 	board_type = "machine"
 	build_path = "/obj/machinery/shield_gen/external"
 	origin_tech = "bluespace=4;phorontech=3"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
 							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
@@ -21,7 +20,6 @@
 	board_type = "machine"
 	build_path = "/obj/machinery/shield_gen"
 	origin_tech = "bluespace=4;phorontech=3"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
 							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
@@ -35,7 +33,6 @@
 	board_type = "machine"
 	build_path = "/obj/machinery/shield_capacitor"
 	origin_tech = "magnets=3;powerstorage=4"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Filter, 5 Pieces of cable, 1 Subspace Treatment disk, 1 Subspace Analyzer and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
 							"/obj/item/weapon/stock_parts/subspace/filter" = 1,

code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm

@@ -9,7 +9,6 @@
 	name = T_BOARD("subspace receiver")
 	build_path = "/obj/machinery/telecomms/receiver"
 	origin_tech = "programming=4;engineering=3;bluespace=2"
-	frame_desc = "Requires 1 Subspace Ansible, 1 Hyperwave Filter, 2 Micro Manipulators, and 1 Micro-Laser."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/subspace/ansible" = 1,
 							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
@@ -20,7 +19,6 @@
 	name = T_BOARD("hub mainframe")
 	build_path = "/obj/machinery/telecomms/hub"
 	origin_tech = "programming=4;engineering=4"
-	frame_desc = "Requires 2 Micro Manipulators, 2 Cable Coil and 2 Hyperwave Filter."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 2,
@@ -30,7 +28,6 @@
 	name = T_BOARD("relay mainframe")
 	build_path = "/obj/machinery/telecomms/relay"
 	origin_tech = "programming=3;engineering=4;bluespace=3"
-	frame_desc = "Requires 2 Micro Manipulators, 2 Cable Coil and 2 Hyperwave Filters."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 2,
@@ -40,7 +37,6 @@
 	name = T_BOARD("bus mainframe")
 	build_path = "/obj/machinery/telecomms/bus"
 	origin_tech = "programming=4;engineering=4"
-	frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil and 1 Hyperwave Filter."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 1,
@@ -50,7 +46,6 @@
 	name = T_BOARD("processor unit")
 	build_path = "/obj/machinery/telecomms/processor"
 	origin_tech = "programming=4;engineering=4"
-	frame_desc = "Requires 3 Micro Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 3,
 							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
@@ -63,7 +58,6 @@
 	name = T_BOARD("telecommunication server")
 	build_path = "/obj/machinery/telecomms/server"
 	origin_tech = "programming=4;engineering=4"
-	frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil and 1 Hyperwave Filter."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 1,
@@ -73,7 +67,6 @@
 	name = T_BOARD("subspace broadcaster")
 	build_path = "/obj/machinery/telecomms/broadcaster"
 	origin_tech = "programming=4;engineering=4;bluespace=2"
-	frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal and 2 High-Powered Micro-Lasers. "
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator" = 2,
 							"/obj/item/stack/cable_coil" = 1,

code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm

@@ -17,7 +17,6 @@
 	name = T_BOARD("gas heating system")
 	build_path = "/obj/machinery/atmospherics/unary/heater"
 	origin_tech = "powerstorage=2;engineering=1"
-	frame_desc = "Requires 5 Pieces of Cable, 1 Matter Bin, and 2 Capacitors."
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 5,
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
@@ -27,7 +26,6 @@
 	name = T_BOARD("gas cooling system")
 	build_path = "/obj/machinery/atmospherics/unary/freezer"
 	origin_tech = "magnets=2;engineering=2"
-	frame_desc = "Requires 2 Pieces of Cable, 1 Matter Bin, 1 Micro Manipulator, and 2 Capacitors."
 	req_components = list(
 							"/obj/item/stack/cable_coil" = 2,
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,

code/modules/clothing/spacesuits/void/void.dm

@@ -59,15 +59,10 @@
 
 /obj/item/clothing/suit/space/void/examine(user)
 	..(user)
-	if(boots || helmet || tank)
+	var/list/part_list = new
-		var/D = "Installed equipment: "
+	for(var/obj/item/I in list(helmet,boots,tank))
-		var/first = 1
+		part_list += "\a [I]"
-		for(var/obj/item/I in list(helmet,boots,tank))
+	user << "\The [src] has [english_list(part_list)] installed."
-			if (I)
-				D += "[first?"":", "]\the [I]\icon[I]"
-				first = 0
-		D += "."
-		user << D
 	if(tank && in_range(src,user))
 		user << "<span class='notice'>The wrist-mounted pressure gauge reads [max(round(tank.air_contents.return_pressure()),0)] kPa remaining in \the [tank].</span>"
 

code/modules/power/rust/circuits_and_design.dm

@@ -75,7 +75,6 @@ datum/design/rust_fuel_compressor
 	build_path = "/obj/machinery/power/rust_core"
 	board_type = "machine"
 	origin_tech = "bluespace=3;phorontech=4;magnets=5;powerstorage=6"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Ultra Micro-Laser, 5 Pieces of Cable, 1 Subspace Crystal and 1 Console Screen."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
 							"/obj/item/weapon/stock_parts/micro_laser/ultra" = 1,
@@ -101,7 +100,6 @@ datum/design/rust_core
 	build_path = "/obj/machinery/power/rust_fuel_injector"
 	board_type = "machine"
 	origin_tech = "powerstorage=3;engineering=4;phorontech=4;materials=6"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Phasic Scanning Module, 1 Super Matter Bin, 1 Console Screen and 5 Pieces of Cable."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
 							"/obj/item/weapon/stock_parts/scanning_module/phasic" = 1,

code/modules/research/xenoarchaeology/genetics/reconstitutor.dm

@@ -302,7 +302,6 @@ datum/genesequence
 	name = "Circuit board (Flora Reconstitution Console)"
 	build_path = "/obj/machinery/computer/reconstitutor"
 	origin_tech = "programming=2;biotech=4;materials=6"
-	frame_desc = "Requires 2 Advanced Scanning Module, 1 Nano Manipulator, 1 Matter Bin and 1 Advanced Capacitor."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/scanning_module/adv" = 2,
 							"/obj/item/weapon/stock_parts/manipulator/nano" = 1,
@@ -313,7 +312,6 @@ datum/genesequence
 	name = "Circuit board (Fauna Reconstitution Console)"
 	build_path = "/obj/machinery/computer/reconstitutor/animal"
 	origin_tech = "programming=2;biotech=4;materials=6"
-	frame_desc = "Requires 2 Advanced Scanning Module, 1 Nano Manipulator, 1 Matter Bin and 1 Advanced Capacitor."
 	req_components = list(
 							"/obj/item/weapon/stock_parts/scanning_module/adv" = 2,
 							"/obj/item/weapon/stock_parts/manipulator/nano" = 1,