diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 1508e3b8ad..0ee07951a9 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -256,7 +256,6 @@ If not set, defaults to check_completion instead. Set it. It's used by cryo. else explanation_text = "Free Objective" -/* /datum/objective/maroon name = "maroon" var/target_role_type=0 @@ -282,7 +281,6 @@ If not set, defaults to check_completion instead. Set it. It's used by cryo. /datum/objective/maroon/admin_edit(mob/admin) admin_simple_target_pick(admin) -*/ /datum/objective/debrain name = "debrain" diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 0a2e079921..30e6a80e85 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -149,8 +149,6 @@ if(prob(50)) if(LAZYLEN(active_ais()) && prob(100/GLOB.joined_player_list.len)) add_objective(new/datum/objective/destroy, TRUE) - else if(prob(30)) - add_objective(new/datum/objective/maroon, TRUE) else add_objective(new/datum/objective/assassinate, TRUE) else diff --git a/code/modules/antagonists/traitor/classes/subterfuge.dm b/code/modules/antagonists/traitor/classes/subterfuge.dm index 07707b69e1..ea073f38c1 100644 --- a/code/modules/antagonists/traitor/classes/subterfuge.dm +++ b/code/modules/antagonists/traitor/classes/subterfuge.dm @@ -17,11 +17,6 @@ kill_objective.owner = T.owner kill_objective.find_target() T.add_objective(kill_objective) - else - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = T.owner - maroon_objective.find_target() - T.add_objective(maroon_objective) else var/list/weights = list() weights["sabo"] = length(subtypesof(/datum/sabotage_objective))