diff --git a/code/citadel/cit_crewobjectives.dm b/code/citadel/cit_crewobjectives.dm index f40d1fff3c..849dcef544 100644 --- a/code/citadel/cit_crewobjectives.dm +++ b/code/citadel/cit_crewobjectives.dm @@ -1,9 +1,10 @@ /datum/controller/subsystem/ticker/proc/generate_crew_objectives() for(var/datum/mind/crewMind in SSticker.minds) - if(prob(10) && !issilicon(crewMind.current) && GLOB.master_mode != "extended")//extended is supposed to have less chaos + if(prob(10) && !issilicon(crewMind.current) && GLOB.miscreants_allowed) generate_miscreant_objectives(crewMind) else - generate_individual_objectives(crewMind) + if(config.allow_crew_objectives) + generate_individual_objectives(crewMind) return /datum/controller/subsystem/ticker/proc/generate_individual_objectives(var/datum/mind/crewMind) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index d19484fd3f..43b7a2f258 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -286,6 +286,10 @@ GLOBAL_PROTECT(config_dir) var/debug_admin_hrefs = FALSE //turns off admin href token protection for debugging purposes + var/allow_crew_objectives = FALSE + var/allow_miscreants = FALSE + var/allow_extended_miscreants = FALSE + /datum/configuration/New() gamemode_cache = typecacheof(/datum/game_mode,TRUE) for(var/T in gamemode_cache) @@ -816,6 +820,12 @@ GLOBAL_PROTECT(config_dir) arrivals_shuttle_require_safe_latejoin = TRUE if("mice_roundstart") mice_roundstart = text2num(value) + if("allow_crew_objectives") + allow_crew_objectives = TRUE + if("allow_miscreants") + allow_miscreants = TRUE + if("allow_extended_miscreants") + allow_extended_miscreants = TRUE else WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'") else if(type == "policies") diff --git a/config/game_options.txt b/config/game_options.txt index bc178fcfcd..2f2f22165d 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -491,3 +491,14 @@ ARRIVALS_SHUTTLE_DOCK_WINDOW 55 MICE_ROUNDSTART 10 + +## CREW OBJECTIVES ## +## Comment to disable objectives for innocent crew members. +ALLOW_CREW_OBJECTIVES + +## MISCREANTS ## +## Comment to allow miscreants to spawn. Miscreants are a mini-antag with objectives that are not tracked. +ALLOW_MISCREANTS + +## Uncomment to let miscreants spawn during Extended. I hold no responsibility for fun that may occur while this is enabled. +#ALLOW_EXTENDED_MISCREANTS \ No newline at end of file