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

Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix""

Browse Source 
This reverts commit 8a22bd7385.
This commit is contained in:
Kassc Zeravla
2020-02-03 18:49:54 -06:00
parent 8a22bd7385
commit cdef2beb3d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+4
View File
@@ -372,7 +372,11 @@ var/list/admin_verbs_event_manager = list(
/client/proc/add_admin_verbs()
if(holder)
<<<<<<< HEAD
control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS //CHOMPedit KSC 1/30/20 - This enables Admins to use Macros and change use custom skins.
=======
control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS ////CM add Ksc 1/30/20 - This enables Admins to use Macros and change use custom skins.
>>>>>>> MacroFix
verbs += admin_verbs_default
if(holder.rights & R_BUILDMODE) verbs += /client/proc/togglebuildmodeself
if(holder.rights & R_ADMIN) verbs += admin_verbs_admin