From 88caf13afcfdcae7cd3d85b028117f25e8eb70be Mon Sep 17 00:00:00 2001 From: Tom <8881105+tf-4@users.noreply.github.com> Date: Sun, 28 Nov 2021 00:13:10 +0000 Subject: [PATCH] [FUCK] AOOC, SOOC, and people's ckeys in each are no longer visible to everyone (#9745) * haha whoops * re-run checks --- modular_skyrat/modules/admin/code/aooc.dm | 2 +- modular_skyrat/modules/admin/code/sooc.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_skyrat/modules/admin/code/aooc.dm b/modular_skyrat/modules/admin/code/aooc.dm index 0e0ba850cad..b679f5c8e0d 100644 --- a/modular_skyrat/modules/admin/code/aooc.dm +++ b/modular_skyrat/modules/admin/code/aooc.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name) for(var/iterated_player as anything in GLOB.player_list) var/mob/iterated_mob = iterated_player //Admins with muted OOC do not get to listen to AOOC, but normal players do, as it could be admins talking important stuff to them - if(!iterated_mob.client?.holder?.deadmined && iterated_mob.client?.prefs?.chat_toggles & CHAT_OOC) + if(iterated_mob.client?.holder && !iterated_mob.client?.holder.deadmined && iterated_mob.client?.prefs?.chat_toggles & CHAT_OOC) listeners[iterated_mob.client] = AOOC_LISTEN_ADMIN for(var/iterated_listener as anything in listeners) diff --git a/modular_skyrat/modules/admin/code/sooc.dm b/modular_skyrat/modules/admin/code/sooc.dm index e420a2b2829..6619ae10a5f 100644 --- a/modular_skyrat/modules/admin/code/sooc.dm +++ b/modular_skyrat/modules/admin/code/sooc.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name) for(var/iterated_player as anything in GLOB.player_list) var/mob/iterated_mob = iterated_player //Admins with muted OOC do not get to listen to SOOC, but normal players do, as it could be admins talking important stuff to them - if(!iterated_mob.client?.holder?.deadmined && iterated_mob.client?.prefs?.chat_toggles & CHAT_OOC) + if(iterated_mob.client?.holder && !iterated_mob.client?.holder?.deadmined && iterated_mob.client?.prefs?.chat_toggles & CHAT_OOC) listeners[iterated_mob.client] = SOOC_LISTEN_ADMIN else if(iterated_mob.mind)