Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380

[MIRROR] Refactors and fixes RPEDs

code/game/machinery/Sleeper.dm

@@ -93,8 +93,6 @@
 			return
 	if(default_change_direction_wrench(user, I))
 		return
-	if(exchange_parts(user, I))
-		return
 	if(default_pry_open(I))
 		return
 	if(default_deconstruction_crowbar(I))

code/game/machinery/autolathe.dm

@@ -93,9 +93,6 @@
 		updateUsrDialog()
 		return TRUE
 
-	if(exchange_parts(user, O))
-		return TRUE
-
 	if(default_deconstruction_crowbar(O))
 		return TRUE
 

code/game/machinery/cloning.dm

@@ -282,9 +282,6 @@
 		if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W))
 			return
 
-	if(exchange_parts(user, W))
-		return
-
 	if(default_deconstruction_crowbar(W))
 		return
 

code/game/machinery/dna_scanner.dm

@@ -133,9 +133,6 @@
 		update_icon()//..since we're updating the icon here, since the scanner can be unpowered when opened/closed
 		return
 
-	if(exchange_parts(user, I))
-		return
-
 	if(default_pry_open(I))
 		return
 

code/game/machinery/hologram.dm

@@ -146,9 +146,6 @@ Possible to do for anyone motivated enough:
 	if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P))
 		return
 
-	if(exchange_parts(user, P))
-		return
-
 	if(default_pry_open(P))
 		return
 

code/game/machinery/launch_pad.dm

@@ -37,9 +37,6 @@
 				to_chat(user, "<span class='notice'>You save the data in the [I.name]'s buffer.</span>")
 				return 1
 
-		if(exchange_parts(user, I))
-			return
-
 		if(default_deconstruction_crowbar(I))
 			return
 

code/game/machinery/limbgrower.dm

@@ -70,9 +70,6 @@
 		updateUsrDialog()
 		return
 
-	if(exchange_parts(user, O))
-		return
-
 	if(panel_open && default_deconstruction_crowbar(O))
 		return
 

code/game/machinery/quantum_pad.dm

@@ -60,9 +60,6 @@
 			to_chat(user, "<span class='notice'>You link [src] to the one in [I]'s buffer.</span>")
 			return 1
 
-	if(exchange_parts(user, I))
-		return
-
 	if(default_deconstruction_crowbar(I))
 		return
 

code/game/machinery/recharger.dm

@@ -68,8 +68,6 @@
 			default_deconstruction_crowbar(G)
 			return
 
-		if(exchange_parts(user, G))
-			return
 	return ..()
 
 /obj/machinery/recharger/attack_hand(mob/user)

code/game/machinery/rechargestation.dm

@@ -54,9 +54,6 @@
 		if(default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P))
 			return
 
-	if(exchange_parts(user, P))
-		return
-
 	if(default_pry_open(P))
 		return
 

code/game/machinery/recycler.dm

@@ -55,9 +55,6 @@
 	if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
 		return
 
-	if(exchange_parts(user, I))
-		return
-
 	if(default_pry_open(I))
 		return
 

code/game/machinery/spaceheater.dm

@@ -156,7 +156,7 @@
 		update_icon()
 		if(panel_open)
 			interact(user)
-	else if(exchange_parts(user, I) || default_deconstruction_crowbar(I))
+	else if(default_deconstruction_crowbar(I))
 		return
 	else
 		return ..()

code/game/machinery/telecomms/machine_interactions.dm

@@ -18,10 +18,6 @@
 
 	if(default_deconstruction_screwdriver(user, icon_open, icon_closed, P))
 		return
-
-	else if(exchange_parts(user, P))
-		return
-
 	// Using a multitool lets you access the receiver's interface
 	else if(istype(P, /obj/item/device/multitool))
 		attack_hand(user)

code/game/machinery/teleporter.dm

@@ -55,8 +55,6 @@
 			power_station.engaged = 0 //hub with panel open is off, so the station must be informed.
 			update_icon()
 		return
-	if(exchange_parts(user, W))
-		return
 	if(default_deconstruction_crowbar(W))
 		return
 	return ..()
@@ -169,9 +167,6 @@
 		update_icon()
 		return
 
-	else if(exchange_parts(user, W))
-		return
-
 	else if(default_deconstruction_crowbar(W))
 		return
 

code/game/mecha/mech_bay.dm

@@ -64,9 +64,6 @@
 		recharging_turf = get_step(loc, dir)
 		return
 
-	if(exchange_parts(user, I))
-		return
-
 	if(default_deconstruction_crowbar(I))
 		return
 	return ..()

code/game/mecha/mech_fabricator.dm

@@ -401,9 +401,6 @@
 	if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W))
 		return TRUE
 
-	if(exchange_parts(user, W))
-		return TRUE
-
 	if(default_deconstruction_crowbar(W))
 		return TRUE