Merge branch 'master' into upstream-merge-33660

2018-01-01 04:59:20 -06:00
parent dda430131a 6bafa75ee8
commit 6c147c9ef3
123 changed files with 2340 additions and 3834 deletions
@@ -434,7 +434,10 @@


 /proc/printplayer(datum/mind/ply, fleecheck)
-	var/text = "<b>[ply.key]</b> was <b>[ply.name]</b> the <b>[ply.assigned_role]</b> and"
+	var/jobtext = ""
+	if(ply.assigned_role)
+		jobtext = " the <b>[ply.assigned_role]</b>"
+	var/text = "<b>[ply.key]</b> was <b>[ply.name]</b>[jobtext] and"
 	if(ply.current)
 		if(ply.current.stat == DEAD)
 			text += " <span class='redtext'>died</span>"