shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added config option to enable or disable miscreants and crew objectives

Browse Source
This commit is contained in:
deathride58
2017-09-19 20:56:16 -04:00
parent fac0e75103
commit 5f65202cfd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/cit_crewobjectives.dm
+1 -1
View File
@@ -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)
code/modules/mob/dead/new_player/new_player.dm
+3 -2
View File
@@ -367,10 +367,11 @@
if(GLOB.highlander)
to_chat(humanc, "<span class='userdanger'><i>THERE CAN BE ONLY ONE!!!</i></span>")
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