Shuttles now dock on arrival and departure

Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.

Conflicts:
	code/controllers/master_controller.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm

code/game/machinery/embedded_controller/docking_program.dm

@@ -23,7 +23,11 @@
 
 	MODE_NONE|STATE_UNDOCKED		idle - not docked.
 	MODE_NONE|anything else			should never happen.
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> ed4fb8d... Shuttles now dock on arrival and departure
 */
 
 
@@ -169,6 +173,14 @@
 	tag_target = null
 	response_sent = 0
 
+/datum/computer/file/embedded_program/docking/proc/force_undock()
+	if (tag_target)
+		send_docking_command(tag_target, "dock_error")
+	reset()
+
+/datum/computer/file/embedded_program/docking/proc/docked()
+	return (dock_state == STATE_DOCKED)
+
 /datum/computer/file/embedded_program/docking/proc/undocked()
 	return (dock_state == STATE_UNDOCKED)