From e5587259e908e84c4c33bc1c868d30d4ea11d437 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 18 Oct 2020 18:05:48 +0200
Subject: [PATCH] [MIRROR] fixes hijacked shuttles docking in the wrong spot
 (#1358)

* fixes hijacked shuttles docking in the wrong spot (#54435)

* fixes hijacked shuttles docking in the wrong spot

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
---
 code/modules/shuttle/emergency.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 38571a3370d..d53840782bc 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -525,7 +525,7 @@
 				// now move the actual emergency shuttle to centcom
 				// unless the shuttle is "hijacked"
 				var/destination_dock = "emergency_away"
-				if(is_hijacked() && elimination_hijack())
+				if(is_hijacked() || elimination_hijack())
 					destination_dock = "emergency_syndicate"
 					minor_announce("Corruption detected in \
 						shuttle navigation protocols. Please contact your \