From 07a52425b0cd83ee4ed9359a64b0661581e4437a Mon Sep 17 00:00:00 2001 From: shodd Date: Wed, 18 Dec 2024 23:09:19 -0500 Subject: [PATCH 01/11] fine so far --- .../antagonists/traitor/objectives/assassination.dm | 10 +++++----- .../traitor/objectives/demoralise_assault.dm | 2 +- .../modules/antagonists/traitor/objectives/kill_pet.dm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index f60f16544a3a..dffd8539b3ad 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -28,7 +28,7 @@ abstract_type = /datum/traitor_objective/target_player/assassinate - progression_minimum = 30 MINUTES + progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 30 /** * Makes the objective only set heads as targets when true, and block them from being targets when false. @@ -48,13 +48,13 @@ name = "Assassinate %TARGET% the %JOB TITLE%, and plant a calling card" description = "Kill your target and plant a calling card in the pockets of your victim. If your calling card gets destroyed before you are able to plant it, this objective will fail." progression_reward = 2 MINUTES - telecrystal_reward = list(2, 4) + telecrystal_reward = list(4, 6) //MONKESTATION EDIT ORG: 2, 4 var/obj/item/paper/calling_card/card /datum/traitor_objective/target_player/assassinate/calling_card/heads_of_staff progression_reward = 4 MINUTES - telecrystal_reward = list(2, 3) + telecrystal_reward = list(5, 7) //MONKESTATION EDIT ORG: 2, 3 heads_of_staff = TRUE @@ -62,7 +62,7 @@ name = "Behead %TARGET%, the %JOB TITLE%" description = "Behead and hold %TARGET%'s head to succeed this objective. If the head gets destroyed before you can do this, you will fail this objective." progression_reward = 2 MINUTES - telecrystal_reward = list(2, 4) + telecrystal_reward = list(6, 8) //MONKESTATION EDIT ORG: 2, 4 ///the body who needs to hold the head var/mob/living/needs_to_hold_head @@ -71,7 +71,7 @@ /datum/traitor_objective/target_player/assassinate/behead/heads_of_staff progression_reward = 4 MINUTES - telecrystal_reward = list(3, 5) + telecrystal_reward = list(6, 9) //MONKESTATION EDIT ORG: 3, 5 heads_of_staff = TRUE diff --git a/code/modules/antagonists/traitor/objectives/demoralise_assault.dm b/code/modules/antagonists/traitor/objectives/demoralise_assault.dm index 095c646cb994..2011fdb9ff3d 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_assault.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_assault.dm @@ -19,7 +19,7 @@ progression_minimum = 0 MINUTES progression_maximum = 30 MINUTES progression_reward = list(4 MINUTES, 8 MINUTES) - telecrystal_reward = list(0, 1) + telecrystal_reward = list(2, 3) //MONKESTATION EDIT ORG: 0, 1 /// Min attacks required to pass the objective. Picked at random between this and max. var/min_attacks_required = 2 diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index 01ab042f11b0..f79be9a4b1b2 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -13,7 +13,7 @@ description = "The %DEPARTMENT HEAD% has particularly annoyed us by sending us spam emails and we want their %PET% dead to show them what happens when they cross us. " progression_minimum = 0 MINUTES - telecrystal_reward = list(1, 2) + telecrystal_reward = list(0, 1) progression_reward = list(3 MINUTES, 6 MINUTES) /// Possible heads mapped to their pet type. Can be a list of possible pets @@ -48,7 +48,7 @@ /datum/traitor_objective/kill_pet/high_risk progression_minimum = 25 MINUTES progression_reward = list(14 MINUTES, 18 MINUTES) - telecrystal_reward = list(2, 3) + telecrystal_reward = list(1, 2) limited_to_department_head = FALSE possible_heads = list( From b39bec09fddf45ecbe33632b2bbba78515f5aa71 Mon Sep 17 00:00:00 2001 From: shodd Date: Fri, 20 Dec 2024 17:03:10 -0500 Subject: [PATCH 02/11] saving --- .../antagonists/traitor/objectives/assassination.dm | 8 ++++---- .../antagonists/traitor/objectives/destroy_heirloom.dm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index dffd8539b3ad..92db42a96645 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -48,13 +48,13 @@ name = "Assassinate %TARGET% the %JOB TITLE%, and plant a calling card" description = "Kill your target and plant a calling card in the pockets of your victim. If your calling card gets destroyed before you are able to plant it, this objective will fail." progression_reward = 2 MINUTES - telecrystal_reward = list(4, 6) //MONKESTATION EDIT ORG: 2, 4 + telecrystal_reward = list(7, 8) //MONKESTATION EDIT ORG: 2, 4 var/obj/item/paper/calling_card/card /datum/traitor_objective/target_player/assassinate/calling_card/heads_of_staff progression_reward = 4 MINUTES - telecrystal_reward = list(5, 7) //MONKESTATION EDIT ORG: 2, 3 + telecrystal_reward = list(8, 9) //MONKESTATION EDIT ORG: 2, 3 heads_of_staff = TRUE @@ -62,7 +62,7 @@ name = "Behead %TARGET%, the %JOB TITLE%" description = "Behead and hold %TARGET%'s head to succeed this objective. If the head gets destroyed before you can do this, you will fail this objective." progression_reward = 2 MINUTES - telecrystal_reward = list(6, 8) //MONKESTATION EDIT ORG: 2, 4 + telecrystal_reward = list(8, 9) //MONKESTATION EDIT ORG: 2, 4 ///the body who needs to hold the head var/mob/living/needs_to_hold_head @@ -71,7 +71,7 @@ /datum/traitor_objective/target_player/assassinate/behead/heads_of_staff progression_reward = 4 MINUTES - telecrystal_reward = list(6, 9) //MONKESTATION EDIT ORG: 3, 5 + telecrystal_reward = list(10, 11) //MONKESTATION EDIT ORG: 3, 5 heads_of_staff = TRUE diff --git a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm index 9ee87e2097e7..d13d28a9b5e0 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm @@ -37,7 +37,7 @@ progression_minimum = 0 MINUTES progression_maximum = 30 MINUTES progression_reward = list(8 MINUTES, 12 MINUTES) - telecrystal_reward = list(1, 2) + telecrystal_reward = list(3, 4) //MONKESTATION EDIT ORG: 1, 2 target_jobs = list( // Medical /datum/job/doctor, @@ -73,7 +73,7 @@ progression_minimum = 0 MINUTES progression_maximum = 45 MINUTES progression_reward = list(8 MINUTES, 12 MINUTES) - telecrystal_reward = list(1, 2) + telecrystal_reward = list(4, 5) //MONKESTATION EDIT ORG: 1, 2 target_jobs = list( // Cargo /datum/job/quartermaster, @@ -92,7 +92,7 @@ /// 60 minutes in, syndicate won't care about rare heirlooms anymore progression_maximum = 60 MINUTES progression_reward = list(10 MINUTES, 14 MINUTES) - telecrystal_reward = list(2, 3) + telecrystal_reward = list(5, 6) //MONKESTATION EDIT ORG: 2, 3 target_jobs = list( // Security /datum/job/security_officer, @@ -107,7 +107,7 @@ /datum/traitor_objective/destroy_heirloom/captain progression_minimum = 30 MINUTES progression_reward = list(10 MINUTES, 14 MINUTES) - telecrystal_reward = 4 + telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 4 target_jobs = list( /datum/job/head_of_security, /datum/job/captain From eb940dad091615d430c45370ed5d14d8c54672b1 Mon Sep 17 00:00:00 2001 From: shodd Date: Sat, 21 Dec 2024 14:18:40 -0500 Subject: [PATCH 03/11] save --- code/modules/antagonists/traitor/objectives/destroy_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index ec247eac9edf..8751d66e8601 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -16,7 +16,7 @@ progression_minimum = 10 MINUTES progression_maximum = 35 MINUTES progression_reward = list(5 MINUTES, 10 MINUTES) - telecrystal_reward = 1 + telecrystal_reward = 5 //MONKESTATION EDIT ORG: 1 possible_items = list( /datum/objective_item/steal/traitor/bartender_shotgun, From 11dad6e917b120c990e1fff702789fcb130f39fa Mon Sep 17 00:00:00 2001 From: shodd Date: Sat, 21 Dec 2024 23:02:33 -0500 Subject: [PATCH 04/11] making PR --- .../antagonists/traitor/objectives/assassination.dm | 2 +- .../antagonists/traitor/objectives/eyesnatching.dm | 4 ++-- code/modules/antagonists/traitor/objectives/kill_pet.dm | 4 ++-- .../antagonists/traitor/objectives/sleeper_protocol.dm | 4 ++-- code/modules/antagonists/traitor/objectives/steal.dm | 9 +++++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index 92db42a96645..1fa36914525f 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -62,7 +62,7 @@ name = "Behead %TARGET%, the %JOB TITLE%" description = "Behead and hold %TARGET%'s head to succeed this objective. If the head gets destroyed before you can do this, you will fail this objective." progression_reward = 2 MINUTES - telecrystal_reward = list(8, 9) //MONKESTATION EDIT ORG: 2, 4 + telecrystal_reward = list(9, 10) //MONKESTATION EDIT ORG: 2, 4 ///the body who needs to hold the head var/mob/living/needs_to_hold_head diff --git a/code/modules/antagonists/traitor/objectives/eyesnatching.dm b/code/modules/antagonists/traitor/objectives/eyesnatching.dm index f7df7ea22a7d..1f3a2a232308 100644 --- a/code/modules/antagonists/traitor/objectives/eyesnatching.dm +++ b/code/modules/antagonists/traitor/objectives/eyesnatching.dm @@ -13,7 +13,7 @@ progression_minimum = 10 MINUTES progression_reward = list(4 MINUTES, 8 MINUTES) - telecrystal_reward = list(1, 2) + telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 1, 2 /// If we're targeting heads of staff or not var/heads_of_staff = FALSE @@ -37,7 +37,7 @@ /datum/traitor_objective/target_player/eyesnatching/heads progression_reward = list(6 MINUTES, 12 MINUTES) - telecrystal_reward = list(2, 3) + telecrystal_reward = list(7, 8) //MONKESTATION EDIT ORG: 2, 3 heads_of_staff = TRUE diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index f79be9a4b1b2..d0331d6da91c 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -13,7 +13,7 @@ description = "The %DEPARTMENT HEAD% has particularly annoyed us by sending us spam emails and we want their %PET% dead to show them what happens when they cross us. " progression_minimum = 0 MINUTES - telecrystal_reward = list(0, 1) + telecrystal_reward = list(0, 1) //MONKESTATION EDIT ORG: 1, 2 progression_reward = list(3 MINUTES, 6 MINUTES) /// Possible heads mapped to their pet type. Can be a list of possible pets @@ -48,7 +48,7 @@ /datum/traitor_objective/kill_pet/high_risk progression_minimum = 25 MINUTES progression_reward = list(14 MINUTES, 18 MINUTES) - telecrystal_reward = list(1, 2) + telecrystal_reward = list(2, 3) limited_to_department_head = FALSE possible_heads = list( diff --git a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm index 0577a9d190e5..a19563cb2b43 100644 --- a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm +++ b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm @@ -12,7 +12,7 @@ progression_minimum = 0 MINUTES progression_reward = list(8 MINUTES, 15 MINUTES) - telecrystal_reward = 1 + telecrystal_reward = 2 //MONKESTATION EDIT ORG: 1 var/list/limited_to = list( JOB_CHIEF_MEDICAL_OFFICER, @@ -133,6 +133,6 @@ /datum/traitor_objective/sleeper_protocol/everybody //Much harder for non-med and non-robo progression_minimum = 30 MINUTES progression_reward = list(8 MINUTES, 15 MINUTES) - telecrystal_reward = 3 + telecrystal_reward = 4 //MONKESTATION EDIT ORG: 3 inverted_limitation = TRUE diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index ea177f343e16..992e66168379 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -68,7 +68,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) /// The current target item that we are stealing. var/datum/objective_item/steal/target_item /// A list of 2 elements, which contain the range that the time will be in. Represented in minutes. - var/hold_time_required = list(5, 15) + var/hold_time_required = list(5, 10) //MONKESTATION EDIT ORG: 5, 15 /// The current time fulfilled around the item var/time_fulfilled = 0 /// The maximum distance between the bug and the objective taker for time to count as fulfilled @@ -91,11 +91,11 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) progression_minimum = 10 MINUTES progression_maximum = 35 MINUTES progression_reward = list(5 MINUTES, 10 MINUTES) - telecrystal_reward = 0 + telecrystal_reward = 1 //MONKESTATION EDIT ORG: 0 minutes_per_telecrystal = 6 possible_items = list( - /datum/objective_item/steal/traitor/cargo_budget, + //datum/objective_item/steal/traitor/cargo_budget, MONKESTATION EDIT MOVED TO SOMEWHAT RISKY /datum/objective_item/steal/traitor/clown_shoes, /datum/objective_item/steal/traitor/lawyers_badge, /datum/objective_item/steal/traitor/chef_moustache, @@ -109,7 +109,8 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) telecrystal_reward = 2 possible_items = list( - /datum/objective_item/steal/traitor/chief_engineer_belt + /datum/objective_item/steal/traitor/chief_engineer_belt, + /datum/objective_item/steal/traitor/cargo_budget, //MONKESTATION ADDITION ) /datum/traitor_objective/steal_item/very_risky From e6f9d8aaeee4d39de0191ef30adfc3062dc543bd Mon Sep 17 00:00:00 2001 From: shodd Date: Sat, 21 Dec 2024 23:15:21 -0500 Subject: [PATCH 05/11] lowered assassination --- .../antagonists/traitor/objectives/assassination.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index 1fa36914525f..ffc32bbc8874 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -48,13 +48,13 @@ name = "Assassinate %TARGET% the %JOB TITLE%, and plant a calling card" description = "Kill your target and plant a calling card in the pockets of your victim. If your calling card gets destroyed before you are able to plant it, this objective will fail." progression_reward = 2 MINUTES - telecrystal_reward = list(7, 8) //MONKESTATION EDIT ORG: 2, 4 + telecrystal_reward = list(5, 6) //MONKESTATION EDIT ORG: 2, 4 var/obj/item/paper/calling_card/card /datum/traitor_objective/target_player/assassinate/calling_card/heads_of_staff progression_reward = 4 MINUTES - telecrystal_reward = list(8, 9) //MONKESTATION EDIT ORG: 2, 3 + telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 2, 3 heads_of_staff = TRUE @@ -62,7 +62,7 @@ name = "Behead %TARGET%, the %JOB TITLE%" description = "Behead and hold %TARGET%'s head to succeed this objective. If the head gets destroyed before you can do this, you will fail this objective." progression_reward = 2 MINUTES - telecrystal_reward = list(9, 10) //MONKESTATION EDIT ORG: 2, 4 + telecrystal_reward = 7 //MONKESTATION EDIT ORG: 2, 4 ///the body who needs to hold the head var/mob/living/needs_to_hold_head @@ -71,7 +71,7 @@ /datum/traitor_objective/target_player/assassinate/behead/heads_of_staff progression_reward = 4 MINUTES - telecrystal_reward = list(10, 11) //MONKESTATION EDIT ORG: 3, 5 + telecrystal_reward = list(7, 8) //MONKESTATION EDIT ORG: 3, 5 heads_of_staff = TRUE From f39d26842d9559720c87824d11061e2a9a6fadb5 Mon Sep 17 00:00:00 2001 From: shodd Date: Sat, 21 Dec 2024 23:20:29 -0500 Subject: [PATCH 06/11] more changes --- code/modules/antagonists/traitor/objectives/destroy_item.dm | 4 ++-- code/modules/antagonists/traitor/objectives/eyesnatching.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index 8751d66e8601..4032c22372d2 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -16,7 +16,7 @@ progression_minimum = 10 MINUTES progression_maximum = 35 MINUTES progression_reward = list(5 MINUTES, 10 MINUTES) - telecrystal_reward = 5 //MONKESTATION EDIT ORG: 1 + telecrystal_reward = 3 //MONKESTATION EDIT ORG: 1 possible_items = list( /datum/objective_item/steal/traitor/bartender_shotgun, @@ -28,7 +28,7 @@ /datum/traitor_objective/destroy_item/very_risky progression_minimum = 40 MINUTES progression_reward = 15 MINUTES - telecrystal_reward = list(6, 9) + telecrystal_reward = list(3, 4) possible_items = list( /datum/objective_item/steal/blackbox, diff --git a/code/modules/antagonists/traitor/objectives/eyesnatching.dm b/code/modules/antagonists/traitor/objectives/eyesnatching.dm index 1f3a2a232308..5636d6a0b4b3 100644 --- a/code/modules/antagonists/traitor/objectives/eyesnatching.dm +++ b/code/modules/antagonists/traitor/objectives/eyesnatching.dm @@ -13,7 +13,7 @@ progression_minimum = 10 MINUTES progression_reward = list(4 MINUTES, 8 MINUTES) - telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 1, 2 + telecrystal_reward = list(5, 6) //MONKESTATION EDIT ORG: 1, 2 /// If we're targeting heads of staff or not var/heads_of_staff = FALSE @@ -37,7 +37,7 @@ /datum/traitor_objective/target_player/eyesnatching/heads progression_reward = list(6 MINUTES, 12 MINUTES) - telecrystal_reward = list(7, 8) //MONKESTATION EDIT ORG: 2, 3 + telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 2, 3 heads_of_staff = TRUE From 1a350a7e173ccf49ea81d3b610df2ebaf3d5883b Mon Sep 17 00:00:00 2001 From: shodd Date: Mon, 23 Dec 2024 17:38:27 -0500 Subject: [PATCH 07/11] for later --- .../antagonists/traitor/objectives/demoralise_assault.dm | 2 +- .../antagonists/traitor/objectives/destroy_heirloom.dm | 2 +- code/modules/antagonists/traitor/objectives/destroy_item.dm | 2 +- code/modules/antagonists/traitor/objectives/kill_pet.dm | 3 ++- .../antagonists/traitor/objectives/sabotage_machinery.dm | 4 ++-- code/modules/antagonists/traitor/objectives/steal.dm | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/modules/antagonists/traitor/objectives/demoralise_assault.dm b/code/modules/antagonists/traitor/objectives/demoralise_assault.dm index 2011fdb9ff3d..a8361fa79830 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_assault.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_assault.dm @@ -17,7 +17,7 @@ duplicate_type = /datum/traitor_objective/target_player progression_minimum = 0 MINUTES - progression_maximum = 30 MINUTES + progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 30 progression_reward = list(4 MINUTES, 8 MINUTES) telecrystal_reward = list(2, 3) //MONKESTATION EDIT ORG: 0, 1 diff --git a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm index d13d28a9b5e0..20eeec82f564 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm @@ -35,7 +35,7 @@ /datum/traitor_objective/destroy_heirloom/common /// 30 minutes in, syndicate won't care about common heirlooms anymore progression_minimum = 0 MINUTES - progression_maximum = 30 MINUTES + progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 30 progression_reward = list(8 MINUTES, 12 MINUTES) telecrystal_reward = list(3, 4) //MONKESTATION EDIT ORG: 1, 2 target_jobs = list( diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index 4032c22372d2..6697e6a1e253 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -13,7 +13,7 @@ abstract_type = /datum/traitor_objective/destroy_item /datum/traitor_objective/destroy_item/low_risk - progression_minimum = 10 MINUTES + progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 10 progression_maximum = 35 MINUTES progression_reward = list(5 MINUTES, 10 MINUTES) telecrystal_reward = 3 //MONKESTATION EDIT ORG: 1 diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index d0331d6da91c..2c9764018f4a 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -13,6 +13,7 @@ description = "The %DEPARTMENT HEAD% has particularly annoyed us by sending us spam emails and we want their %PET% dead to show them what happens when they cross us. " progression_minimum = 0 MINUTES + progression_maximum = 20 MINUTES //MONKESTATION ADDITION telecrystal_reward = list(0, 1) //MONKESTATION EDIT ORG: 1, 2 progression_reward = list(3 MINUTES, 6 MINUTES) @@ -41,7 +42,7 @@ duplicate_type = /datum/traitor_objective/kill_pet /datum/traitor_objective/kill_pet/medium_risk - progression_minimum = 10 MINUTES + progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 10 MINUTES progression_reward = list(5 MINUTES, 8 MINUTES) limited_to_department_head = FALSE diff --git a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm index 48a295989816..eb8657111d3c 100644 --- a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm +++ b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm @@ -65,7 +65,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han progression_reward = list(5 MINUTES, 10 MINUTES) telecrystal_reward = list(3, 4) - progression_minimum = 15 MINUTES + progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 15 progression_maximum = 30 MINUTES applicable_jobs = list( @@ -82,7 +82,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han telecrystal_reward = 0 // Only from completing the bonus objective progression_minimum = 0 MINUTES - progression_maximum = 10 MINUTES + progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 10 MINUTES maximum_allowed = 2 applicable_jobs = list( diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index 992e66168379..b80300663ae9 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -88,8 +88,8 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) abstract_type = /datum/traitor_objective/steal_item /datum/traitor_objective/steal_item/low_risk - progression_minimum = 10 MINUTES - progression_maximum = 35 MINUTES + progression_minimum = 0 MINUTES //MONKESTATION EDIT ORG: 10 MINUTES + progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 35 MINUTES progression_reward = list(5 MINUTES, 10 MINUTES) telecrystal_reward = 1 //MONKESTATION EDIT ORG: 0 minutes_per_telecrystal = 6 From f3f35653119557e3969ff20cef7c4041d8ff74b8 Mon Sep 17 00:00:00 2001 From: shodd Date: Sun, 12 Jan 2025 12:28:53 -0500 Subject: [PATCH 08/11] rep changes undone --- code/modules/antagonists/traitor/objectives/assassination.dm | 2 +- .../antagonists/traitor/objectives/demoralise_assault.dm | 2 +- .../antagonists/traitor/objectives/destroy_heirloom.dm | 2 +- code/modules/antagonists/traitor/objectives/kill_pet.dm | 4 ++-- .../antagonists/traitor/objectives/sabotage_machinery.dm | 4 ++-- code/modules/antagonists/traitor/objectives/steal.dm | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index ffc32bbc8874..256778d9e03b 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -28,7 +28,7 @@ abstract_type = /datum/traitor_objective/target_player/assassinate - progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 30 + progression_minimum = 30 MINUTES /** * Makes the objective only set heads as targets when true, and block them from being targets when false. diff --git a/code/modules/antagonists/traitor/objectives/demoralise_assault.dm b/code/modules/antagonists/traitor/objectives/demoralise_assault.dm index a8361fa79830..2011fdb9ff3d 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_assault.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_assault.dm @@ -17,7 +17,7 @@ duplicate_type = /datum/traitor_objective/target_player progression_minimum = 0 MINUTES - progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 30 + progression_maximum = 30 MINUTES progression_reward = list(4 MINUTES, 8 MINUTES) telecrystal_reward = list(2, 3) //MONKESTATION EDIT ORG: 0, 1 diff --git a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm index 20eeec82f564..d13d28a9b5e0 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm @@ -35,7 +35,7 @@ /datum/traitor_objective/destroy_heirloom/common /// 30 minutes in, syndicate won't care about common heirlooms anymore progression_minimum = 0 MINUTES - progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 30 + progression_maximum = 30 MINUTES progression_reward = list(8 MINUTES, 12 MINUTES) telecrystal_reward = list(3, 4) //MONKESTATION EDIT ORG: 1, 2 target_jobs = list( diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index 2c9764018f4a..e2c5564f4c0c 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -13,7 +13,7 @@ description = "The %DEPARTMENT HEAD% has particularly annoyed us by sending us spam emails and we want their %PET% dead to show them what happens when they cross us. " progression_minimum = 0 MINUTES - progression_maximum = 20 MINUTES //MONKESTATION ADDITION + //progression_maximum = 20 MINUTES //MONKESTATION ADDITION 4 later telecrystal_reward = list(0, 1) //MONKESTATION EDIT ORG: 1, 2 progression_reward = list(3 MINUTES, 6 MINUTES) @@ -42,7 +42,7 @@ duplicate_type = /datum/traitor_objective/kill_pet /datum/traitor_objective/kill_pet/medium_risk - progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 10 MINUTES + progression_minimum = 10 MINUTES progression_reward = list(5 MINUTES, 8 MINUTES) limited_to_department_head = FALSE diff --git a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm index f2e589df6c72..f7e824f475f4 100644 --- a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm +++ b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm @@ -65,7 +65,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han progression_reward = list(5 MINUTES, 10 MINUTES) telecrystal_reward = list(3, 4) - progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 15 + progression_minimum = 15 MINUTES progression_maximum = 30 MINUTES applicable_jobs = list( @@ -82,7 +82,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han telecrystal_reward = 0 // Only from completing the bonus objective progression_minimum = 0 MINUTES - progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 10 MINUTES + progression_maximum = 10 MINUTES maximum_allowed = 2 applicable_jobs = list( diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index b80300663ae9..992e66168379 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -88,8 +88,8 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) abstract_type = /datum/traitor_objective/steal_item /datum/traitor_objective/steal_item/low_risk - progression_minimum = 0 MINUTES //MONKESTATION EDIT ORG: 10 MINUTES - progression_maximum = 20 MINUTES //MONKESTATION EDIT ORG: 35 MINUTES + progression_minimum = 10 MINUTES + progression_maximum = 35 MINUTES progression_reward = list(5 MINUTES, 10 MINUTES) telecrystal_reward = 1 //MONKESTATION EDIT ORG: 0 minutes_per_telecrystal = 6 From 11420086b99f71e46646e20345e3ef1803c5f868 Mon Sep 17 00:00:00 2001 From: shodd Date: Sun, 12 Jan 2025 12:29:55 -0500 Subject: [PATCH 09/11] forgot one --- code/modules/antagonists/traitor/objectives/destroy_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index 6697e6a1e253..4032c22372d2 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -13,7 +13,7 @@ abstract_type = /datum/traitor_objective/destroy_item /datum/traitor_objective/destroy_item/low_risk - progression_minimum = 20 MINUTES //MONKESTATION EDIT ORG: 10 + progression_minimum = 10 MINUTES progression_maximum = 35 MINUTES progression_reward = list(5 MINUTES, 10 MINUTES) telecrystal_reward = 3 //MONKESTATION EDIT ORG: 1 From a119126512d74bfe4348b71ca9627d9a5118ff0d Mon Sep 17 00:00:00 2001 From: shodd Date: Sun, 12 Jan 2025 12:44:19 -0500 Subject: [PATCH 10/11] bartender shotgun --- code/modules/antagonists/traitor/objectives/destroy_item.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index 4032c22372d2..4e994417438e 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -19,7 +19,7 @@ telecrystal_reward = 3 //MONKESTATION EDIT ORG: 1 possible_items = list( - /datum/objective_item/steal/traitor/bartender_shotgun, + // /datum/objective_item/steal/traitor/bartender_shotgun, MONKESTATION REMOVAL /datum/objective_item/steal/traitor/fireaxe, /datum/objective_item/steal/traitor/nullrod, /datum/objective_item/steal/traitor/big_crowbar, @@ -32,6 +32,7 @@ possible_items = list( /datum/objective_item/steal/blackbox, + /datum/objective_item/steal/traitor/bartender_shotgun, //MONKESTATION ADDITION ) /// Super early-game destroy objective intended to be items easily tided that the crew tends to value. From cea90af729b9e56c23a414780b68467cb5324a69 Mon Sep 17 00:00:00 2001 From: shodd Date: Sun, 12 Jan 2025 12:47:37 -0500 Subject: [PATCH 11/11] forgot edit --- code/modules/antagonists/traitor/objectives/destroy_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index 4e994417438e..c0ce4a84068a 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -28,7 +28,7 @@ /datum/traitor_objective/destroy_item/very_risky progression_minimum = 40 MINUTES progression_reward = 15 MINUTES - telecrystal_reward = list(3, 4) + telecrystal_reward = list(3, 4) //MONKESTATION EDIT ORG: 6, 9 Nice possible_items = list( /datum/objective_item/steal/blackbox,