diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm
index 06bc2238ad..b005d0dd64 100644
--- a/code/game/objects/items/RPD.dm
+++ b/code/game/objects/items/RPD.dm
@@ -194,6 +194,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 	var/static/datum/pipe_info/first_atmos
 	var/static/datum/pipe_info/first_disposal
 	var/static/datum/pipe_info/first_transit
+	var/autowrench = FALSE
 
 /obj/item/pipe_dispenser/New()
 	. = ..()
@@ -358,6 +359,8 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 					activate()
 					var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(A))
 					PM.setAttachLayer(temp_piping_layer)
+					if(autowrench)
+						PM.wrench_act(user, src)
 			else
 				to_chat(user, "<span class='notice'>You start building a pipe...</span>")
 				if(do_after(user, 2, target = A))
@@ -374,7 +377,9 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 					P.add_fingerprint(usr)
 					P.setPipingLayer(temp_piping_layer)
 					P.add_atom_colour(GLOB.pipe_paint_colors[paint_color], FIXED_COLOUR_PRIORITY)
-			
+					if(autowrench)
+						P.wrench_act(user, src)
+
 		if(DISPOSALS_MODE) //Making disposals pipes
 			if(!can_make_pipe)
 				return ..()
@@ -426,6 +431,11 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 		else
 			return ..()
 
+/obj/item/pipe_dispenser/AltClick(mob/living/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+	autowrench = !autowrench
+	to_chat(user, "<span class='notice'>You [autowrench ? "enable" : "disable"] auto wrenching.</span>")
 
 /obj/item/pipe_dispenser/proc/activate()
 	playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1)