Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm

code/datums/datacore.dm

@@ -37,7 +37,7 @@
 	if(PDA_Manifest.len)
 		PDA_Manifest.Cut()
 
-	if(H.mind && (H.mind.assigned_role != "MODE"))
+	if(H.mind && !player_is_antag(H.mind, only_offstation_roles = 1))
 		var/assignment
 		if(H.mind.role_alt_title)
 			assignment = H.mind.role_alt_title

code/datums/helper_datums/getrev.dm

@@ -1,11 +1,16 @@
 var/global/datum/getrev/revdata = new()
 
 /datum/getrev
+	var/branch
 	var/revision
 	var/date
 	var/showinfo
 
 /datum/getrev/New()
+	var/list/head_branch = file2list(".git/HEAD", "\n")
+	if(head_branch.len)
+		branch = copytext(head_branch[1], 17)
+
 	var/list/head_log = file2list(".git/logs/HEAD", "\n")
 	for(var/line=head_log.len, line>=1, line--)
 		if(head_log[line])
@@ -18,7 +23,9 @@ var/global/datum/getrev/revdata = new()
 				if(unix_time)
 					date = unix2date(unix_time)
 			break
+
 	world.log << "Running revision:"
+	world.log << branch
 	world.log << date
 	world.log << revision
 	return
@@ -29,7 +36,7 @@ client/verb/showrevinfo()
 	set desc = "Check the current server code revision"
 
 	if(revdata.revision)
-		src << "<b>Server revision:</b> [revdata.date]"
+		src << "<b>Server revision:</b> [revdata.branch] - [revdata.date]"
 		if(config.githuburl)
 			src << "<a href='[config.githuburl]/commit/[revdata.revision]'>[revdata.revision]</a>"
 		else

code/datums/mind.dm

@@ -213,7 +213,8 @@
 				if (!new_target) return
 
 				var/objective_path = text2path("/datum/objective/[new_obj_type]")
-				if (new_target == "Free objective")
+				var/mob/living/M = new_target
+				if (!istype(M) || !M.mind || new_target == "Free objective")
 					new_objective = new objective_path
 					new_objective.owner = src
 					new_objective:target = null
@@ -221,9 +222,8 @@
 				else
 					new_objective = new objective_path
 					new_objective.owner = src
-					new_objective:target = new_target:mind
-					//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
-					new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role=="MODE" ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
+					new_objective:target = M.mind
+					new_objective.explanation_text = "[objective_type] [M.real_name], the [M.mind.special_role ? M.mind:special_role : M.mind:assigned_role]."
 
 			if ("prevent")
 				new_objective = new /datum/objective/block