From 5f65202cfd0fb36f78e2adb661f0ef72b3940706 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 19 Sep 2017 20:56:16 -0400 Subject: [PATCH] added config option to enable or disable miscreants and crew objectives --- code/citadel/cit_crewobjectives.dm | 2 +- code/modules/mob/dead/new_player/new_player.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/citadel/cit_crewobjectives.dm b/code/citadel/cit_crewobjectives.dm index 7a4e68850b..172f1b59d3 100644 --- a/code/citadel/cit_crewobjectives.dm +++ b/code/citadel/cit_crewobjectives.dm @@ -1,6 +1,6 @@ /datum/controller/subsystem/ticker/proc/generate_crew_objectives() for(var/datum/mind/crewMind in SSticker.minds) - if(prob(10) && !issilicon(crewMind.current) && GLOB.miscreants_allowed) + if(prob(10) && !issilicon(crewMind.current) && !jobban_isbanned(crewMind, "Syndicate") && GLOB.miscreants_allowed) generate_miscreant_objectives(crewMind) else if(config.allow_crew_objectives) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 349ee546a4..bf8836fb72 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -367,10 +367,11 @@ if(GLOB.highlander) to_chat(humanc, "THERE CAN BE ONLY ONE!!!") humanc.make_scottish() - if(prob(10) && !issilicon(humanc) && GLOB.master_mode != "extended") + if(prob(10) && !issilicon(humanc) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed) SSticker.generate_miscreant_objectives(humanc.mind) else - SSticker.generate_individual_objectives(humanc.mind) + if(config.allow_crew_objectives) + SSticker.generate_individual_objectives(humanc.mind) GLOB.joined_player_list += character.ckey GLOB.latejoiners += character