diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 6910b363f46..963933c5a19 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) var/datum/objective_holder/holder /// What is the text we show when our objective is delayed? - var/delayed_objective_text = "This is a bug! Report it on the github and ask an admin what type of objective" + var/delayed_objective_text = "Someone forgot to set a delayed objective text! Report it on the github and ask an admin what type of objective this is!" /// If the objective needs another person with a paired objective var/needs_pair = FALSE diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index f8b3ea52e8d..029798e3e89 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -151,9 +151,10 @@ RESTRICT_TYPE(/datum/antagonist/traitor) var/can_succeed_if_dead = TRUE // If our org has forced objectives, give them to us guaranteed. if(organization && length(organization.forced_objectives)) + var/list/instant_known_objs = list(/datum/objective/hijack, /datum/objective/nuke) for(var/forced_objectives in organization.forced_objectives) var/datum/objective/forced_obj = forced_objectives - if(!ispath(forced_obj, /datum/objective/hijack) && delayed_objectives) // Hijackers know their objective immediately + if(!is_path_in_list(forced_obj, instant_known_objs) && delayed_objectives) // Some objectives are known instantly forced_obj = new /datum/objective/delayed(forced_obj) add_antag_objective(forced_obj) iteration++