Zuhayr ba6d684e96 Adds [dock_name] entry used by shuttles. ...

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	code/global.dm
	code/modules/shuttles/shuttle_emergency.dm

2016-01-14 08:33:22 +01:00

..

antagonist.dm

…

departmental.dm

…

escape_pods.dm

…

shuttle_console.dm

Merge pull request #11516 from Baystation12/dev-freeze

2015-11-24 14:35:56 +01:00

shuttle_emergency.dm

Adds [dock_name] entry used by shuttles.

2016-01-14 08:33:22 +01:00

shuttle_ferry.dm

…

shuttle_specops.dm

…

shuttle_supply.dm

…

shuttle.dm

…

shuttles_multi.dm

…