Merge pull request #3282 from Segrain/master

Bugfixes.

code/game/jobs/job_controller.dm

@@ -134,7 +134,7 @@ var/global/datum/controller/occupations/job_master
 				if(!job)	continue
 				var/list/candidates = FindOccupationCandidates(job, level)
 				if(!candidates.len)	continue
-				
+
 				// Build a weighted list, weight by age.
 				var/list/weightedCandidates = list()
 
@@ -144,7 +144,7 @@ var/global/datum/controller/occupations/job_master
 				if(command_position == "Captain")
 					good_age_minimal = 30
 					good_age_maximal = 70 // Old geezer captains ftw
-				
+
 				for(var/mob/V in candidates)
 					// Log-out during round-start? What a bad boy, no head position for you!
 					if(!V.client) continue
@@ -164,9 +164,9 @@ var/global/datum/controller/occupations/job_master
 							weightedCandidates[V] = 3 // Geezer.
 						else
 							// If there's ABSOLUTELY NOBODY ELSE
-							if(candidates.len == 1) weightedCandidates[V] = 1 
-							
-				
+							if(candidates.len == 1) weightedCandidates[V] = 1
+
+
 				var/mob/new_player/candidate = pickweight(weightedCandidates)
 				if(AssignRole(candidate, command_position))
 					return 1
@@ -340,6 +340,7 @@ var/global/datum/controller/occupations/job_master
 		//For ones returning to lobby
 		for(var/mob/new_player/player in unassigned)
 			if(player.client.prefs.alternate_option == RETURN_TO_LOBBY)
+				player.ready = 0
 				unassigned -= player
 		return 1
 

code/modules/clothing/shoes/magboots.dm

@@ -10,6 +10,8 @@
 		set name = "Toggle Magboots"
 		set category = "Object"
 		set src in usr
+		if(usr.stat)
+			return
 		if(src.magpulse)
 			src.flags &= ~NOSLIP
 			src.slowdown = SHOES_SLOWDOWN

code/modules/mob/living/silicon/robot/robot.dm

@@ -146,7 +146,7 @@
 /mob/living/silicon/robot/proc/pick_module()
 	if(module)
 		return
-	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security", "Combat")
+	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
 	if(emagged || security_level > SEC_LEVEL_BLUE)
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"