Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Progtot reward rebalancing 1/2 #4645

Closed
wants to merge 14 commits into from
Prev Previous commit
Next Next commit
making PR
  • Loading branch information
shodd committed Dec 22, 2024
commit 11dad6e917b120c990e1fff702789fcb130f39fa
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/antagonists/traitor/objectives/eyesnatching.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/modules/antagonists/traitor/objectives/kill_pet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
9 changes: 5 additions & 4 deletions code/modules/antagonists/traitor/objectives/steal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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
Expand Down
Loading