From c2c5676ab2fd9592f79be4e6e3d39f1ed721fcc7 Mon Sep 17 00:00:00 2001 From: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:19:45 +0100 Subject: [PATCH] surplusn't (#22772) Removes a number of items from surplus crates. --- code/datums/uplink_items/uplink_general.dm | 8 ++++++++ code/datums/uplink_items/uplink_traitor.dm | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 8a438915452..a7c1e600e79 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -215,6 +215,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "CH" item = /obj/item/butcher_chainsaw cost = 65 + surplus = 0 // This has caused major problems with un-needed chainsaw massacres. Bwoink bait. /datum/uplink_item/dangerous/universal_gun_kit name = "Universal Self Assembling Gun Kit" @@ -242,6 +243,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "10MM" item = /obj/item/ammo_box/magazine/m10mm cost = 5 + surplus = 0 // Miserable /datum/uplink_item/ammo/pistolap name = "Stechkin - 10mm Armour Piercing Magazine" @@ -249,6 +251,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "10MMAP" item = /obj/item/ammo_box/magazine/m10mm/ap cost = 10 + surplus = 0 // Miserable /datum/uplink_item/ammo/pistolfire name = "Stechkin - 10mm Incendiary Magazine" @@ -256,6 +259,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "10MMFIRE" item = /obj/item/ammo_box/magazine/m10mm/fire cost = 10 + surplus = 0 // Miserable /datum/uplink_item/ammo/pistolhp name = "Stechkin - 10mm Hollow Point Magazine" @@ -263,6 +267,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "10MMHP" item = /obj/item/ammo_box/magazine/m10mm/hp cost = 10 + surplus = 0 // Miserable /datum/uplink_item/ammo/revolver name = ".357 Revolver - Speedloader" @@ -270,6 +275,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "357" item = /obj/item/ammo_box/a357 cost = 15 + surplus = 0 // Miserable // STEALTHY WEAPONS @@ -344,6 +350,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "TPB" item = /obj/item/reagent_containers/glass/bottle/traitor cost = 10 + surplus = 0 // Requires another item to function. /datum/uplink_item/stealthy_weapons/silencer name = "Universal Suppressor" @@ -528,6 +535,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "SCK" item = /obj/item/storage/box/syndie_kit/safecracking cost = 5 + surplus = 0 // Far too objective specific. /datum/uplink_item/stealthy_tools/handheld_mirror name = "Hand Held Mirror" diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 9f5e90ba7eb..68405c92279 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -66,6 +66,7 @@ item = /obj/item/storage/box/syndie_kit/mimery cost = 50 job = list("Mime") + surplus = 0 // I feel this just isn't healthy to be in these crates. /datum/uplink_item/jobspecific/combat_baking name = "Combat Bakery Kit" @@ -83,6 +84,7 @@ item = /obj/item/borg/upgrade/modkit/indoors cost = 25 //you need two for full damage, so total of 50 for maximum damage job = list("Shaft Miner") + surplus = 0 // Requires a KA to even be used. //Chef /datum/uplink_item/jobspecific/specialsauce @@ -92,6 +94,7 @@ item = /obj/item/reagent_containers/food/condiment/syndisauce cost = 10 job = list("Chef") + surplus = 0 // Far too specific in its use. /datum/uplink_item/jobspecific/meatcleaver name = "Meat Cleaver" @@ -118,6 +121,7 @@ item = /obj/item/storage/box/syndie_kit/missionary_set cost = 75 job = list("Chaplain") + surplus = 0 // Controversial maybe, but with the ease of mindslaving with this item I'd prefer it stay chaplain specific. /datum/uplink_item/jobspecific/artistic_toolbox name = "His Grace" @@ -260,6 +264,7 @@ item = /obj/item/seeds/ambrosia/cruciatus cost = 5 job = list("Botanist") + surplus = 0 // Even botanists would struggle to use this effectively, nevermind a coroner. //Atmos Tech /datum/uplink_item/jobspecific/contortionist @@ -393,6 +398,7 @@ cost = 60 refund_path = /obj/item/guardiancreator/tech/choose refundable = TRUE + surplus = 0 // This being refundable makes this a big no no in my mind. cant_discount = TRUE /datum/uplink_item/stealthy_weapons/martialarts @@ -474,6 +480,7 @@ reference = "DRL" item = /obj/item/thermal_drill/syndicate cost = 5 + surplus = 0 // I feel like its amazing for one objective and one objective only. Far too specific. excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/suits/modsuit