From bfc04fdeb8e95c87d404f0b1497d5c7eb9ab51b7 Mon Sep 17 00:00:00 2001
From: Repede <blackangelace@gmail.com>
Date: Mon, 27 Nov 2023 19:34:08 -0500
Subject: [PATCH] fix any admin role being able to see mod chat, and remove
 tickets permissions from non admins

---
 code/modules/admin/verbs/adminsay.dm |  2 +-
 code/modules/mob/mob.dm              | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 4fa7f2862c..5c8be024d5 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -35,7 +35,7 @@
 	if(check_rights(R_ADMIN, 0))
 		sender_name = "<span class='admin'>[sender_name]</span>"
 	for(var/client/C in GLOB.admins)
-		if(check_rights(R_ADMIN|R_MOD|R_SERVER)) //VOREStation Edit
+		if(check_rights(R_ADMIN|R_MOD|R_SERVER, 0, C)) //VOREStation Edit //YW Edit, fix issue with C missing from check_rights, so all admins could see mchat
 			to_chat(C, "<span class='mod_channel'>" + create_text_tag("mod", "MOD:", C) + " <span class='name'>[sender_name]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>")
 
 	feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c382585ceb..1dffccec80 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -696,15 +696,16 @@
 					for(var/datum/controller/subsystem/SS in Master.subsystems)
 						SS.stat_entry()
 
-			if(statpanel("Tickets"))
-				GLOB.ahelp_tickets.stat_entry()
+			if(check_rights(R_ADMIN, 0))
+				if(statpanel("Tickets"))
+					GLOB.ahelp_tickets.stat_entry()
 
-
-			if(length(GLOB.sdql2_queries))
-				if(statpanel("SDQL2"))
-					stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj)
-					for(var/datum/SDQL2_query/Q as anything in GLOB.sdql2_queries)
-						Q.generate_stat()
+			if(check_rights(R_ADMIN|R_DEBUG, 0))
+				if(length(GLOB.sdql2_queries))
+					if(statpanel("SDQL2"))
+						stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj)
+						for(var/datum/SDQL2_query/Q as anything in GLOB.sdql2_queries)
+							Q.generate_stat()
 
 		if(has_mentor_powers(client))
 			if(statpanel("Tickets"))