shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5514 from Citadel-Station-13/upstream-merge-35693

Browse Source 
[MIRROR] Fix world/Error() trying to read config before it loads
This commit is contained in:
LetterJay
2018-02-15 22:17:42 -06:00
committed by GitHub
parent f664c21aee a99dbd6441
commit 65ee13fdb9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/error_handler/error_handler.dm
+1 -1
View File
@@ -54,7 +54,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
var/configured_error_cooldown var/configured_error_cooldown
var/configured_error_limit var/configured_error_limit
var/configured_error_silence_time var/configured_error_silence_time
if(config) if(config && config.entries)
configured_error_cooldown = CONFIG_GET(number/error_cooldown) configured_error_cooldown = CONFIG_GET(number/error_cooldown)
configured_error_limit = CONFIG_GET(number/error_limit) configured_error_limit = CONFIG_GET(number/error_limit)
configured_error_silence_time = CONFIG_GET(number/error_silence_time) configured_error_silence_time = CONFIG_GET(number/error_silence_time)