diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 10dbb653453..8ae35d52179 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -317,7 +317,7 @@ if("shadowling_max_age") config.shadowling_max_age = text2num(value) - + if("warn_afk_minimum") config.warn_afk_minimum = text2num(value) if("auto_cryo_afk") diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm index 13c843b75dd..6aefb4b28f7 100644 --- a/code/controllers/subsystem/afk.dm +++ b/code/controllers/subsystem/afk.dm @@ -33,14 +33,14 @@ SUBSYSTEM_DEF(afk) if(afk_players[H.ckey]) toRemove += H.ckey continue - + var/mins_afk = round(H.client.inactivity / 600) var/afk_warn_min = H.client.prefs.afk_fast_cryo ? AFK_FAST_CRYO_WARN : config.warn_afk_minimum if(mins_afk < afk_warn_min) if(afk_players[H.ckey]) toRemove += H.ckey continue - + var/afk_cryo_min = H.client.prefs.afk_fast_cryo ? AFK_FAST_CRYO_CRYO : config.auto_cryo_afk if(!afk_players[H.ckey]) afk_players[H.ckey] = AFK_WARNED diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 2ba3580980f..56f7dcd4107 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -443,7 +443,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if(user.client.holder) dat += "Adminhelp sound: [(sound & SOUND_ADMINHELP)?"On":"Off"]
" dat += "AFK Fast Cryoing: [(afk_fast_cryo) ? "On" : "Off"]
" - dat += "Ambient Occlusion: [toggles & AMBIENT_OCCLUSION ? "Enabled" : "Disabled"]
" dat += "Attack Animations: [(show_ghostitem_attack) ? "Yes" : "No"]
" if(unlock_content) diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt index 654a7e348d5..ad859d92543 100644 --- a/config/example/dbconfig.txt +++ b/config/example/dbconfig.txt @@ -9,7 +9,7 @@ ## This value must be set to the version of the paradise schema in use. ## If this value does not match, the SQL database will not be loaded and an error will be generated. ## Roundstart will be delayed. -DB_VERSION 10 +DB_VERSION 9 ## Server the MySQL database can be found at. # Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.