Fix/tweak: Mentors, Moders and A-Tickets (#5698)

* mentor/mod tweaks * fix bit flag operations --------- Co-authored-by: Aziz Chynaliev <[email protected]>
ss220-space · Aug 11, 2024 · 02e695e · 02e695e
1 parent ba5adf6
commit 02e695e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
@@ -500,7 +500,7 @@ SUBSYSTEM_DEF(dbcore)
 		return
 
 	if(SSdbcore.IsConnected())
-		if(!check_rights(R_DEBUG, FALSE))
+		if(!check_rights(R_ADMIN, FALSE) || !check_rights(R_DEBUG, FALSE)) //we dont want coders to deal with db
 			to_chat(usr, "<span class='warning'>The database is already connected! (Only those with +DEBUG can force a reconnection)</span>")
 			return
 

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
@@ -25,7 +25,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
  */
 /proc/message_adminTicket(msg, important = FALSE)
 	for(var/client/C in GLOB.admins)
-		if(R_ADMIN | R_MOD & C.holder.rights)
+		if((R_ADMIN|R_MOD) & C.holder.rights)
 			if(important || (C.prefs && !(C.prefs.toggles & PREFTOGGLE_CHAT_NO_TICKETLOGS)))
 				to_chat(C, msg, MESSAGE_TYPE_ADMINPM, confidential = TRUE)
 			if(important)

diff --git a/code/modules/admin/tickets/adminticketsverbs.dm b/code/modules/admin/tickets/adminticketsverbs.dm
@@ -5,7 +5,7 @@
 	set name = "Open Admin Ticket Interface"
 	set category = "Admin"
 
-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_ADMIN|R_MOD))
 		return
 
 	SStickets.showUI(usr)

diff --git a/code/modules/admin/tickets/mentorticketsverbs.dm b/code/modules/admin/tickets/mentorticketsverbs.dm
@@ -5,7 +5,7 @@
 	set name = "Open Mentor Ticket Interface"
 	set category = "Admin"
 
-	if(!check_rights(R_MENTOR|R_ADMIN))
+	if(!check_rights(R_MENTOR))
 		return
 
 	SSmentor_tickets.showUI(usr)