Merge remote-tracking branch 'upstream/dev' into emergency-shuttle

code/controllers/master_controller.dm

@@ -32,7 +32,7 @@ datum/controller/game_controller
 	var/last_thing_processed
 	var/mob/list/expensive_mobs = list()
 	var/rebuild_active_areas = 0
-	
+
 	var/list/shuttle_list	//for debugging and VV
 
 datum/controller/game_controller/New()
@@ -83,6 +83,9 @@ datum/controller/game_controller/proc/setup()
 	var/datum/ore_distribution/O = new()
 	O.populate_distribution_map()
 
+	//Set up spawn points.
+	populate_spawn_points()
+
 	spawn(0)
 		if(ticker)
 			ticker.pregame()