From e5e0fa5529d74edf001ebad2d94eaff9893be253 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Wed, 20 Mar 2024 09:16:31 -0400 Subject: [PATCH] [MIRROR] Fix hack comms console/locate weakpoint objective showing up multiple times (#1544) * Fix hack comms console/locate weakpoint objective showing up multiple times (#82083) ## About The Pull Request ![image](https://github.com/tgstation/tgstation/assets/66163761/6bb017ca-f6e1-4b95-90e4-9f3ae1e84eb4) Fix hack comms console/locate weakpoint objective showing up multiple times ## Why It's Good For The Game bugfix ## Changelog :cl: fix: Fix hack comms console/locate weakpoint objective showing up multiple times /:cl: * Fix hack comms console/locate weakpoint objective showing up multiple times --------- Co-authored-by: Xander3359 <66163761+Xander3359@users.noreply.github.com> --- .../modules/antagonists/traitor/objectives/hack_comm_console.dm | 2 ++ code/modules/antagonists/traitor/objectives/locate_weakpoint.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/modules/antagonists/traitor/objectives/hack_comm_console.dm b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm index 93323e4e15f..1874b79d8a1 100644 --- a/code/modules/antagonists/traitor/objectives/hack_comm_console.dm +++ b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm @@ -15,6 +15,8 @@ var/progression_objectives_minimum = 20 MINUTES /datum/traitor_objective/hack_comm_console/can_generate_objective(datum/mind/generating_for, list/possible_duplicates) + if(length(possible_duplicates) > 0) + return FALSE if(SStraitor.get_taken_count(/datum/traitor_objective/hack_comm_console) > 0) return FALSE if(handler.get_completion_progression(/datum/traitor_objective) < progression_objectives_minimum) diff --git a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm index 52813fcdf57..b3e211d2867 100644 --- a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm +++ b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm @@ -27,6 +27,8 @@ var/area/weakpoint_area /datum/traitor_objective/locate_weakpoint/can_generate_objective(datum/mind/generating_for, list/possible_duplicates) + if(length(possible_duplicates) > 0) + return FALSE if(handler.get_completion_progression(/datum/traitor_objective) < progression_objectives_minimum) return FALSE if(SStraitor.get_taken_count(/datum/traitor_objective/locate_weakpoint) > 0)