From 4605b252f3a578627370485a62d5045ea0481c26 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 11 Nov 2017 15:53:20 -0600 Subject: [PATCH] Update config_entry.dm --- code/controllers/configuration/config_entry.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index a18032a7e1..92dcb9baf0 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -51,14 +51,11 @@ return FALSE return ..() -<<<<<<< HEAD -======= /datum/config_entry/proc/VASProcCallGuard(str_val) . = !(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "ValidateAndSet" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") if(!.) log_admin_private("Config set of [type] to [str_val] attempted by [key_name(usr)]") - ->>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental + /datum/config_entry/proc/ValidateAndSet(str_val) CRASH("Invalid config entry type!")