Merge pull request #11318 from AffectedArc07/die-master-controller

Kills off the master controller

code/game/gamemodes/game_mode.dm

@@ -357,7 +357,7 @@ proc/display_roundstart_logout_report()
 			if(L.stat)
 				if(L.suiciding)	//Suicider
 					msg += "<b>[L.name]</b> ([L.ckey]), the [L.job] (<font color='red'><b>Suicide</b></font>)\n"
-					job_master.FreeRole(L.job)
+					SSjobs.FreeRole(L.job)
 					message_admins("<b>[key_name_admin(L)]</b>, the [L.job] has been freed due to (<font color='#ffcc00'><b>Early Round Suicide</b></font>)\n")
 					continue //Disconnected client
 				if(L.stat == UNCONSCIOUS)
@@ -383,7 +383,7 @@ proc/display_roundstart_logout_report()
 						continue //Lolwhat
 					else
 						msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (<font color='red'><b>Ghosted</b></font>)\n"
-						job_master.FreeRole(L.job)
+						SSjobs.FreeRole(L.job)
 						message_admins("<b>[key_name_admin(L)]</b>, the [L.job] has been freed due to (<font color='#ffcc00'><b>Early Round Ghosted While Alive</b></font>)\n")
 						continue //Ghosted while alive
 

code/game/gamemodes/gameticker.dm

@@ -95,7 +95,7 @@ var/round_start_time = 0
 			var/datum/game_mode/M = config.pick_mode(secret_force_mode)
 			if(M.can_start())
 				src.mode = config.pick_mode(secret_force_mode)
-		job_master.ResetOccupations()
+		SSjobs.ResetOccupations()
 		if(!src.mode)
 			src.mode = pickweight(runnable_modes)
 		if(src.mode)
@@ -107,7 +107,7 @@ var/round_start_time = 0
 		to_chat(world, "<B>Unable to start [mode.name].</B> Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.")
 		mode = null
 		current_state = GAME_STATE_PREGAME
-		job_master.ResetOccupations()
+		SSjobs.ResetOccupations()
 		Master.SetRunLevel(RUNLEVEL_LOBBY)
 		return 0
 
@@ -115,12 +115,12 @@ var/round_start_time = 0
 	src.mode.pre_pre_setup()
 	var/can_continue
 	can_continue = src.mode.pre_setup()//Setup special modes
-	job_master.DivideOccupations() //Distribute jobs
+	SSjobs.DivideOccupations() //Distribute jobs
 	if(!can_continue)
 		qdel(mode)
 		current_state = GAME_STATE_PREGAME
 		to_chat(world, "<B>Error setting up [master_mode].</B> Reverting to pre-game lobby.")
-		job_master.ResetOccupations()
+		SSjobs.ResetOccupations()
 		Master.SetRunLevel(RUNLEVEL_LOBBY)
 		return 0
 
@@ -135,6 +135,7 @@ var/round_start_time = 0
 		src.mode.announce()
 
 	create_characters() //Create player characters and transfer them
+	populate_spawn_points()
 	collect_minds()
 	equip_characters()
 	data_core.manifest()
@@ -145,6 +146,7 @@ var/round_start_time = 0
 
 	//here to initialize the random events nicely at round start
 	setup_economy()
+	setupfactions()
 
 	//shuttle_controller.setup_shuttle_docks()
 
@@ -375,8 +377,8 @@ var/round_start_time = 0
 			if(player.mind.assigned_role == "Captain")
 				captainless=0
 			if(player.mind.assigned_role != player.mind.special_role)
-				job_master.AssignRank(player, player.mind.assigned_role, 0)
-				job_master.EquipRank(player, player.mind.assigned_role, 0)
+				SSjobs.AssignRank(player, player.mind.assigned_role, 0)
+				SSjobs.EquipRank(player, player.mind.assigned_role, 0)
 				EquipCustomItems(player)
 	if(captainless)
 		for(var/mob/M in GLOB.player_list)

code/game/gamemodes/miniantags/abduction/abductee_objectives.dm

@@ -26,7 +26,7 @@
 	explanation_text = "Capture"
 
 /datum/objective/abductee/capture/New()
-	var/list/jobs = job_master.occupations.Copy()
+	var/list/jobs = SSjobs.occupations.Copy()
 	for(var/datum/job/J in jobs)
 		if(J.current_positions < 1)
 			jobs -= J