From dcc71bfc9fa9b8ec019168829a02f99dd3b46788 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Sun, 12 Mar 2017 18:35:12 -0400
Subject: [PATCH] Fixes arrivals duplicate checking (#24946)

The check should be done BEFORE the docking_port is initialized
---
 code/modules/shuttle/arrivals.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm
index 4a1398ea493..f0b77700fbf 100644
--- a/code/modules/shuttle/arrivals.dm
+++ b/code/modules/shuttle/arrivals.dm
@@ -26,8 +26,6 @@
 
 	preferred_direction = dir
 
-	..()
-
 	if(SSshuttle.arrivals)
 		WARNING("More than one arrivals docking_port placed on map!")
 		qdel(src)
@@ -35,6 +33,8 @@
 
 	SSshuttle.arrivals = src
 
+	..()
+
 	areas = list()
 
 	if(latejoin.len)