diff --git a/baystation12.dme b/baystation12.dme
index 187127d978..7f99970aa3 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -61,6 +61,7 @@
 #include "code\ATMOSPHERICS\components\binary_devices\circulator.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\dp_vent_pump.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\passive_gate.dm"
+#include "code\ATMOSPHERICS\components\binary_devices\pipeturbine.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\pump.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\volume_pump.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\filter.dm"
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 82e05e954b..d6dd157e81 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -50,6 +50,9 @@
 		turbine = locate() in get_step(src, get_dir(inturf, src))
 		if(!turbine)
 			stat |= BROKEN
+		else
+			turbine.stat &= !BROKEN
+			turbine.compressor = src
 
 
 #define COMPFRICTION 5e5
@@ -104,6 +107,9 @@
 		compressor = locate() in get_step(src, get_dir(outturf, src))
 		if(!compressor)
 			stat |= BROKEN
+		else
+			compressor.stat &= !BROKEN
+			compressor.turbine = src
 
 
 #define TURBPRES 9000000
diff --git a/icons/obj/pipeturbine.dmi b/icons/obj/pipeturbine.dmi
new file mode 100644
index 0000000000..fccec4c9dd
Binary files /dev/null and b/icons/obj/pipeturbine.dmi differ