frame cleanup fixes

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -24,7 +24,6 @@
 /obj/machinery/atmospherics/unary/freezer/New()
 	..()
 	initialize_directions = dir
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -24,7 +24,6 @@
 /obj/machinery/atmospherics/unary/heater/New()
 	..()
 	initialize_directions = dir
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)

code/game/machinery/Sleeper.dm

@@ -63,7 +63,6 @@
 /obj/machinery/sleeper/New()
 	..()
 	beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src)
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)

code/game/machinery/adv_med.dm

@@ -25,7 +25,6 @@
 		if(C)
 			C.connected = src
 
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)

code/game/machinery/alarm.dm

@@ -54,7 +54,7 @@
 	var/wiresexposed = 0 // If it's been screwdrivered open.
 	var/aidisabled = 0
 	var/shorted = 0
-	circuit =  /obj/item/weapon/circuitboard/airalarm
+	circuit = /obj/item/weapon/circuitboard/airalarm
 
 	var/datum/wires/alarm/wires
 

code/game/machinery/autolathe.dm

@@ -26,7 +26,6 @@
 /obj/machinery/autolathe/New()
 	..()
 	wires = new(src)
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)

code/game/machinery/biogenerator.dm

@@ -23,7 +23,6 @@
 	R.my_atom = src
 
 	beaker = new /obj/item/weapon/reagent_containers/glass/bottle(src)
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/game/machinery/cloning.dm

@@ -47,7 +47,6 @@
 
 /obj/machinery/clonepod/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/game/machinery/frame.dm

@@ -1,3 +1,177 @@
+/var/global/list/construction_frame_wall
+/var/global/list/construction_frame_floor
+
+/proc/populate_frame_types()
+	//Create global frame type list if it hasn't been made already.
+	construction_frame_wall = list()
+	construction_frame_floor = list()
+	for(var/R in typesof(/datum/frame/frame_types)-/datum/frame/frame_types)
+		var/datum/frame/frame_types/type = new R
+		if(type.frame_style == "wall")
+			construction_frame_wall += type
+		else
+			construction_frame_floor += type
+
+	var/datum/frame/frame_types/cancel/cancel = new /datum/frame/frame_types/cancel
+	construction_frame_wall += cancel
+	construction_frame_floor += cancel
+
+/datum/frame/frame_types
+	var/name
+	var/frame_size = 5
+	var/frame_class
+	var/circuit
+	var/frame_style = "floor"
+	var/x_offset
+	var/y_offset
+
+/datum/frame/frame_types/computer
+	name = "Computer"
+	frame_class = "computer"
+
+/datum/frame/frame_types/machine
+	name = "Machine"
+	frame_class = "machine"
+
+/datum/frame/frame_types/conveyor
+	name = "Conveyor"
+	frame_class = "machine"
+	circuit = /obj/item/weapon/circuitboard/conveyor
+
+/datum/frame/frame_types/photocopier
+	name = "Photocopier"
+	frame_class = "machine"
+
+/datum/frame/frame_types/washing_machine
+	name = "Washing Machine"
+	frame_class = "machine"
+
+/datum/frame/frame_types/medical_console
+	name = "Medical Console"
+	frame_class = "computer"
+
+/datum/frame/frame_types/medical_pod
+	name = "Medical Pod"
+	frame_class = "machine"
+
+/datum/frame/frame_types/dna_analyzer
+	name = "DNA Analyzer"
+	frame_class = "machine"
+
+/datum/frame/frame_types/mass_driver
+	name = "Mass Driver"
+	frame_class = "machine"
+	circuit = /obj/item/weapon/circuitboard/mass_driver
+
+/datum/frame/frame_types/holopad
+	name = "Holopad"
+	frame_class = "computer"
+	frame_size = 4
+
+/datum/frame/frame_types/microwave
+	name = "Microwave"
+	frame_class = "machine"
+	frame_size = 4
+
+/datum/frame/frame_types/fax
+	name = "Fax"
+	frame_class = "machine"
+	frame_size = 3
+
+/datum/frame/frame_types/recharger
+	name = "Recharger"
+	frame_class = "machine"
+	circuit = /obj/item/weapon/circuitboard/recharger
+	frame_size = 3
+
+/datum/frame/frame_types/grinder
+	name = "Grinder"
+	frame_class = "machine"
+	circuit = /obj/item/weapon/circuitboard/grinder
+	frame_size = 3
+
+/datum/frame/frame_types/display
+	name = "Display"
+	frame_class = "display"
+	frame_style = "wall"
+	x_offset = 32
+	y_offset = 32
+
+/datum/frame/frame_types/supply_request_console
+	name = "Supply Request Console"
+	frame_class = "display"
+	frame_style = "wall"
+	x_offset = 32
+	y_offset = 32
+
+/datum/frame/frame_types/atm
+	name = "ATM"
+	frame_class = "display"
+	frame_size = 3
+	frame_style = "wall"
+	x_offset = 32
+	y_offset = 32
+
+/datum/frame/frame_types/newscaster
+	name = "Newscaster"
+	frame_class = "display"
+	frame_size = 3
+	frame_style = "wall"
+	x_offset = 28
+	y_offset = 30
+
+/datum/frame/frame_types/wall_charger
+	name = "Wall Charger"
+	frame_class = "machine"
+	circuit = /obj/item/weapon/circuitboard/recharger/wrecharger
+	frame_size = 3
+	frame_style = "wall"
+	x_offset = 32
+	y_offset = 32
+
+/datum/frame/frame_types/fire_alarm
+	name = "Fire Alarm"
+	frame_class = "alarm"
+	frame_size = 2
+	frame_style = "wall"
+	x_offset = 24
+	y_offset = 24
+
+/datum/frame/frame_types/air_alarm
+	name = "Air Alarm"
+	frame_class = "alarm"
+	frame_size = 2
+	frame_style = "wall"
+	x_offset = 24
+	y_offset = 24
+
+/datum/frame/frame_types/guest_pass_console
+	name = "Guest Pass Console"
+	frame_class = "display"
+	frame_size = 2
+	frame_style = "wall"
+	x_offset = 30
+	y_offset = 30
+
+/datum/frame/frame_types/intercom
+	name = "Intercom"
+	frame_class = "alarm"
+	frame_size = 2
+	frame_style = "wall"
+	x_offset = 28
+	y_offset = 28
+
+/datum/frame/frame_types/keycard_authenticator
+	name = "Keycard Authenticator"
+	frame_class = "alarm"
+	frame_size = 1
+	frame_style = "wall"
+	x_offset = 24
+	y_offset = 24
+
+/datum/frame/frame_types/cancel //used to get out of input dialogue
+	name = "Cancel"
+
 /obj/structure/frame
 	anchored = 0
 	name = "frame"
@@ -112,7 +286,8 @@
 	else if(istype(P, /obj/item/weapon/circuitboard) && need_circuit && !circuit)
 		if(state == 0 && anchored)
 			var/obj/item/weapon/circuitboard/B = P
-			if(B.board_type == frame_type)
+			var/datum/frame/frame_types/board_type = B.board_type
+			if(board_type.name == frame_type.name)
 				playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 				user << "<span class='notice'>You place the circuit board inside the frame.</span>"
 				circuit = P
@@ -189,6 +364,8 @@
 				B.pixel_y = pixel_y
 				B.set_dir(dir)
 				circuit.construct(B)
+				circuit.loc = null
+				B.circuit = circuit
 				qdel(src)
 				return
 
@@ -201,6 +378,8 @@
 				B.pixel_y = pixel_y
 				B.set_dir(dir)
 				circuit.construct(B)
+				circuit.loc = null
+				B.circuit = circuit
 				qdel(src)
 				return
 
@@ -212,6 +391,8 @@
 				B.pixel_y = pixel_y
 				B.set_dir(dir)
 				circuit.construct(B)
+				circuit.loc = null
+				B.circuit = circuit
 				qdel(src)
 				return
 

code/game/machinery/jukebox.dm

@@ -38,7 +38,6 @@ datum/track/New(var/title_name, var/audio)
 
 /obj/machinery/media/jukebox/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)

code/game/machinery/kitchen/microwave.dm

@@ -30,7 +30,6 @@
 	reagents = new/datum/reagents(100)
 	reagents.my_atom = src
 
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)

code/game/machinery/machinery.dm

@@ -123,6 +123,8 @@ Class Procs:
 	else
 		machines += src
 		machinery_sort_required = 1
+	if(circuit)
+		circuit = new circuit(src)
 
 /obj/machinery/Destroy()
 	machines -= src
@@ -358,7 +360,7 @@ Class Procs:
 
 /obj/machinery/proc/dismantle()
 	playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
-	var/obj/structure/frame/A = new /obj/structure/frame( src.loc )
+	var/obj/structure/frame/A = new /obj/structure/frame(loc)
 	var/obj/item/weapon/circuitboard/M = circuit
 	A.circuit = M
 	A.anchored = 1
@@ -367,18 +369,15 @@ Class Procs:
 	if(A.frame_type.circuit)
 		A.need_circuit = 0
 
-	for (var/obj/D in src.component_parts)
+	if(A.frame_type.frame_class == "machine")
-		D.forceMove(loc)
+		for(var/obj/D in src.component_parts)
-
+			D.forceMove(loc)
-	if(A.components)
+		if(A.components)
-		A.components.Cut()
+			A.components.Cut()
-	else
+		else
-		A.components = list()
+			A.components = list()
-
+		component_parts = list()
-	component_parts = list()
+		A.check_components()
-
-	for(var/obj/C in src)
-		C.forceMove(loc)
 
 	if(A.frame_type.frame_class == "alarm")
 		A.state = 2
@@ -393,7 +392,6 @@ Class Procs:
 	A.set_dir(dir)
 	A.pixel_x = pixel_x
 	A.pixel_y = pixel_y
-	A.check_components()
 	A.update_desc()
 	A.update_icon()
 	M.loc = null

code/game/machinery/mass_driver.dm

@@ -18,7 +18,6 @@
 
 /obj/machinery/mass_driver/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)

code/game/machinery/recharger.dm

@@ -17,7 +17,6 @@ obj/machinery/recharger
 	circuit = /obj/item/weapon/circuitboard/recharger
 
 obj/machinery/recharger/New()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
 	component_parts += new /obj/item/stack/cable_coil(src, 5)

code/game/machinery/rechargestation.dm

@@ -24,7 +24,6 @@
 
 /obj/machinery/recharge_station/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/game/machinery/teleporter.dm

@@ -179,7 +179,6 @@
 	underlays.Cut()
 	underlays += image('icons/obj/stationobjs.dmi', icon_state = "tele-wires")
 
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
@@ -329,7 +328,6 @@
 	overlays.Cut()
 	overlays += image('icons/obj/stationobjs.dmi', icon_state = "controller-wires")
 
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)

code/game/machinery/wall_frames.dm

@@ -1,177 +1,3 @@
-/var/global/list/construction_frame_wall
-/var/global/list/construction_frame_floor
-
-/proc/populate_frame_types()
-	//Create global frame type list if it hasn't been made already.
-	construction_frame_wall = list()
-	construction_frame_floor = list()
-	for(var/R in typesof(/datum/frame/frame_types)-/datum/frame/frame_types)
-		var/datum/frame/frame_types/type = new R
-		if(type.frame_style == "wall")
-			construction_frame_wall += type
-		else
-			construction_frame_floor += type
-
-	var/datum/frame/frame_types/cancel/cancel = new /datum/frame/frame_types/cancel
-	construction_frame_wall += cancel
-	construction_frame_floor += cancel
-
-/datum/frame/frame_types
-	var/name
-	var/frame_size = 5
-	var/frame_class
-	var/circuit
-	var/frame_style = "floor"
-	var/x_offset
-	var/y_offset
-
-/datum/frame/frame_types/computer
-	name = "Computer"
-	frame_class = "computer"
-
-/datum/frame/frame_types/machine
-	name = "Machine"
-	frame_class = "machine"
-
-/datum/frame/frame_types/conveyor
-	name = "Conveyor"
-	frame_class = "machine"
-	circuit = /obj/item/weapon/circuitboard/conveyor
-
-/datum/frame/frame_types/photocopier
-	name = "Photocopier"
-	frame_class = "machine"
-
-/datum/frame/frame_types/washing_machine
-	name = "Washing Machine"
-	frame_class = "machine"
-
-/datum/frame/frame_types/medical_console
-	name = "Medical Console"
-	frame_class = "computer"
-
-/datum/frame/frame_types/medical_pod
-	name = "Medical Pod"
-	frame_class = "machine"
-
-/datum/frame/frame_types/dna_analyzer
-	name = "DNA Analyzer"
-	frame_class = "machine"
-
-/datum/frame/frame_types/mass_driver
-	name = "Mass Driver"
-	frame_class = "machine"
-	circuit = /obj/item/weapon/circuitboard/mass_driver
-
-/datum/frame/frame_types/holopad
-	name = "Holopad"
-	frame_class = "computer"
-	frame_size = 4
-
-/datum/frame/frame_types/microwave
-	name = "Microwave"
-	frame_class = "machine"
-	frame_size = 4
-
-/datum/frame/frame_types/fax
-	name = "Fax"
-	frame_class = "machine"
-	frame_size = 3
-
-/datum/frame/frame_types/recharger
-	name = "Recharger"
-	frame_class = "machine"
-	circuit = /obj/item/weapon/circuitboard/recharger
-	frame_size = 3
-
-/datum/frame/frame_types/grinder
-	name = "Grinder"
-	frame_class = "machine"
-	circuit = /obj/item/weapon/circuitboard/grinder
-	frame_size = 3
-
-/datum/frame/frame_types/display
-	name = "Display"
-	frame_class = "display"
-	frame_style = "wall"
-	x_offset = 32
-	y_offset = 32
-
-/datum/frame/frame_types/supply_request_console
-	name = "Supply Request Console"
-	frame_class = "display"
-	frame_style = "wall"
-	x_offset = 32
-	y_offset = 32
-
-/datum/frame/frame_types/atm
-	name = "ATM"
-	frame_class = "display"
-	frame_size = 3
-	frame_style = "wall"
-	x_offset = 32
-	y_offset = 32
-
-/datum/frame/frame_types/newscaster
-	name = "Newscaster"
-	frame_class = "display"
-	frame_size = 3
-	frame_style = "wall"
-	x_offset = 28
-	y_offset = 30
-
-/datum/frame/frame_types/wall_charger
-	name = "Wall Charger"
-	frame_class = "machine"
-	circuit = /obj/item/weapon/circuitboard/recharger/wrecharger
-	frame_size = 3
-	frame_style = "wall"
-	x_offset = 32
-	y_offset = 32
-
-/datum/frame/frame_types/fire_alarm
-	name = "Fire Alarm"
-	frame_class = "alarm"
-	frame_size = 2
-	frame_style = "wall"
-	x_offset = 24
-	y_offset = 24
-
-/datum/frame/frame_types/air_alarm
-	name = "Air Alarm"
-	frame_class = "alarm"
-	frame_size = 2
-	frame_style = "wall"
-	x_offset = 24
-	y_offset = 24
-
-/datum/frame/frame_types/guest_pass_console
-	name = "Guest Pass Console"
-	frame_class = "display"
-	frame_size = 2
-	frame_style = "wall"
-	x_offset = 30
-	y_offset = 30
-
-/datum/frame/frame_types/intercom
-	name = "Intercom"
-	frame_class = "alarm"
-	frame_size = 2
-	frame_style = "wall"
-	x_offset = 28
-	y_offset = 28
-
-/datum/frame/frame_types/keycard_authenticator
-	name = "Keycard Authenticator"
-	frame_class = "alarm"
-	frame_size = 1
-	frame_style = "wall"
-	x_offset = 24
-	y_offset = 24
-
-/datum/frame/frame_types/cancel //used to get out of input dialogue
-	name = "Cancel"
-
 /obj/item/frame
 	name = "frame parts"
 	desc = "Used for building frames."

code/game/machinery/washing_machine.dm

@@ -27,7 +27,6 @@
 
 /obj/machinery/washing_machine/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)
 	component_parts += new /obj/item/weapon/stock_parts/gear(src)

code/game/mecha/mech_fabricator.dm

@@ -27,7 +27,6 @@
 
 /obj/machinery/mecha_part_fabricator/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)

code/game/mecha/mech_prosthetics.dm

@@ -28,7 +28,6 @@
 
 /obj/machinery/pros_fabricator/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)

code/game/objects/items/devices/radio/intercom.dm

@@ -46,6 +46,7 @@
 /obj/item/device/radio/intercom/New()
 	..()
 	processing_objects += src
+	circuit = new circuit(src)
 
 /obj/item/device/radio/intercom/department/medbay/New()
 	..()
@@ -96,20 +97,18 @@
 		else
 			icon_state = "intercom"
 		return
-	if (wiresexposed && istype(W, /obj/item/weapon/wirecutters))
+	if(wiresexposed && istype(W, /obj/item/weapon/wirecutters))
 		user.visible_message("<span class='warning'>[user] has cut the wires inside \the [src]!</span>", "You have cut the wires inside \the [src].")
 		playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
 		new/obj/item/stack/cable_coil(get_turf(src), 5)
 		var/obj/structure/frame/A = new /obj/structure/frame(loc)
-		var/obj/item/weapon/circuitboard/M = new circuit(A)
+		var/obj/item/weapon/circuitboard/M = circuit
 		A.frame_type = M.board_type
 		A.pixel_x = pixel_x
 		A.pixel_y = pixel_y
 		A.circuit = M
 		A.set_dir(dir)
 		A.anchored = 1
-		for (var/obj/C in src)
-			C.forceMove(loc)
 		A.state = 2
 		A.update_icon()
 		M.deconstruct(src)

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

@@ -25,13 +25,13 @@
 
 //Called when the circuitboard is used to contruct a new machine.
 /obj/item/weapon/circuitboard/proc/construct(var/obj/machinery/M)
-	if (istype(M, build_path))
+	if(istype(M, build_path))
 		return 1
 	return 0
 
 //Called when a computer is deconstructed to produce a circuitboard.
 //Only used by computers, as other machines store their circuitboard instance.
 /obj/item/weapon/circuitboard/proc/deconstruct(var/obj/machinery/M)
-	if (istype(M, build_path))
+	if(istype(M, build_path))
 		return 1
 	return 0

code/modules/detectivework/microscope/dnascanner.dm

@@ -17,7 +17,6 @@
 	var/report_num = 0
 
 /obj/machinery/dnaforensics/New()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)

code/modules/mining/drilling/drill.dm

@@ -42,7 +42,6 @@
 /obj/machinery/mining/drill/New()
 
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(src)

code/modules/paperwork/photocopier.dm

@@ -16,7 +16,6 @@
 	var/maxcopies = 10	//how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
 
 /obj/machinery/photocopier/New()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)

code/modules/recycling/conveyor2.dm

@@ -38,7 +38,6 @@
 		operating = 1
 		setmove()
 
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/gear(src)
 	component_parts += new /obj/item/weapon/stock_parts/motor(src)

code/modules/research/circuitprinter.dm

@@ -24,7 +24,6 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 
 /obj/machinery/r_n_d/circuit_imprinter/New()
 	..()
-	circuit = new circuit()
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/modules/research/destructive_analyzer.dm

@@ -18,7 +18,6 @@ Note: Must be placed within 3 tiles of the R&D Console
 
 /obj/machinery/r_n_d/destructive_analyzer/New()
 	..()
-	circuit = new circuit()
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/modules/research/protolathe.dm

@@ -19,7 +19,6 @@
 
 /obj/machinery/r_n_d/protolathe/New()
 	..()
-	circuit = new circuit()
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)

code/modules/research/server.dm

@@ -17,7 +17,6 @@
 
 /obj/machinery/r_n_d/server/New()
 	..()
-	circuit = new circuit()
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/stack/cable_coil(src)

code/modules/xenobio2/machinery/core_extractor.dm

@@ -21,7 +21,6 @@
 /obj/machinery/slime/extractor/New()
 	..()
 	update_light_color()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/modules/xenobio2/machinery/gene_manipulators.dm

@@ -125,7 +125,6 @@
 	
 /obj/machinery/xenobio/extractor/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
@@ -268,7 +267,6 @@
 	
 /obj/machinery/xenobio/editor/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

code/modules/xenobio2/machinery/injector.dm

@@ -25,7 +25,6 @@
 	reagents = R
 	R.my_atom = src
 	beaker = new /obj/item/weapon/reagent_containers/glass/beaker(src)
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
 	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)

code/modules/xenobio2/machinery/slime_replicator.dm

@@ -19,7 +19,6 @@
 	
 /obj/machinery/slime/replicator/New()
 	..()
-	circuit = new circuit(src)
 	component_parts = list()
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
 	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)