diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 68c23322f7..d4f312a50b 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -31,6 +31,12 @@
 			latejoin_gateway += loc
 			delete_me = 1
 			return
+		//CHOMPEdit Begin
+		if("JoinLateStationGateway")
+			latejoin_gatewaystation += loc
+			delete_me = 1
+			return
+		//CHOMPEdit End
 		if("JoinLateElevator")
 			latejoin_elevator += loc
 			delete_me = 1
diff --git a/code/global_ch.dm b/code/global_ch.dm
index 80580a991e..09ed953a16 100644
--- a/code/global_ch.dm
+++ b/code/global_ch.dm
@@ -1,4 +1,5 @@
 
 var/list/shell_module_blacklist = list(
 	"Sci-borg", "Research"
-	)
\ No newline at end of file
+	)
+var/list/latejoin_gatewaystation = list()
\ No newline at end of file
diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm
index 29d5be49e5..e990ee1793 100644
--- a/code/modules/client/preferences_spawnpoints.dm
+++ b/code/modules/client/preferences_spawnpoints.dm
@@ -31,7 +31,7 @@ var/list/spawntypes = list()
 
 		if(!(J.mob_type & allowed_mob_types))
 			return 0
-
+		
 		return 1
 
 /datum/spawnpoint/proc/get_spawn_position()
@@ -77,15 +77,4 @@ var/list/spawntypes = list()
 
 /datum/spawnpoint/cyborg/New()
 	..()
-	turfs = latejoin_cyborg
-
-//KSC test
-/*
-/datum/spawnpoint/stationgateway
-	display_name = "Station gateway"
-	msg = "has completed translation from station gateway"
-
-/datum/spawnpoint/stationgateway/New()
-	..()
-	turfs = latejoin_stationgateway
-*/
\ No newline at end of file
+	turfs = latejoin_cyborg
\ No newline at end of file
diff --git a/code/modules/client/preferences_spawnpoints_ch.dm b/code/modules/client/preferences_spawnpoints_ch.dm
new file mode 100644
index 0000000000..bcea0c153f
--- /dev/null
+++ b/code/modules/client/preferences_spawnpoints_ch.dm
@@ -0,0 +1,7 @@
+/datum/spawnpoint/stationgateway
+	display_name = "Station gateway"
+	msg = "has completed translation from station gateway"
+
+/datum/spawnpoint/stationgateway/New()
+	..()
+	turfs = latejoin_gatewaystation
\ No newline at end of file
diff --git a/maps/southern_cross/southern_cross_defines.dm b/maps/southern_cross/southern_cross_defines.dm
index ee8e2d57a9..d0eceab29d 100644
--- a/maps/southern_cross/southern_cross_defines.dm
+++ b/maps/southern_cross/southern_cross_defines.dm
@@ -84,7 +84,7 @@
 							NETWORK_SUPPLY
 							)
 	usable_email_tlds = list("freemail.nt")
-	allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage")
+	allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway")
 	default_skybox = /datum/skybox_settings/southern_cross
 	unit_test_exempt_areas = list(/area/ninja_dojo, /area/shuttle/ninja)
 	unit_test_exempt_from_atmos = list(/area/tcomm/chamber)
diff --git a/vorestation.dme b/vorestation.dme
index f2dc10ca18..5222e29918 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1862,6 +1862,7 @@
 #include "code\modules\client\preferences_factions.dm"
 #include "code\modules\client\preferences_savefile.dm"
 #include "code\modules\client\preferences_spawnpoints.dm"
+#include "code\modules\client\preferences_spawnpoints_ch.dm"
 #include "code\modules\client\preferences_toggle_procs.dm"
 #include "code\modules\client\preferences_vr.dm"
 #include "code\modules\client\preferences_yw.dm"