From a634bf7f8aa719b85a2e6244bac31ffd0d4e98f7 Mon Sep 17 00:00:00 2001
From: Fayrik <admin@dragonclaw.co.uk>
Date: Sat, 4 Apr 2015 10:54:06 +0100
Subject: [PATCH] Fixes unreported bug that would delete the cargo shuttle if
 it was sent to a shuttle loan event while in transit.

---
 code/controllers/subsystem/shuttles/supply.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/controllers/subsystem/shuttles/supply.dm b/code/controllers/subsystem/shuttles/supply.dm
index 3fcc981725c..4322a504b2e 100644
--- a/code/controllers/subsystem/shuttles/supply.dm
+++ b/code/controllers/subsystem/shuttles/supply.dm
@@ -370,7 +370,7 @@
 				investigate_log("[usr.key] has sent the supply shuttle away. Remaining points: [SSshuttle.points]. Shuttle contents:[SSshuttle.sold_atoms]", "cargo")
 		else
 			if(href_list["loan"] && SSshuttle.shuttle_loan)
-				if(!SSshuttle.shuttle_loan.dispatched)
+				if(!SSshuttle.shuttle_loan.dispatched && SSshuttle.supply.mode == SHUTTLE_IDLE) // Must either be at centcom, or at the station. No redirecting off course!
 					SSshuttle.shuttle_loan.loan_shuttle()
 					temp = "The supply shuttle has been loaned to Centcom.<BR><BR><A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
 					post_signal("supply")