From 9656f82fda3f3cb8989a5e2d3676646abaad69dc Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:30:11 -0700 Subject: [PATCH] [MIRROR] Required admin privileges restrictions (#8802) Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/modules/admin/verbs/adminhelp.dm | 2 ++ code/modules/client/verbs/ooc.dm | 3 ++- code/modules/mob/mob.dm | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 1793c67615..16b2258602 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -73,6 +73,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //opens the ticket listings for one of the 3 states /datum/admin_help_tickets/proc/BrowseTickets(state) + if(!check_rights(R_ADMIN|R_SERVER)) //Prevents non-staff from opening the list of ahelp tickets + return var/list/l2b var/title switch(state) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 92ed892a9f..339b71ac23 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -169,7 +169,8 @@ // Admins with RLOOC displayed who weren't already in for(var/client/admin in GLOB.admins) if(!(admin in receivers) && admin.is_preference_enabled(/datum/client_preference/holder/show_rlooc)) - r_receivers |= admin + if(check_rights(R_ADMIN|R_SERVER, FALSE, admin)) //Stop rLOOC showing for retired staff //CHOMPEdit, admins should see LOOC + r_receivers |= admin msg = GLOB.is_valid_url.Replace(msg,"$1") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 1bb4f7859c..76c5f2156a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -750,11 +750,11 @@ stat(null) for(var/datum/controller/subsystem/SS in Master.subsystems) SS.stat_entry() - - // CHOMPedit - Ticket System - //if(statpanel("Tickets")) - //GLOB.ahelp_tickets.stat_entry() - + /* CHOMPedit - Ticket System + if(statpanel("Tickets")) + if(check_rights(R_ADMIN|R_SERVER,FALSE)) //Prevents non-staff from opening the list of ahelp tickets + GLOB.ahelp_tickets.stat_entry() + */ if(length(GLOB.sdql2_queries)) if(statpanel("SDQL2"))