Update config_entry.dm

This commit is contained in:
LetterJay
2017-11-11 15:53:20 -06:00
committed by GitHub
parent 3bd0fda1ba
commit 4605b252f3

View File

@@ -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!")