Merge pull request #253 from GhostAA12/master

Fixes the Rapid Parts Exchange device

code/modules/research/circuitprinter.dm

@@ -50,6 +50,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 		return g_amount + gold_amount + diamond_amount + uranium_amount
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
+		if(exchange_parts(user, O))
+			return
 		if (shocked)
 			shock(user,50)
 		if (istype(O, /obj/item/weapon/screwdriver))

code/modules/research/destructive_analyzer.dm

@@ -99,6 +99,9 @@ Note: Must be placed within 3 tiles of the R&D Console
 		spawn(10)
 			icon_state = "d_analyzer_l"
 			busy = 0
+
+	if(exchange_parts(user, O))
+		return
 	return
 
 //For testing purposes only.

code/modules/research/protolathe.dm

@@ -53,6 +53,8 @@ Note: Must be placed west/left of and R&D console to function.
 	max_material_storage = T * 75000
 
 /obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(exchange_parts(user, O))
+		return
 	if (shocked)
 		shock(user,50)
 	if (O.is_open_container())

code/modules/research/server.dm

@@ -121,6 +121,8 @@
 				env.merge(removed)
 
 /obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(exchange_parts(user, O))
+		return
 	if (disabled)
 		return
 	if (shocked)