From cdef2beb3d43ee94a6c66e6c16e7b39ec5ab8996 Mon Sep 17 00:00:00 2001 From: Kassc Zeravla Date: Mon, 3 Feb 2020 18:35:31 -0600 Subject: [PATCH] Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix"" This reverts commit 8a22bd73854f0a21c20b1ffcff2346b646bf2d00. --- code/modules/admin/admin_verbs.dm | 4 ++++ code/modules/client/client defines.dm | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 2142c1e714..876f2972a0 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -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 diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index da5d374614..0596fdd08c 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -58,4 +58,8 @@ var/global/obj/screen/click_catcher/void - 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. add Ksc 1/30/20 - This enables Players to use Macros and change use custom skins. \ No newline at end of file +<<<<<<< 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. add Ksc 1/30/20 - This enables Players to use Macros and change use custom skins. +======= + control_freak = CONTROL_FREAK_ALL | CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS //CH add Ksc 1/30/20 - This enables Players to use Macros and change use custom skins. +>>>>>>> MacroFix