cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 14:16:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-13503

Browse Source
This commit is contained in:
Nadyr
2022-08-28 18:06:43 -04:00
committed by GitHub
parent 93870dd2e2 fa6bdf9209
commit 19d875c734
108 changed files with 15379 additions and 242025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verb_lists_vr.dm
+5 -1
View File
@@ -7,6 +7,8 @@ var/list/admin_verbs_default = list(
/client/proc/cmd_admin_say, //VOREStation Add,
/client/proc/cmd_mod_say, //VOREStation Add,
/client/proc/cmd_event_say, //VOREStation Add,
/client/proc/cmd_mentor_ticket_panel,
/client/proc/cmd_mentor_say
// /client/proc/hide_verbs, //hides all our adminverbs, //VOREStation Remove,
// /client/proc/hide_most_verbs, //hides all our hideable adminverbs, //VOREStation Remove,
// /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify, //VOREStation Remove,
@@ -122,7 +124,9 @@ var/list/admin_verbs_admin = list(
/datum/admins/proc/set_uplink, //VOREStation Add,
/datum/admins/proc/sendFax,
/client/proc/despawn_player,
/datum/admins/proc/view_feedback
/datum/admins/proc/view_feedback,
/client/proc/make_mentor,
/client/proc/unmake_mentor
)
var/list/admin_verbs_ban = list(
code/modules/admin/topic.dm
-3
View File
@@ -24,11 +24,8 @@
else if(href_list["ahelp_tickets"])
GLOB.ahelp_tickets.BrowseTickets(text2num(href_list["ahelp_tickets"]))
<<<<<<< HEAD
=======
mentor_commands(href, href_list, src)
>>>>>>> 16eeda039c... Merge pull request #13503 from lm40/master
if(href_list["dbsearchckey"] || href_list["dbsearchadmin"])
var/adminckey = href_list["dbsearchadmin"]