diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 5237132e4b1..06f81e742ad 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -331,6 +331,9 @@ GLOBAL_LIST_INIT(skin_tone_names, list( /proc/deadchat_broadcast(message, source=null, mob/follow_target=null, turf/turf_target=null, speaker_key=null, message_type=DEADCHAT_REGULAR, admin_only=FALSE) message = span_deadsay("[source][span_linkify(message)]") + if(admin_only) + message += span_deadsay(" (This is viewable to admins only).") + for(var/mob/M in GLOB.player_list) var/chat_toggles = TOGGLES_DEFAULT_CHAT var/toggles = TOGGLES_DEFAULT @@ -341,10 +344,8 @@ GLOBAL_LIST_INIT(skin_tone_names, list( toggles = prefs.toggles ignoring = prefs.ignoring if(admin_only) - if (!M.client?.holder) - return - else - message += span_deadsay(" (This is viewable to admins only).") + if(!M.client?.holder) + continue var/override = FALSE if(M.client?.holder && (chat_toggles & CHAT_DEAD)) override = TRUE