Merge pull request #2489 from Fox-McCloud/circuit-board-pathing

Circuit Board Repathing and Swarmer Fixes

code/modules/atmos_automation/console.dm

@@ -2,7 +2,7 @@
 	icon = 'icons/obj/computer.dmi'
 	icon_screen = "area_atmos"
 	icon_keyboard = "atmos_key"
-	circuit = "/obj/item/weapon/circuitboard/atmos_automation"
+	circuit = /obj/item/weapon/circuitboard/atmos_automation
 	req_one_access_txt = "24;10"
 	Mtoollink = 1
 

code/modules/computer3/computers/law.dm

@@ -4,7 +4,6 @@
 	name = "AI Upload"
 	desc = "Used to upload laws to the AI."
 	icon_state = "frame-rnd"
-	circuit = "/obj/item/part/board/circuit/aiupload"
 	var/mob/living/silicon/ai/current = null
 	var/opened = 0
 
@@ -56,7 +55,6 @@
 	name = "Cyborg Upload"
 	desc = "Used to upload laws to Cyborgs."
 	icon_state = "frame-rnd"
-	circuit = "/obj/item/part/board/circuit/borgupload"
 	var/mob/living/silicon/robot/current = null
 
 

code/modules/mining/laborcamp/laborshuttle.dm

@@ -69,7 +69,7 @@ proc/move_labor_shuttle() //TODO: Security Access only; add moving the shuttle t
 	name = "Labor Shuttle Console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
-	circuit = "/obj/item/weapon/circuitboard/labor_shuttle"
+	circuit = /obj/item/weapon/circuitboard/labor_shuttle
 	var/location = 0 //0 = station, 1 = labor camp
 	req_access = list(access_brig)
 	var/hacked = 0
@@ -114,7 +114,7 @@ proc/move_labor_shuttle() //TODO: Security Access only; add moving the shuttle t
 /obj/machinery/computer/labor_shuttle/one_way
 	name = "Prisoner Shuttle Console"
 	desc = "A one-way shuttle console, used to summon the shuttle to the labor camp."
-	circuit = "/obj/item/weapon/circuitboard/one_way_shuttle"
+	circuit = /obj/item/weapon/circuitboard/labor_shuttle/one_way
 	req_access = list( )
 
 /obj/machinery/computer/labor_shuttle/one_way/attack_hand(user as mob)

code/modules/mob/living/silicon/robot/drone/drone_console.dm

@@ -4,7 +4,7 @@
 	icon_screen = "power"
 	icon_keyboard = "power_key"
 	req_access = list(access_engine_equip)
-	circuit = "/obj/item/weapon/circuitboard/drone_control"
+	circuit = /obj/item/weapon/circuitboard/drone_control
 
 	//Used when pinging drones.
 	var/drone_call_area = "Engineering"

code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm

@@ -227,6 +227,9 @@
 /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource
 	S << "<span class='warning'>This object does not contain enough materials to work with.</span>"
 
+/obj/item/weapon/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+	S << "<span class='warning'>This object does not contain enough materials to work with.</span>"
+
 /obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
 	S << "<span class='warning'>Attempting to dismantle this machine would result in an immediate counterattack. Aborting.</span>"
 
@@ -323,8 +326,7 @@
 		if(istype(target, /obj/machinery/computer))
 			var/obj/machinery/computer/C = target
 			if(C.circuit)
-				var/obj/item/weapon/circuitboard/circuit = text2path(C.circuit)
-				new circuit(get_turf(M))
+				new C.circuit(get_turf(M))
 		qdel(target)
 
 

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

@@ -15,7 +15,7 @@ datum/genesequence
 	icon = 'icons/obj/computer.dmi'
 	icon_keyboard = "med_key"
 	icon_screen = "dna"
-	circuit = "/obj/item/weapon/circuitboard/reconstitutor"
+	circuit = /obj/item/weapon/circuitboard/reconstitutor
 	req_access = list(access_heads) //Only used for record deletion right now.
 	var/obj/machinery/clonepod/pod1 = 1 //Linked cloning pod.
 	var/temp = ""
@@ -42,7 +42,7 @@ datum/genesequence
 	name = "Fauna reconstitution console"
 	accepted_fossil_types = list(/obj/item/weapon/fossil/bone,/obj/item/weapon/fossil/shell,/obj/item/weapon/fossil/skull)
 	pod1 = null
-	circuit = "/obj/item/weapon/circuitboard/reconstitutor/animal"
+	circuit = /obj/item/weapon/circuitboard/reconstitutor/animal
 
 /obj/machinery/computer/reconstitutor/animal/initialize()
 	undiscovered_genesequences = master_controller.all_animal_genesequences.Copy()

code/modules/shuttles/whiteship.dm

@@ -2,7 +2,7 @@
 	name = "medical ship control console"
 	req_access = list()
 	shuttle_tag = "White Ship"
-	circuit = "/obj/item/weapon/circuitboard/white_ship"
+	circuit = /obj/item/weapon/circuitboard/white_ship
 	light_color = LIGHT_COLOR_DARKRED
 
 /obj/machinery/computer/shuttle_control/multi/whiteship/attack_ai(user as mob)