Adds the merchant station, the shuttle and the station's dock (#3254)

This pr adds the second essential part of the merchant's implementation, mapping the merchant's shuttle, base and the dock. And more merchant related fixes and tweaks.
This commit is contained in:
Alberyk
2017-08-13 17:31:50 -03:00
committed by Erki
parent 1a43d4a7fe
commit d1c3a58c87
14 changed files with 3890 additions and 1282 deletions

View File

@@ -164,6 +164,20 @@ var/datum/controller/subsystem/processing/shuttle/shuttle_controller
shuttles["Administration"] = shuttle
START_PROCESSING(shuttle_controller, shuttle)
// Merchant Shuttle
shuttle = new()
shuttle.location = 1
shuttle.warmup_time = 10
shuttle.area_offsite = locate(/area/merchant_ship/start)
shuttle.area_station = locate(/area/merchant_ship/docked)
shuttle.docking_controller_tag = "merchant_shuttle"
shuttle.dock_target_station = "merchant_shuttle_dock"
shuttle.dock_target_offsite = "merchant_station"
shuttles["Merchant"] = shuttle
START_PROCESSING(shuttle_controller, shuttle)
/*// Public shuttles
shuttle = new()
shuttle.warmup_time = 10