Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06

# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme

code/controllers/hooks-defs.dm

@@ -85,3 +85,12 @@
  * Parameters: var/obj/structure/closet/crate/sold, var/area/shuttle
  */
 /hook/sell_crate
+
+/**
+ * Supply Shuttle sold hook.
+ * Called in supplyshuttle.dm when the shuttle contents are sold.
+ * This hook is called _before_ the crates are processed for normal
+ * phoron/metal sale (and before the sell_crate hooks)
+ * Parameters: var/area/area_shuttle
+ */
+/hook/sell_shuttle

code/controllers/master_controller.dm

@@ -73,5 +73,12 @@ datum/controller/game_controller/proc/setup_objects()
 	//Set up spawn points.
 	populate_spawn_points()
 
+	admin_notice("<span class='danger'>Initializing turbolifts</span>", R_DEBUG)
+	for(var/thing in turbolifts)
+		if(!deleted(thing))
+			var/obj/turbolift_map_holder/lift = thing
+			lift.initialize()
+			sleep(-1)
+
 	admin_notice("<span class='danger'>Initializations complete.</span>", R_DEBUG)
 	sleep(-1)