diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 0c59407ca8..5ad749836b 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -471,18 +471,6 @@ SUBSYSTEM_DEF(ticker) var/list/successfulCrew = list() var/list/miscreants = list() - for(var/datum/mind/crewMind in minds) - if(!crewMind.current || !crewMind.objectives.len) - continue - for(var/datum/objective/miscreant/MO in crewMind.objectives) - miscreants += "[crewMind.current.real_name] (Played by: [crewMind.key]). Objective: [MO.explanation_text]" - for(var/datum/objective/crew/CO in crewMind.objectives) - if(CO.check_completion()) - to_chat(crewMind.current, "
Objective: [CO.explanation_text] Success!") - successfulCrew += "[crewMind.current.real_name] (Played by: [crewMind.key]). Objective: [CO.explanation_text]" - else - to_chat(crewMind.current, "
Objective: [CO.explanation_text] Failed.") - to_chat(world, "


The round has ended.") //Player status report @@ -600,12 +588,26 @@ SUBSYSTEM_DEF(ticker) CHECK_TICK + for(var/datum/mind/crewMind in minds) + if(!crewMind.current || !crewMind.objectives.len) + continue + for(var/datum/objective/miscreant/MO in crewMind.objectives) + miscreants += "[crewMind.current.real_name] (Played by: [crewMind.key]). Objective: [MO.explanation_text]" + for(var/datum/objective/crew/CO in crewMind.objectives) + if(CO.check_completion()) + to_chat(crewMind.current, "
Objective: [CO.explanation_text] Success!") + successfulCrew += "[crewMind.current.real_name] (Played by: [crewMind.key]). Objective: [CO.explanation_text]" + else + to_chat(crewMind.current, "
Objective: [CO.explanation_text] Failed.") + if (successfulCrew.len) to_chat(world, "The following crew members completed their Crew Objectives:") for(var/i in successfulCrew) to_chat(world, "[i]") + to_chat(world, "
") else to_chat(world, "Nobody completed their Crew Objectives!") + to_chat(world, "
") CHECK_TICK