cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update config_entry.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-11 15:53:20 -06:00
committed by GitHub
parent 3bd0fda1ba
commit 4605b252f3
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/configuration/config_entry.dm
View File

@@ -51,14 +51,11 @@
return FALSE return FALSE
return ..() return ..()
<<<<<<< HEAD
=======
/datum/config_entry/proc/VASProcCallGuard(str_val) /datum/config_entry/proc/VASProcCallGuard(str_val)
. = !(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "ValidateAndSet" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") . = !(IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "ValidateAndSet" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
if(!.) if(!.)
log_admin_private("Config set of [type] to [str_val] attempted by [key_name(usr)]") 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) /datum/config_entry/proc/ValidateAndSet(str_val)
CRASH("Invalid config entry type!") CRASH("Invalid config entry type!")