Merge pull request #4606 from Citadel-Station-13/upstream-merge-33937

[MIRROR] printplayer fix for jobless minds
2017-12-31 02:50:34 -06:00
parent 503f8e2635 eb95b67f70
commit ab11e4be2e
1 changed files with 4 additions and 1 deletions
@@ -411,7 +411,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>"