adjustments

This commit is contained in:
deathride58
2017-09-28 01:10:42 -04:00
parent 43574eefe1
commit 226ad9ddde
5 changed files with 16 additions and 16 deletions

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) && !jobban_isbanned(crewMind, "Syndicate") && GLOB.miscreants_allowed)
if(prob(2) && !issilicon(crewMind.current) && !jobban_isbanned(crewMind, "Syndicate") && GLOB.miscreants_allowed)
generate_miscreant_objectives(crewMind)
else
if(config.allow_crew_objectives)

View File

@@ -20,7 +20,7 @@
crewMind.objectives += newObjective
crewMind.special_role = "miscreant"
to_chat(crewMind, "<B><font size=3 color=red>You are a Miscreant.</font></B>")
to_chat(crewMind, "<B>Pursuing your objective is entirely optional, but it isn't tracked. Performing traitorous acts not directly related to your objective may result in permanent termination of your employment.</B>")
to_chat(crewMind, "<B>Pursuing your objective is entirely optional, as the completion of your objective is unable to be tracked. Performing traitorous acts not directly related to your objective may result in permanent termination of your employment.</B>")
to_chat(crewMind, "<B>Your objective:</B> [newObjective.explanation_text]")
/datum/objective/miscreant

View File

@@ -171,10 +171,10 @@
explanation_text = "Don't lose your holy rod."
if(owner && owner.current)
if(owner.current.check_contents_for(typesof(/obj/item/nullrod)))
return 1
return TRUE
if(owner.current.getorgan(/obj/item/organ/genital/penis))
return 1
return 0
return TRUE
return FALSE
/datum/objective/crew/curator
@@ -200,9 +200,9 @@
if(length(msg.returnBody()) >= charcount)
target_amount--
if(target_amount <= 0)
return 1
return TRUE
else
return 0
return FALSE
/datum/objective/crew/assistant

View File

@@ -614,21 +614,21 @@ SUBSYSTEM_DEF(ticker)
to_chat(crewMind.current, "<br><B>Your objective</B>: [CO.explanation_text] <font color='red'><B>Failed.</B></font>")
if (successfulCrew.len)
to_chat(world, "<B>The following crew members completed their Crew Objectives:</B>")
var/completedObjectives = "<B>The following crew members completed their Crew Objectives:</B><BR>"
for(var/i in successfulCrew)
to_chat(world, "[i]")
to_chat(world, "<BR>")
completedObjectives += "[i]<BR>"
to_chat(world, "[completedObjectives]<BR>")
else
to_chat(world, "<B>Nobody completed their Crew Objectives!</B>")
to_chat(world, "<BR>")
if(config.allow_crew_objectives)
to_chat(world, "<B>Nobody completed their Crew Objectives!</B><BR>")
CHECK_TICK
if (miscreants.len)
to_chat(world, "<B> The following crew members were miscreants:</B>")
var/miscreantObjectives = "<B>The following crew members were miscreants:</B><BR>"
for(var/i in miscreants)
to_chat(world, "[i]")
to_chat(world, "<BR>")
miscreantObjectives += "[i]<BR>"
to_chat(world, "[miscreantObjectives]<BR>")
CHECK_TICK

View File

@@ -370,7 +370,7 @@
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) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed)
if(prob(2) && !issilicon(humanc) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed)
SSticker.generate_miscreant_objectives(humanc.mind)
else
if(config.allow_crew_objectives)