From 275eeb440002d0a8eac54fc49ad6e7e4a0df5ca0 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Wed, 10 Jun 2020 10:44:22 -0400
Subject: [PATCH] Fix bug with in-round constructed teleporters

---
 code/game/machinery/teleporter.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 1cf1e901fb9..31dd9d2e130 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -18,10 +18,10 @@
 	..()
 	underlays.Cut()
 	underlays += image('icons/obj/stationobjs_vr.dmi', icon_state = "telecomp-wires")	//VOREStation Edit: different direction for wires to account for dirs
-	teleport_control = new(src)
 
 /obj/machinery/computer/teleporter/Initialize()
 	. = ..()
+	teleport_control = new(src)
 	var/obj/machinery/teleport/station/station = null
 	var/obj/machinery/teleport/hub/hub = null