diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index a7d857844a..c857ddaf16 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -10,9 +10,9 @@
 	max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons)
 	CanAtmosPass = ATMOS_PASS_DENSITY
 
-/obj/structure/emergency_shield/New()
-	src.setDir(pick(1,2,3,4))
-	..()
+/obj/structure/emergency_shield/Initialize()
+	. = ..()
+	setDir(pick(GLOB.cardinals))
 	air_update_turf(1)
 
 /obj/structure/emergency_shield/Destroy()
diff --git a/code/game/machinery/shieldgen.dm.rej b/code/game/machinery/shieldgen.dm.rej
new file mode 100644
index 0000000000..12ce2d21dc
--- /dev/null
+++ b/code/game/machinery/shieldgen.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm	(rejected hunks)
+@@ -12,7 +12,7 @@
+ 
+ /obj/structure/emergency_shield/Initialize()
+ 	. = ..()
+-	setDir(pick(1,2,3,4))
++	setDir(pick(GLOB.cardinals))
+ 	air_update_turf(1)
+ 
+ /obj/structure/emergency_shield/Destroy()