From e7ddceed739959b3e952bf6b2729d16cef2af7a6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 4 Feb 2024 14:00:15 +0100 Subject: [PATCH] [MIRROR] Lowers contractor baton cost. Baton can only be bought by roundstart traitors, while midroll/latejoin traitors cannot buy a baton (They must buy the contractor kit for one). (#26344) * Lowers contractor baton cost. Baton can only be bought by roundstart traitors, while midroll/latejoin traitors cannot buy a baton (They must buy the contractor kit for one). (#81204) ## About The Pull Request Contractor baton 12 -> 7 TC Mid/latejoin traitors can no longer buy a baton (They must buy the contractor kit) Fix midroll/latejoin traitors having access to roundstart traitor shop. ## Why It's Good For The Game ![image](https://github.com/tgstation/tgstation/assets/66163761/61d1c243-72bd-43e1-b404-666da06d1c4e) ![image](https://github.com/tgstation/tgstation/assets/66163761/1d58c782-925e-446b-8fe4-8fbfc32774e7) ## Changelog :cl: balance: Contractor baton costs 7 TC (down from 12 TC) balance: Midroll/Latejoin traitors can no longer buy the baton, they must buy the whole kit fix: Midroll/Latejoin traitors no longer have access to roundstart traitor exclusive items /:cl: * Lowers contractor baton cost. Baton can only be bought by roundstart traitors, while midroll/latejoin traitors cannot buy a baton (They must buy the contractor kit for one). --------- Co-authored-by: Xander3359 <66163761+Xander3359@users.noreply.github.com> --- code/modules/antagonists/traitor/datum_traitor.dm | 2 +- code/modules/uplink/uplink_items/contractor.dm | 2 +- code/modules/uplink/uplink_items/stealthy.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index ea88c7e4900..13d3e6ebd8e 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -57,7 +57,7 @@ // There will still be a timelock on uplink items name = "\improper Infiltrator" give_secondary_objectives = FALSE - uplink_flag_given = UPLINK_TRAITORS | UPLINK_INFILTRATORS + uplink_flag_given = UPLINK_INFILTRATORS /datum/antagonist/traitor/infiltrator/sleeper_agent name = "\improper Syndicate Sleeper Agent" diff --git a/code/modules/uplink/uplink_items/contractor.dm b/code/modules/uplink/uplink_items/contractor.dm index b774d05e59d..6004caf9745 100644 --- a/code/modules/uplink/uplink_items/contractor.dm +++ b/code/modules/uplink/uplink_items/contractor.dm @@ -13,7 +13,7 @@ item = /obj/item/storage/box/syndicate/contract_kit category = /datum/uplink_category/contractor cost = 20 - purchasable_from = UPLINK_INFILTRATORS + purchasable_from = ~(UPLINK_CLOWN_OPS | UPLINK_NUKE_OPS | UPLINK_TRAITORS) /datum/uplink_item/bundles_tc/contract_kit/purchase(mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) . = ..() diff --git a/code/modules/uplink/uplink_items/stealthy.dm b/code/modules/uplink/uplink_items/stealthy.dm index 6ba88eda43e..793120fe56f 100644 --- a/code/modules/uplink/uplink_items/stealthy.dm +++ b/code/modules/uplink/uplink_items/stealthy.dm @@ -99,7 +99,7 @@ These shocks are capable of affecting the inner circuitry of most robots as well, applying a short stun. \ Has the added benefit of affecting the vocal cords of your victim, causing them to slur as if inebriated." item = /obj/item/melee/baton/telescopic/contractor_baton - cost = 12 + cost = 7 surplus = 50 limited_stock = 1 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_INFILTRATORS)