diff --git a/code/citadel/cit_crewobjectives.dm b/code/citadel/cit_crewobjectives.dm
index 6b620215b4..73e6787334 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) && !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)
diff --git a/code/citadel/cit_miscreants.dm b/code/citadel/cit_miscreants.dm
index f33f6815af..f828127b55 100644
--- a/code/citadel/cit_miscreants.dm
+++ b/code/citadel/cit_miscreants.dm
@@ -20,7 +20,7 @@
crewMind.objectives += newObjective
crewMind.special_role = "miscreant"
to_chat(crewMind, "You are a Miscreant.")
- to_chat(crewMind, "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.")
+ to_chat(crewMind, "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.")
to_chat(crewMind, "Your objective: [newObjective.explanation_text]")
/datum/objective/miscreant
diff --git a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
index 94ac116446..3b81007a17 100644
--- a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
+++ b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
@@ -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
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 82b91bfa67..db0ab6abda 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -614,21 +614,21 @@ SUBSYSTEM_DEF(ticker)
to_chat(crewMind.current, "
Your objective: [CO.explanation_text] Failed.")
if (successfulCrew.len)
- to_chat(world, "The following crew members completed their Crew Objectives:")
+ var/completedObjectives = "The following crew members completed their Crew Objectives:
"
for(var/i in successfulCrew)
- to_chat(world, "[i]")
- to_chat(world, "
")
+ completedObjectives += "[i]
"
+ to_chat(world, "[completedObjectives]
")
else
- to_chat(world, "Nobody completed their Crew Objectives!")
- to_chat(world, "
")
+ if(config.allow_crew_objectives)
+ to_chat(world, "Nobody completed their Crew Objectives!
")
CHECK_TICK
if (miscreants.len)
- to_chat(world, " The following crew members were miscreants:")
+ var/miscreantObjectives = "The following crew members were miscreants:
"
for(var/i in miscreants)
- to_chat(world, "[i]")
- to_chat(world, "
")
+ miscreantObjectives += "[i]
"
+ to_chat(world, "[miscreantObjectives]
")
CHECK_TICK
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 00f664b59c..ff6eadb42c 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -370,7 +370,7 @@
if(GLOB.highlander)
to_chat(humanc, "THERE CAN BE ONLY ONE!!!")
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)