cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into diagonal-movement

Browse Source
This commit is contained in:
Couls
2019-04-25 23:45:08 -04:00
parent 6917aec6fe 0fb164d041
commit a8db26df98
222 changed files with 1040 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+4 -2
View File
@@ -224,6 +224,8 @@ var/list/admin_verbs_snpc = list(
var/list/admin_verbs_ticket = list(
/client/proc/openAdminTicketUI,
/client/proc/toggleticketlogs,
/client/proc/openMentorTicketUI,
/client/proc/toggleMentorTicketLogs,
/client/proc/resolveAllAdminTickets,
/client/proc/resolveAllMentorTickets
)
@@ -926,10 +928,10 @@ var/list/admin_verbs_ticket = list(
to_chat(usr, "You now will get admin log messages.")
/client/proc/toggleMentorTicketLogs()
set name = "Toggle Mentor Ticket Messgaes"
set name = "Toggle Mentor Ticket Messages"
set category = "Preferences"
if(!check_rights(R_MENTOR))
if(!check_rights(R_MENTOR|R_ADMIN))
return
prefs.toggles ^= CHAT_NO_MENTORTICKETLOGS
code/modules/admin/tickets/mentorticketsverbs.dm
+1 -1
View File
@@ -5,7 +5,7 @@
set name = "Open Mentor Ticket Interface"
set category = "Admin"
if(!holder || !check_rights(R_MENTOR))
if(!holder || !check_rights(R_MENTOR|R_ADMIN))
return
SSmentor_tickets.showUI(usr)