Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00
parent 991fb8335c fca3f200b3
commit 06bfa8770e
131 changed files with 1020 additions and 743 deletions
@@ -591,7 +591,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		admin_keys += "[C][C.holder.fakekey ? "(Stealth)" : ""][C.is_afk() ? "(AFK)" : ""]"

 	for(var/admin in admin_keys)
-		if(LAZYLEN(admin_keys) > 1)
+		if(LAZYLEN(message) > 1)
 			message += ", [admin]"
 		else
 			message += "[admin]"