Revert "Revert "Frame Cleanup""

This reverts commit 82722ba42f.

code/game/objects/items/devices/multitool.dm

@@ -21,8 +21,8 @@
 	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
 	var/obj/machinery/clonepod/connecting //same for cryopod linkage
-	var/obj/machinery/connectable	//Used to connect machinery, currently only used by Xenobio2.
-	
+	var/obj/machinery/connectable	//Used to connect machinery.
+
 /obj/item/device/multitool/attack_self(mob/user)
 	var/clear = alert("Do you want to clear the buffers on the [src]?",, "Yes", "No",)
 	if(clear == "Yes")

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()
 	..()
@@ -84,7 +85,7 @@
 		attack_self(user)
 
 /obj/item/device/radio/intercom/attackby(obj/item/W as obj, mob/user as mob)
-	src.add_fingerprint(user)
+	add_fingerprint(user)
 	if(istype(W, /obj/item/weapon/screwdriver))  // Opening the intercom up.
 		wiresexposed = !wiresexposed
 		user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
@@ -96,22 +97,20 @@
 		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(src.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( src.loc )
-		var/obj/item/weapon/circuitboard/M = new circuit( A )
-		A.frame_type = "intercom"
+		var/obj/structure/frame/A = new /obj/structure/frame(src.loc)
+		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.icon_state = "intercom_2"
+		A.update_icon()
 		M.deconstruct(src)
 		qdel(src)
 	else
@@ -175,4 +174,4 @@
 
 /obj/item/device/radio/intercom/locked/confessional
 	name = "confessional intercom"
-	frequency = 1480
+	frequency = 1480