Supply controller now holds a ref to it's shuttle

Instead of having to look it up every time.

Conflicts:
	code/game/supplyshuttle.dm

code/modules/shuttles/shuttle.dm

@@ -125,16 +125,6 @@ var/global/list/shuttles
 
 	var/datum/shuttle/ferry/shuttle
 
-	//Supply and escape shuttles.
-	shuttle = new/datum/shuttle/ferry/supply()
-	shuttle.location = 1
-	shuttle.warmup_time = 10
-	shuttle.area_offsite = locate(/area/supply/dock)
-	shuttle.area_station = locate(/area/supply/station)
-	shuttle.docking_controller_tag = "supply_shuttle"
-	shuttle.dock_target_station = "cargo_bay"
-	shuttles["Supply"] = shuttle
-
 	// Admin shuttles.
 	shuttle = new()
 	shuttle.location = 1

code/modules/shuttles/shuttle_supply.dm

@@ -58,6 +58,9 @@
 		if (!at_station())	//at centcom
 			supply_controller.sell()
 
+/datum/shuttle/ferry/emergency/long_jump(var/area/departing,var/area/destination,var/area/interim,var/travel_time)
+	short_jump(departing, destination)	//long jumps are disabled
+
 // returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms
 /datum/shuttle/ferry/supply/proc/forbidden_atoms_check()
 	if (!at_station())