diff --git a/code/ATMOSPHERICS/he_pipes.dm b/code/ATMOSPHERICS/he_pipes.dm
index 991eed26913..678ef6660c0 100644
--- a/code/ATMOSPHERICS/he_pipes.dm
+++ b/code/ATMOSPHERICS/he_pipes.dm
@@ -1,3 +1,6 @@
+////////////
+//HE Pipes
+////////////
 
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging
 	icon = 'icons/obj/pipes/heat.dmi'
@@ -12,9 +15,27 @@
 
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/New()
 	..()
-	initialize_directions_he = initialize_directions	// The auto-detection from /pipe is good enough for a simple HE pipe
 	color = "#404040"
 
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/SetInitDirections()
+	switch(dir)
+		if(SOUTH)
+			initialize_directions_he = SOUTH|NORTH
+		if(NORTH)
+			initialize_directions_he = SOUTH|NORTH
+		if(EAST)
+			initialize_directions_he = EAST|WEST
+		if(WEST)
+			initialize_directions_he = WEST|EAST
+		if(NORTHEAST)
+			initialize_directions_he = NORTH|EAST
+		if(NORTHWEST)
+			initialize_directions_he = NORTH|WEST
+		if(SOUTHEAST)
+			initialize_directions_he = SOUTH|EAST
+		if(SOUTHWEST)
+			initialize_directions_he = SOUTH|WEST
+
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/initialize()
 	normalize_dir()
 	var/N = 2
@@ -77,7 +98,9 @@
 
 			animate(src, color = rgb(h_r, h_g, h_b), time = 20, easing = SINE_EASING)
 
-
+////////////////
+//HE Junctions
+////////////////
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
 	icon = 'icons/obj/pipes/junction.dmi'
 	icon_state = "intact"
@@ -85,9 +108,6 @@
 	minimum_temperature_difference = 300
 	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
 
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/New()
-	..()
-
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/SetInitDirections()
 	switch(dir)
 		if(SOUTH)