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

[MIRROR] Refactors and fixes RPEDs

code/modules/power/port_gen.dm

@@ -173,9 +173,6 @@
 		return
 	else if(!active)
 
-		if(exchange_parts(user, O))
-			return
-
 		if(istype(O, /obj/item/wrench))
 
 			if(!anchored && !isinspace())

code/modules/power/rtg.dm

@@ -38,9 +38,7 @@
 	power_gen = initial(power_gen) * part_level
 
 /obj/machinery/power/rtg/attackby(obj/item/I, mob/user, params)
-	if(exchange_parts(user, I))
-		return
-	else if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I))
+	if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-open", initial(icon_state), I))
 		return
 	else if(default_deconstruction_crowbar(I))
 		return

code/modules/power/singularity/emitter.dm

@@ -291,9 +291,6 @@
 		wires.interact(user)
 		return
 
-	else if(exchange_parts(user, I))
-		return
-
 	return ..()
 
 /obj/machinery/power/emitter/emag_act(mob/user)

code/modules/power/smes.dm

@@ -98,10 +98,6 @@
 		update_icon()
 		return
 
-	//exchanging parts using the RPE
-	if(exchange_parts(user, I))
-		return
-
 	//building and linking a terminal
 	if(istype(I, /obj/item/stack/cable_coil))
 		var/dir = get_dir(user,src)

code/modules/power/tesla/coil.dm

@@ -56,9 +56,6 @@
 	if(default_deconstruction_screwdriver(user, "coil_open[anchored]", "coil[anchored]", W))
 		return
 
-	if(exchange_parts(user, W))
-		return
-
 	if(default_unfasten_wrench(user, W))
 		return
 
@@ -169,9 +166,6 @@
 	if(default_deconstruction_screwdriver(user, "grounding_rod_open[anchored]", "grounding_rod[anchored]", W))
 		return
 
-	if(exchange_parts(user, W))
-		return
-
 	if(default_unfasten_wrench(user, W))
 		return
 

code/modules/power/turbine.dm

@@ -112,9 +112,6 @@
 			stat |= BROKEN
 		return
 
-	if(exchange_parts(user, I))
-		return
-
 	default_deconstruction_crowbar(I)
 
 /obj/machinery/power/compressor/process()
@@ -243,9 +240,6 @@
 			stat |= BROKEN
 		return
 
-	if(exchange_parts(user, I))
-		return
-
 	default_deconstruction_crowbar(I)
 
 /obj/machinery/power/turbine/ui_interact(mob/user)