From 7cb4bb59f99f3ba77129df89c6c8cda453b6c99c Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Sun, 29 Aug 2021 20:18:02 -0400 Subject: [PATCH] Greentexting as a traitor hardcore random now gives you hardcore random points (#60957) Every time a traitor greentexts with hardcore random, it runtimes and returns. I think it's because of the escape alive objective. I've tested this before and after several times just to be completely sure this fixes it. --- code/__HELPERS/roundend.dm | 6 ++---- code/modules/antagonists/traitor/datum_traitor.dm | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index cec522e0e0f..a3502d425f8 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -189,10 +189,8 @@ if(human_mob.mind && (human_mob.mind.special_role || length(human_mob.mind.antag_datums) > 0)) var/didthegamerwin = TRUE - for(var/a in human_mob.mind.antag_datums) - var/datum/antagonist/antag_datum = a - for(var/i in antag_datum.objectives) - var/datum/objective/objective_datum = i + for(var/datum/antagonist/antag_datums as anything in human_mob.mind.antag_datums) + for(var/datum/objective/objective_datum as anything in antag_datums.objectives) if(!objective_datum.check_completion()) didthegamerwin = FALSE if(!didthegamerwin) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index e51b5691a1b..7700b9519bf 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -107,7 +107,7 @@ // for(in...to) loops iterate inclusively, so to reach objective_limit we need to loop to objective_limit - 1 // This does not give them 1 fewer objectives than intended. for(var/i in objective_count to objective_limit - 1) - objectives += forge_single_generic_objective() + forge_single_generic_objective() /**