From 6477eb8572f4e9c4f2e816fdfea804b6f4b1ec56 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 11 Jul 2021 22:52:51 -0700 Subject: [PATCH] Fixes inverted logic in staffwho --- code/modules/client/verbs/who.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index ccc3e0ac4e8..fc08723c577 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -68,11 +68,17 @@ for(var/client/C in GLOB.admins) // VOREStation Edit - GLOB var/temp = "" var/category = R_ADMIN +<<<<<<< HEAD // VOREStation Edit - Apply stealthmin protection to all levels if(C.holder.fakekey && !check_rights(R_ADMIN|R_MOD, FALSE, src)) // Only admins and mods can see stealthmins continue // VOREStation Edit End if(check_rights(R_BAN, FALSE, C)) // admins //VOREStation Edit +======= + if(check_rights(R_ADMIN, FALSE, C)) // admins + if(C.holder.fakekey && !check_rights_for(src, R_ADMIN|R_MOD)) // Only admins and mods can see stealthmins + continue +>>>>>>> 351c82238ee... Merge pull request #8161 from MarinaGryphon/patch-6 num_admins_online++ else if(check_rights(R_ADMIN, FALSE, C) && !check_rights(R_SERVER, FALSE, C)) // mods //VOREStation Edit: Game masters category = R_MOD