diff --git a/baystation12.dme b/baystation12.dme
index dde7faf436..997494b4b0 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -52,6 +52,7 @@
 #include "code\ATMOSPHERICS\datum_pipe_network.dm"
 #include "code\ATMOSPHERICS\datum_pipeline.dm"
 #include "code\ATMOSPHERICS\he_pipes.dm"
+#include "code\ATMOSPHERICS\mainspipe.dm"
 #include "code\ATMOSPHERICS\pipes.dm"
 #include "code\ATMOSPHERICS\components\portables_connector.dm"
 #include "code\ATMOSPHERICS\components\tvalve.dm"
diff --git a/code/WorkInProgress/Tastyfish/mainspipe.dm b/code/ATMOSPHERICS/mainspipe.dm
similarity index 99%
rename from code/WorkInProgress/Tastyfish/mainspipe.dm
rename to code/ATMOSPHERICS/mainspipe.dm
index e2b3acde64..631f3530a2 100644
--- a/code/WorkInProgress/Tastyfish/mainspipe.dm
+++ b/code/ATMOSPHERICS/mainspipe.dm
@@ -36,8 +36,9 @@ obj/machinery/atmospherics/mains_pipe
 	icon = 'icons/obj/atmospherics/mainspipe.dmi'
 	layer = 2.4 //under wires with their 2.5
 
+	force = 20
+	
 	var/volume = 0
-	var/force = 20
 
 	var/alert_pressure = 80*ONE_ATMOSPHERE
 
@@ -535,6 +536,8 @@ obj/machinery/atmospherics/mains_pipe/cap
 		level = 2
 		icon_state = "cap"
 
+//TODO: Get Mains valves working!
+/*
 obj/machinery/atmospherics/mains_pipe/valve
 	icon_state = "mvalve0"
 
@@ -700,4 +703,5 @@ obj/machinery/atmospherics/mains_pipe/valve
 					if(open)
 						close()
 					else
-						open()
\ No newline at end of file
+						open()
+*/
\ No newline at end of file
diff --git a/icons/obj/atmospherics/mainspipe.dmi b/icons/obj/atmospherics/mainspipe.dmi
index e6b2dae0d0..4518a5b0a7 100644
Binary files a/icons/obj/atmospherics/mainspipe.dmi and b/icons/obj/atmospherics/mainspipe.dmi differ