From c0b23af1148c7733018ea004ce922f23fe53eebe Mon Sep 17 00:00:00 2001 From: MrStonedOne Date: Tue, 14 Nov 2017 12:36:43 -0800 Subject: [PATCH] Revert "hey it's been a week, time to Remove Secborg (#32708)" This reverts commit f59d9a870a7f4bc7d762afba673a1c4ac9ab283f. --- code/controllers/configuration/entries/game_options.dm | 2 ++ code/modules/mob/living/silicon/robot/robot.dm | 2 ++ config/game_options.txt | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 029e4ea481b..b7cf723c2c5 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -52,6 +52,8 @@ CONFIG_DEF(flag/humans_need_surnames) CONFIG_DEF(flag/allow_ai) // allow ai job +CONFIG_DEF(flag/disable_secborg) // disallow secborg module to be chosen. + CONFIG_DEF(flag/disable_peaceborg) CONFIG_DEF(number/traitor_scaling_coeff) //how much does the amount of players get divided by to determine traitors diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a511ca77f30..df872e25e7a 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -210,6 +210,8 @@ "Service" = /obj/item/robot_module/butler) if(!CONFIG_GET(flag/disable_peaceborg)) modulelist["Peacekeeper"] = /obj/item/robot_module/peacekeeper + if(!CONFIG_GET(flag/disable_secborg)) + modulelist["Security"] = /obj/item/robot_module/security var/input_module = input("Please, select a module!", "Robot", null, null) as null|anything in modulelist if(!input_module || module.type != /obj/item/robot_module) diff --git a/config/game_options.txt b/config/game_options.txt index bb796fc037a..85a9bc6d5b4 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -251,6 +251,10 @@ EVENTS_MIN_PLAYERS_MUL 1 ## Allow the AI job to be picked. ALLOW_AI +## Secborg ### +## Uncomment to prevent the security cyborg module from being chosen +#DISABLE_SECBORG + ## Peacekeeper Borg ### ## Uncomment to prevent the peacekeeper cyborg module from being chosen #DISABLE_PEACEBORG