From 3128c26698a74e9649c3011c9bbfd22353b67398 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 30 Dec 2017 15:03:56 -0500
Subject: [PATCH 1/2] Merge pull request #33937 from AnturK/printplayerfix

printplayer fix for jobless minds
---
 code/__HELPERS/roundend.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 52dd7c6358..8ab1e2fac6 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -385,7 +385,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>"