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 2026-07-17 02:33:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
BongaTheProto
2023-10-07 23:28:42 -05:00
parent cd026aaddb 5ef0119fb9
commit 7b5ecc7b49
43 changed files with 461 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/error_handler/error_handler.dm
+3 -3
View File
@@ -64,11 +64,11 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
configured_error_silence_time = CONFIG_GET(number/error_silence_time)
else
var/datum/config_entry/CE = /datum/config_entry/number/error_cooldown
configured_error_cooldown = initial(CE.config_entry_value)
configured_error_cooldown = initial(CE.default)
CE = /datum/config_entry/number/error_limit
configured_error_limit = initial(CE.config_entry_value)
configured_error_limit = initial(CE.default)
CE = /datum/config_entry/number/error_silence_time
configured_error_silence_time = initial(CE.config_entry_value)
configured_error_silence_time = initial(CE.default)
//Each occurence of a unique error adds to its cooldown time...
code/modules/error_handler/error_viewer.dm
+1 -1
View File
@@ -122,7 +122,7 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache)
err_msg_delay = CONFIG_GET(number/error_msg_delay)
else
var/datum/config_entry/CE = /datum/config_entry/number/error_msg_delay
err_msg_delay = initial(CE.config_entry_value)
err_msg_delay = initial(CE.default)
error_source.next_message_at = world.time + err_msg_delay
/datum/error_viewer/error_source