Merge remote-tracking branch 'upstream/master' into dev-freeze

This commit is contained in:
GinjaNinja32
2015-08-19 07:04:40 +01:00
6 changed files with 141 additions and 136 deletions

View File

@@ -203,7 +203,7 @@ var/global/datum/shuttle_controller/shuttle_controller
//Skipjack.
var/datum/shuttle/multi_shuttle/VS = new/datum/shuttle/multi_shuttle()
VS.origin = locate(/area/skipjack_station)
VS.origin = locate(/area/skipjack_station/start)
VS.destinations = list(
"Fore Starboard Solars" = locate(/area/skipjack_station/northeast_solars),