Merge branch 'Bleeding-Edge' of gitlab.com:vgstation/vgstation into borer-overhaul

code/controllers/master_controller.dm

@@ -174,6 +174,12 @@ datum/controller/game_controller/proc/cachedamageicons()
 	//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""])  \\datum/controller/game_controller/proc/setup_objects() called tick#: [world.time]")
 	var/watch = start_watch()
 	var/overwatch = start_watch() // Overall.
+
+	log_startup_progress("Populating asset cache...")
+	populate_asset_cache()
+	log_startup_progress("  Populated [asset_cache.len] assets in [stop_watch(watch)]s.")
+
+	watch = start_watch()	
 	log_startup_progress("Initializing objects...")
 	//sleep(-1) // Why
 	//var/last_init_type = null

code/controllers/shuttle_controller.dm

@@ -145,7 +145,7 @@ datum/shuttle_controller/proc/move_pod(var/start_type,var/end_type,var/direction
 
 	for(var/mob/M in end_location)
 		if(M.client)
-			spawn(0)
+			spawn()
 				if(M.locked_to)
 					shake_camera(M, 4, 1) // locked_to, not a lot of shaking
 				else