diff --git a/code/controllers/configuration_vr.dm b/code/controllers/configuration_vr.dm index f1298d4d61..61ac89ad69 100644 --- a/code/controllers/configuration_vr.dm +++ b/code/controllers/configuration_vr.dm @@ -4,8 +4,7 @@ /datum/configuration var/list/engine_map // Comma separated list of engines to choose from. Blank means fully random. - var/assistants_ratio - var/assistants_assured = 15 // Default 15, only used if the ratio is set though. + var/time_off = FALSE /hook/startup/proc/read_vs_config() var/list/Lines = file2list("config/config.txt") @@ -32,10 +31,6 @@ continue switch (name) - if ("assistants_ratio") - config.assistants_ratio = text2num(value) - if ("assistants_assured") - config.assistants_assured = text2num(value) if ("chat_webhook_url") config.chat_webhook_url = value if ("chat_webhook_key") @@ -46,5 +41,7 @@ config.fax_export_dir = value if ("items_survive_digestion") config.items_survive_digestion = 1 + if ("time_off") + config.time_off = TRUE return 1 diff --git a/code/controllers/subsystems/persist_vr.dm b/code/controllers/subsystems/persist_vr.dm index 651abe2130..57375d5378 100644 --- a/code/controllers/subsystems/persist_vr.dm +++ b/code/controllers/subsystems/persist_vr.dm @@ -16,6 +16,9 @@ SUBSYSTEM_DEF(persist) // Do PTO Accruals /datum/controller/subsystem/persist/proc/update_department_hours(var/resumed = FALSE) + if(!config.time_off) + return + establish_db_connection() if(!dbcon.IsConnected()) src.currentrun.Cut() diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 488c827eda..76de070805 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -259,11 +259,12 @@ return 0 // VOREStation Edit Start - Department Hours - var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'") - query_hours.Execute() - while(query_hours.NextRow()) - LAZYINITLIST(department_hours) - department_hours[query_hours.item[1]] = text2num(query_hours.item[2]) + if(config.time_off) + var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'") + query_hours.Execute() + while(query_hours.NextRow()) + LAZYINITLIST(department_hours) + department_hours[query_hours.item[1]] = text2num(query_hours.item[2]) // VOREStation Edit End - Department Hours if(sql_id) diff --git a/config/example/config.txt b/config/example/config.txt index f459a49d79..2536b1350e 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -399,3 +399,9 @@ STARLIGHT 0 ## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , # and - # DEFAULT_LANGUAGE_PREFIXES , # - + +# Control which submaps are loaded for the Dynamic Engine system +ENGINE_MAP Supermatter Engine,Edison's Bane + +# Controls if the 'time off' system is used for determining if players can play 'Off-Duty' jobs (requires SQL) +# time_off \ No newline at end of file