Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2023-10-07 23:28:42 -05:00
43 changed files with 461 additions and 350 deletions
+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...