Merge pull request #2357 from SinTwo/framecleanup2

Frame Cleanup + Machinery Code Cleanup

code/modules/paperwork/filingcabinet.dm

@@ -30,7 +30,6 @@
 		if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle))
 			I.loc = src
 
-
 /obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob)
 	if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle))
 		user << "<span class='notice'>You put [P] in [src].</span>"
@@ -57,7 +56,6 @@
 	else
 		user << "<span class='notice'>You can't put [P] in [src]!</span>"
 
-
 /obj/structure/filingcabinet/attack_hand(mob/user as mob)
 	if(contents.len <= 0)
 		user << "<span class='notice'>\The [src] is empty.</span>"
@@ -103,7 +101,6 @@
 				sleep(5)
 				icon_state = initial(icon_state)
 
-
 /*
  * Security Record Cabinets
  */

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)