From d851beea169841569078665b771b6f154700e26e Mon Sep 17 00:00:00 2001 From: r4d6 Date: Mon, 23 Dec 2019 10:23:55 -0500 Subject: [PATCH] Revert "Add the option to restrict the Engine that spawn" This reverts commit e3e1f9163538fb221a0697f6e36448032b3199d5. --- code/controllers/configuration/config_entry.dm | 4 +--- code/controllers/configuration/entries/game_options.dm | 6 ------ code/game/objects/effects/landmarks.dm | 5 ----- config/game_options.txt | 5 ----- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index 8eb6712a5b..be9f7e116b 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -151,7 +151,6 @@ var/key_mode var/value_mode var/splitter = " " - var/lowercase = TRUE /datum/config_entry/keyed_list/New() . = ..() @@ -168,8 +167,7 @@ var/key_value = null if(key_pos || value_mode == VALUE_MODE_FLAG) - if(lowercase) - key_name = lowertext(copytext(str_val, 1, key_pos)) + key_name = lowertext(copytext(str_val, 1, key_pos)) key_value = copytext(str_val, key_pos + 1) var/new_key var/new_value diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index a96142ef73..fdddbda344 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -379,9 +379,3 @@ /datum/config_entry/number/auto_transfer_delay config_entry_value = 72000 min_val = 0 - -/datum/config_entry/keyed_list/box_random_engine - key_mode = KEY_MODE_TEXT - value_mode = VALUE_MODE_TEXT - lowercase = FALSE - splitter = "-" \ No newline at end of file diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index e01010baa5..297d69a215 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -476,8 +476,3 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) /obj/effect/landmark/stationroom/box/engine template_names = list("Engine SM", "Engine Singulo", "Engine Tesla") icon = 'icons/rooms/box/engine.dmi' - - -/obj/effect/landmark/stationroom/box/engine/New() - . = ..() - template_names = CONFIG_GET(keyed_list/box_random_engine) \ No newline at end of file diff --git a/config/game_options.txt b/config/game_options.txt index 3cf2e518a4..3b031bb5b9 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -574,8 +574,3 @@ MONKEYCAP 64 #Replaces standard extended/secret dichotomy with extended and calm/chaotic votes for dynamic. DYNAMIC_VOTING - -## Choose which Engine to start the round with -BOX_RANDOM_ENGINE Engine SM -BOX_RANDOM_ENGINE Engine Tesla -BOX_RANDOM_ENGINE Engine Singulo \ No newline at end of file