From ec00c9ab0a377957e24b786c31e9d0c9c1f1d96c Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 12 Feb 2021 17:28:42 +0100 Subject: [PATCH 1/6] i only see toxic gameplay with this objective --- code/game/gamemodes/objective.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 0ee07951a9..1508e3b8ad 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -256,6 +256,7 @@ 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 @@ -281,6 +282,7 @@ 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" From 503c276f9f8d2b8a96115046fa2df7d9a6972b5c Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 12 Feb 2021 18:25:03 +0100 Subject: [PATCH 2/6] uh second try --- code/game/gamemodes/objective.dm | 2 -- code/modules/antagonists/brother/brother.dm | 2 -- code/modules/antagonists/traitor/classes/subterfuge.dm | 5 ----- 3 files changed, 9 deletions(-) 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)) From 70303319f46ddfbd634af5f5a1e602a037e28b68 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 12 Feb 2021 18:26:52 +0100 Subject: [PATCH 3/6] hrnngh CTRL+S doesnt save everything --- code/modules/antagonists/changeling/changeling.dm | 8 -------- code/modules/antagonists/traitor/classes/assassin.dm | 5 ----- code/modules/antagonists/traitor/classes/human.dm | 5 ----- 3 files changed, 18 deletions(-) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 7a34af4d13..4b4d72fa12 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -441,14 +441,6 @@ else kill_objective.find_target() objectives += kill_objective - else - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = owner - if(team_mode) - maroon_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1) - else - maroon_objective.find_target() - objectives += maroon_objective if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible) var/datum/objective/escape/escape_with_identity/identity_theft = new diff --git a/code/modules/antagonists/traitor/classes/assassin.dm b/code/modules/antagonists/traitor/classes/assassin.dm index 6b709aac59..584002781a 100644 --- a/code/modules/antagonists/traitor/classes/assassin.dm +++ b/code/modules/antagonists/traitor/classes/assassin.dm @@ -20,11 +20,6 @@ destroy_objective.owner = T.owner destroy_objective.find_target() T.add_objective(destroy_objective) - else if(prob(30) || (is_dynamic && (mode.storyteller.flags & NO_ASSASSIN))) - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = T.owner - maroon_objective.find_target() - T.add_objective(maroon_objective) else if(prob(permakill_prob)) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = T.owner diff --git a/code/modules/antagonists/traitor/classes/human.dm b/code/modules/antagonists/traitor/classes/human.dm index 30aa11e39d..16f65a63c3 100644 --- a/code/modules/antagonists/traitor/classes/human.dm +++ b/code/modules/antagonists/traitor/classes/human.dm @@ -41,11 +41,6 @@ destroy_objective.owner = T.owner destroy_objective.find_target() T.add_objective(destroy_objective) - else if(prob(30) || (is_dynamic && (mode.storyteller.flags & NO_ASSASSIN))) - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = T.owner - maroon_objective.find_target() - T.add_objective(maroon_objective) else if(prob(max(0,assassin_prob-20))) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = T.owner From 806d96076e3653b8ea6f35d5c3573c3456e6bb5f Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 12 Feb 2021 18:41:58 +0100 Subject: [PATCH 4/6] i dont actually know how to code btw --- code/modules/antagonists/changeling/changeling.dm | 9 +++++++++ code/modules/antagonists/traitor/classes/assassin.dm | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 4b4d72fa12..c861dbd1bb 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -441,6 +441,15 @@ else kill_objective.find_target() objectives += kill_objective + + else + var/datum/objective/maroon/maroon_objective = new + maroon_objective.owner = owner + if(team_mode) + maroon_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1) + else + maroon_objective.find_target() + objectives += maroon_objective if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible) var/datum/objective/escape/escape_with_identity/identity_theft = new diff --git a/code/modules/antagonists/traitor/classes/assassin.dm b/code/modules/antagonists/traitor/classes/assassin.dm index 584002781a..02b376ee99 100644 --- a/code/modules/antagonists/traitor/classes/assassin.dm +++ b/code/modules/antagonists/traitor/classes/assassin.dm @@ -12,7 +12,6 @@ var/datum/game_mode/dynamic/mode if(istype(SSticker.mode,/datum/game_mode/dynamic)) mode = SSticker.mode - is_dynamic = TRUE permakill_prob = max(0,mode.threat_level-50) var/list/active_ais = active_ais() if(active_ais.len && prob(100/GLOB.joined_player_list.len)) From eacf1ef40b4092dfdc3dcb701cf22e74098010ba Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 12 Feb 2021 19:20:22 +0100 Subject: [PATCH 5/6] dynamic still has permakill obj but i aint touching dynamic code --- code/modules/antagonists/traitor/classes/assassin.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/antagonists/traitor/classes/assassin.dm b/code/modules/antagonists/traitor/classes/assassin.dm index 02b376ee99..8175ad9736 100644 --- a/code/modules/antagonists/traitor/classes/assassin.dm +++ b/code/modules/antagonists/traitor/classes/assassin.dm @@ -8,7 +8,6 @@ /datum/traitor_class/human/assassin/forge_single_objective(datum/antagonist/traitor/T) .=1 var/permakill_prob = 20 - var/is_dynamic = FALSE var/datum/game_mode/dynamic/mode if(istype(SSticker.mode,/datum/game_mode/dynamic)) mode = SSticker.mode From c40427da056fe42e46bfbff89ff8a656f15499ab Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 12 Feb 2021 19:23:59 +0100 Subject: [PATCH 6/6] i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings i hate changelings --- code/modules/antagonists/changeling/changeling.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index c861dbd1bb..ba4578add9 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -442,19 +442,19 @@ kill_objective.find_target() objectives += kill_objective - else + /*else var/datum/objective/maroon/maroon_objective = new maroon_objective.owner = owner if(team_mode) maroon_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1) else maroon_objective.find_target() - objectives += maroon_objective + objectives += maroon_objective*/ if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible) var/datum/objective/escape/escape_with_identity/identity_theft = new identity_theft.owner = owner - identity_theft.target = maroon_objective.target + identity_theft.target = kill_objective.target identity_theft.update_explanation_text() objectives += identity_theft escape_objective_possible = FALSE