Merge remote-tracking branch 'upstream/master'

code/controllers/subsystem/job.dm

@@ -464,7 +464,10 @@ SUBSYSTEM_DEF(job)
 			else
 				handle_auto_deadmin_roles(M.client, rank)
 
-	to_chat(M, "<b>You are the [rank].</b>")
+	var/display_rank = rank
+	if(M.client && M.client.prefs && M.client?.prefs?.alt_titles_preferences[rank])
+		display_rank = M.client?.prefs?.alt_titles_preferences[rank]
+	to_chat(M, "<b>You are the [display_rank].</b>")
 	if(job)
 		to_chat(M, "<b>As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>")
 		job.radio_help_message(M)