Merge remote-tracking branch 'mrstonedone/myhill' into HEAD

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

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)

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