diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm
index 75334ffa9b..96e95c7451 100644
--- a/code/datums/supplypacks/atmospherics.dm
+++ b/code/datums/supplypacks/atmospherics.dm
@@ -82,6 +82,14 @@
 	containername = "Disposal Dispenser Crate"
 	access = access_atmospherics
 
+/datum/supply_pack/atmos/rapid_pipe_dispenser
+	contains = list(/obj/item/pipe_dispenser)
+	name = "Rapid Pipe Dispenser"
+	cost = 100
+	containertype = /obj/structure/closet/crate/secure/aether
+	containername = "Rapid Pipe Dispenser Crate"
+	access = access_atmospherics
+
 /datum/supply_pack/atmos/internals
 	name = "Internals crate"
 	contains = list(
diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm
index e14d49247c..4e32d69bb0 100644
--- a/code/game/objects/items/weapons/RPD.dm
+++ b/code/game/objects/items/weapons/RPD.dm
@@ -53,7 +53,7 @@
 /obj/item/pipe_dispenser/proc/SetupPipes()
 	if(!first_atmos)
 		first_atmos = GLOB.atmos_pipe_recipes[GLOB.atmos_pipe_recipes[1]][1]
-		recipe = first_atmos
+	recipe = first_atmos
 	if(!first_disposal)
 		first_disposal = GLOB.disposal_pipe_recipes[GLOB.disposal_pipe_recipes[1]][1]
 
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index 6707d905aa..b62fbe3089 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -433,6 +433,7 @@ var/global/list/robot_modules = list(
 	src.emag = new /obj/item/melee/baton/robot/arm(src)
 	src.modules += new /obj/item/geiger(src)
 	src.modules += new /obj/item/rcd/electric/mounted/borg(src)
+	src.modules += new /obj/item/pipe_dispenser(src)
 	src.modules += new /obj/item/pickaxe/plasmacutter(src)
 	src.modules += new /obj/item/gripper/no_use/loader(src)
 
@@ -971,6 +972,8 @@ var/global/list/robot_modules = list(
 	P.synths = list(plastic)
 	src.modules += P
 
+	src.modules += new /obj/item/pipe_dispenser(src)	// At the end to go beside the construction's RCD.
+
 /obj/item/robot_module/drone/construction
 	name = "construction drone module"
 	hide_on_manifest = TRUE