From 26274a342cec055fdfc6ebc3811eb2ca3b764334 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 9 Jan 2023 08:13:20 +0100 Subject: [PATCH] [MIRROR] Add config for station traits [MDB IGNORE] (#18468) * Add config for station traits * Update station.dm Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/controllers/configuration/entries/game_options.dm | 2 ++ code/controllers/subsystem/processing/station.dm | 7 ++----- config/game_options.txt | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index e303763c44c..e822a4d88e3 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -339,6 +339,8 @@ /datum/config_entry/flag/allow_random_events // Enables random events mid-round when set +/datum/config_entry/flag/forbid_station_traits + /datum/config_entry/number/events_min_time_mul // Multipliers for random events minimal starting time and minimal players amounts default = 1 min_val = 0 diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm index 17e599ebe63..23533e339ae 100644 --- a/code/controllers/subsystem/processing/station.dm +++ b/code/controllers/subsystem/processing/station.dm @@ -26,11 +26,8 @@ PROCESSING_SUBSYSTEM_DEF(station) ///Rolls for the amount of traits and adds them to the traits list /datum/controller/subsystem/processing/station/proc/SetupTraits() - // SKYRAT EDIT ADDITION - #ifdef LOWMEMORYMODE // NO MORE FUCKING STUPID STATION TRAITS ON STARTUP WHEN IM TESTING SHIT FUCK YOU - return - #endif - // SKYRAT EDIT END + if (CONFIG_GET(flag/forbid_station_traits)) + return if (fexists(FUTURE_STATION_TRAITS_FILE)) var/forced_traits_contents = file2text(FUTURE_STATION_TRAITS_FILE) diff --git a/config/game_options.txt b/config/game_options.txt index 0a2ca28678a..fa59a2100b0 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -135,6 +135,9 @@ DYNAMIC_CONFIG_ENABLED ## Comment this out to disable random events during the round. ALLOW_RANDOM_EVENTS +## Uncomment this to disable station traits. +#FORBID_STATION_TRAITS + ## Multiplier for earliest start time of dangerous events. ## Set to 0 to make dangerous events avaliable from round start. EVENTS_MIN_TIME_MUL 1