From 076507f2251afdb0214f3b100864157d4d0eda4e Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 13:31:25 -0700
Subject: [PATCH 01/59] Fully removes black market teleportation, plus change
uplink recipe
---
code/__DEFINES/blackmarket.dm | 2 --
code/controllers/subsystem/blackmarket.dm | 2 +-
code/modules/cargo/blackmarket/blackmarket_market.dm | 3 +--
code/modules/cargo/blackmarket/blackmarket_uplink.dm | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/code/__DEFINES/blackmarket.dm b/code/__DEFINES/blackmarket.dm
index 5494c371db7b..0ee7b39b2298 100644
--- a/code/__DEFINES/blackmarket.dm
+++ b/code/__DEFINES/blackmarket.dm
@@ -3,8 +3,6 @@
// The BEST way of shipping items: accurate, "undetectable"
#define SHIPPING_METHOD_LTSRBT "LTSRBT"
-// Picks a random area to teleport the item to and gives you a minute to get there before it is sent.
-#define SHIPPING_METHOD_TELEPORT "Teleport"
// Throws the item from somewhere at the station.
#define SHIPPING_METHOD_LAUNCH "Launch"
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index 6014259278d7..2423fdcb4eaf 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -76,7 +76,7 @@ SUBSYSTEM_DEF(blackmarket)
var/pickedloc = vlevel.get_side_turf(startSide)
var/atom/movable/item = purchase.entry.spawn_item(pickedloc)
- item.throw_at(purchase.uplink, 3, 3, spin = FALSE)
+ item.throw_at(purchase.uplink, 3, 3, spin = FALSE, gentle = TRUE)
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting the order is being launched at your coordinates from [dir2text(startSide)].")
diff --git a/code/modules/cargo/blackmarket/blackmarket_market.dm b/code/modules/cargo/blackmarket/blackmarket_market.dm
index 6979d62e1021..fc46f63b4783 100644
--- a/code/modules/cargo/blackmarket/blackmarket_market.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_market.dm
@@ -49,5 +49,4 @@
/datum/blackmarket_market/blackmarket
name = "Black Market"
shipping = list(SHIPPING_METHOD_LTSRBT =50,
- SHIPPING_METHOD_LAUNCH =10,
- SHIPPING_METHOD_TELEPORT=75)
+ SHIPPING_METHOD_LAUNCH =10)
diff --git a/code/modules/cargo/blackmarket/blackmarket_uplink.dm b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
index e8abd0424b2d..a6b581f33bdf 100644
--- a/code/modules/cargo/blackmarket/blackmarket_uplink.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
@@ -155,7 +155,7 @@
time = 30
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER, TOOL_MULTITOOL)
reqs = list(
- /obj/item/stock_parts/subspace/amplifier = 1,
+ /obj/item/stock_parts/scanning_module = 1,
/obj/item/stack/cable_coil = 15,
/obj/item/radio = 1,
/obj/item/analyzer = 1
From 06d1f968531ef51daa2601a75b4ad458a3b31dd7 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 14:06:24 -0700
Subject: [PATCH 02/59] Target links
Sync up an uplink to a LTSRBT
---
code/__DEFINES/blackmarket.dm | 2 +-
code/modules/cargo/blackmarket/blackmarket_telepad.dm | 10 ++++++++++
code/modules/cargo/blackmarket/blackmarket_uplink.dm | 6 ++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/code/__DEFINES/blackmarket.dm b/code/__DEFINES/blackmarket.dm
index 0ee7b39b2298..042066df522d 100644
--- a/code/__DEFINES/blackmarket.dm
+++ b/code/__DEFINES/blackmarket.dm
@@ -3,6 +3,6 @@
// The BEST way of shipping items: accurate, "undetectable"
#define SHIPPING_METHOD_LTSRBT "LTSRBT"
-// Throws the item from somewhere at the station.
+// Throws the item from somewhere at the uplink.
#define SHIPPING_METHOD_LAUNCH "Launch"
diff --git a/code/modules/cargo/blackmarket/blackmarket_telepad.dm b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
index 0a77d9822bf3..114aa2defe08 100644
--- a/code/modules/cargo/blackmarket/blackmarket_telepad.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
@@ -61,6 +61,16 @@
if(!power_efficiency)
power_efficiency = 1
+/// Stores the LTSRBT Data in the uplink for linking
+/obj/machinery/ltsrbt/attackby(obj/item/O, mob/user, params)
+ if(istype(O, /obj/item/blackmarket_uplink))
+ var/obj/item/blackmarket_uplink/uplink = O
+ uplink.target = src
+ to_chat(user, "[src] linked to [O].")
+ return TRUE
+
+ return ..()
+
/// Adds /datum/blackmarket_purchase to queue unless the machine is free, then it sets the purchase to be instantly recieved
/obj/machinery/ltsrbt/proc/add_to_queue(datum/blackmarket_purchase/purchase)
if(!recharge_cooldown && !recieving && !transmitting)
diff --git a/code/modules/cargo/blackmarket/blackmarket_uplink.dm b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
index a6b581f33bdf..6aca2036fbc4 100644
--- a/code/modules/cargo/blackmarket/blackmarket_uplink.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
@@ -13,6 +13,8 @@
var/money = 0
/// List of typepaths for "/datum/blackmarket_market"s that this uplink can access.
var/list/accessible_markets = list(/datum/blackmarket_market/blackmarket)
+ // Linked LTSRBT for uplink to send to.
+ var/obj/machinery/ltsrbt/target
/obj/item/blackmarket_uplink/Initialize()
. = ..()
@@ -53,6 +55,10 @@
user.put_in_hands(holochip)
to_chat(user, "You withdraw [amount_to_remove] credits into a holochip.")
+/obj/item/blackmarket_uplink/examine(mob/user)
+ . = ..()
+ . += "It's LTSRBT link [target ? "contains [target]." : "is empty."]"
+
/obj/item/blackmarket_uplink/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
From 8275b57d29432787cea310b97a53d441b0a02e62 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 14:13:12 -0700
Subject: [PATCH 03/59] Descs and examines for uplink
---
code/modules/cargo/blackmarket/blackmarket_uplink.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_uplink.dm b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
index 6aca2036fbc4..443dceb09a18 100644
--- a/code/modules/cargo/blackmarket/blackmarket_uplink.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
@@ -2,6 +2,7 @@
name = "Black Market Uplink"
icon = 'icons/obj/blackmarket.dmi'
icon_state = "uplink"
+ desc = "A jury rigged uplink capable of accessing illcit or grey market vendors. There's a port on side for linking it to a LTSRBT for more practical shipping."
// UI variables.
var/viewing_category
From 874a3349d4b8dc0fb2f75971bb7ce099c4dc60f4 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 16:00:39 -0700
Subject: [PATCH 04/59] Actually makes link sending to LTSRBT work
---
code/controllers/subsystem/blackmarket.dm | 20 ++++---------------
.../cargo/blackmarket/blackmarket_telepad.dm | 2 --
.../cargo/blackmarket/blackmarket_uplink.dm | 4 ++--
3 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index 2423fdcb4eaf..85992e57bae6 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -47,22 +47,10 @@ SUBSYSTEM_DEF(blackmarket)
switch(purchase.method)
// Find a ltsrbt pad and make it handle the shipping.
if(SHIPPING_METHOD_LTSRBT)
- if(!telepads.len)
- continue
- // Prioritize pads that don't have a cooldown active.
- var/free_pad_found = FALSE
- for(var/obj/machinery/ltsrbt/pad in telepads)
- if(pad.recharge_cooldown)
- continue
- pad.add_to_queue(purchase)
- queued_purchases -= purchase
- free_pad_found = TRUE
- break
-
- if(free_pad_found)
+ if(!purchase.uplink.target)
continue
- var/obj/machinery/ltsrbt/pad = pick(telepads)
+ var/obj/machinery/ltsrbt/pad = purchase.uplink.target
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting that the order is being processed by [pad].")
@@ -76,7 +64,7 @@ SUBSYSTEM_DEF(blackmarket)
var/pickedloc = vlevel.get_side_turf(startSide)
var/atom/movable/item = purchase.entry.spawn_item(pickedloc)
- item.throw_at(purchase.uplink, 3, 3, spin = FALSE, gentle = TRUE)
+ item.throw_at(purchase.uplink, 3, 3, spin = FALSE)
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting the order is being launched at your coordinates from [dir2text(startSide)].")
@@ -96,7 +84,7 @@ SUBSYSTEM_DEF(blackmarket)
/// Used to add /datum/blackmarket_purchase to queued_purchases var. Returns TRUE when queued.
/datum/controller/subsystem/blackmarket/proc/queue_item(datum/blackmarket_purchase/P)
- if(P.method == SHIPPING_METHOD_LTSRBT && !telepads.len)
+ if(P.method == SHIPPING_METHOD_LTSRBT && !P.uplink.target)
return FALSE
queued_purchases += P
return TRUE
diff --git a/code/modules/cargo/blackmarket/blackmarket_telepad.dm b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
index 114aa2defe08..c2ef78027d0f 100644
--- a/code/modules/cargo/blackmarket/blackmarket_telepad.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
@@ -37,10 +37,8 @@
/obj/machinery/ltsrbt/Initialize()
. = ..()
- SSblackmarket.telepads += src
/obj/machinery/ltsrbt/Destroy()
- SSblackmarket.telepads -= src
// Bye bye orders.
if(SSblackmarket.telepads.len)
for(var/datum/blackmarket_purchase/P in queue)
diff --git a/code/modules/cargo/blackmarket/blackmarket_uplink.dm b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
index 443dceb09a18..de799f5540ce 100644
--- a/code/modules/cargo/blackmarket/blackmarket_uplink.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
@@ -58,7 +58,7 @@
/obj/item/blackmarket_uplink/examine(mob/user)
. = ..()
- . += "It's LTSRBT link [target ? "contains [target]." : "is empty."]"
+ . += "It's LTSRBT link [target ? "contains a [target]." : "is empty."]"
/obj/item/blackmarket_uplink/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -94,7 +94,7 @@
/obj/item/blackmarket_uplink/ui_static_data(mob/user)
var/list/data = list()
data["delivery_method_description"] = SSblackmarket.shipping_method_descriptions
- data["ltsrbt_built"] = SSblackmarket.telepads.len
+ data["ltsrbt_built"] = target
data["markets"] = list()
for(var/M in accessible_markets)
var/datum/blackmarket_market/BM = SSblackmarket.markets[M]
From 0b40342b0f01019034ed78b8e1fe7bd434983275 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 17:56:34 -0700
Subject: [PATCH 05/59] Clothing Tab Redo
---
.../blackmarket/blackmarket_items/clothing.dm | 94 ++++++++++++++++---
1 file changed, 80 insertions(+), 14 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index 95cb31d27a5e..6ac891173a67 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -1,15 +1,15 @@
/datum/blackmarket_item/clothing
category = "Clothing"
-/datum/blackmarket_item/clothing/ninja_mask
- name = "Space Ninja Mask"
- desc = "Apart from being acid, lava, fireproof and being hard to take off someone it does nothing special on it's own."
- item = /obj/item/clothing/mask/gas/space_ninja
+/datum/blackmarket_item/clothing/cloth
+ name = "Build Your Own Jumpsuit Special"
+ desc = "Ever wanted to learn how to sew? This lovely selection of cloth is perfect to get some practice with."
+ item = /obj/item/stack/sheet/cotton/cloth/ten
price_min = 200
- price_max = 500
- stock_max = 3
- availability_prob = 40
+ price_max = 400
+ stock_max = 5
+ availability_prob = 80
/datum/blackmarket_item/clothing/durathread_vest
name = "Durathread Vest"
@@ -31,15 +31,61 @@
stock_max = 4
availability_prob = 50
+/datum/blackmarket_item/clothing/degraded_armor_set
+ name = "Clearance Bin Armor Set"
+ desc = "Looking to protect yourself, but on a tight budget? These previously used vest and helmets served their former owners well! (May they rest in peace.)"
+ item = /obj/item/storage/box
+
+ price_min = 100
+ price_max = 400
+ stock_max = 3
+ availability_prob = 80
+
+/datum/blackmarket_item/clothing/degraded_armor_set/spawn_item(loc)
+ var/obj/item/storage/box/B = ..()
+ B.name = "Used Armor Set Box"
+ B.desc = "It smells distinctly of iron."
+ new /obj/item/clothing/head/helmet/old(B)
+ new /obj/item/clothing/suit/armor/vest/old(B)
+ return B
+
+/datum/blackmarket_item/clothing/frontiersmen_armor_set
+ name = "X-11 Bulletproof Armor Set"
+ desc = "We got a good deal on some extra bulletproof armor from a Frontiersmen Quartermaster, and we're passing those savings onto you!"
+ item = /obj/item/storage/box
+
+ price_min = 1000
+ price_max = 1750
+ stock_max = 2
+ availability_prob = 50
+
+/datum/blackmarket_item/clothing/frontiersmen_armor_set/spawn_item(loc)
+ var/obj/item/storage/box/B = ..()
+ B.name = "Bulletproof Armor Set Box"
+ B.desc = "A beat up looking box with some armor inside."
+ new /obj/item/clothing/suit/armor/vest/bulletproof/frontier(B)
+ new /obj/item/clothing/head/helmet/bulletproof/x11/frontier(B)
+ return B
+
+/datum/blackmarket_item/clothing/gezena_armor
+ name = "Raksha-plating vest"
+ desc = "Genuine armor vests used by the PGF Marine Corp. This is hot merchandise, so we need to move it fast."
+ item = /obj/item/clothing/suit/armor/gezena/marine
+
+ price_min = 1500
+ price_max = 2000
+ stock_max = 2
+ availability_prob = 20
+
/datum/blackmarket_item/clothing/full_spacesuit_set
name = "\improper Nanotrasen Branded Spacesuit Box"
desc = "A few boxes of \"Old Style\" space suits fell off the back of a space truck."
item = /obj/item/storage/box
- price_min = 1500
- price_max = 4000
+ price_min = 250
+ price_max = 750
stock_max = 3
- availability_prob = 30
+ availability_prob = 70
/datum/blackmarket_item/clothing/full_spacesuit_set/spawn_item(loc)
var/obj/item/storage/box/B = ..()
@@ -64,7 +110,27 @@
desc = "A discarded combat medic hardsuit, found in the ruins of a carpet bombed xeno hive. Definately used, but as sturdy as an anchor."
item = /obj/item/clothing/suit/space/hardsuit/combatmedic
- price_min = 5500
- price_max = 7000
- stock_max = 1
- availability_prob = 10
+ price_min = 1000
+ price_max = 1750
+ stock_max = 2
+ availability_prob = 40
+
+/datum/blackmarket_item/clothing/ramzi_suit
+ name = "Rusted Red hardsuit"
+ desc = "A vintage ICW Era Gorlex Maruader hardsuit. The previous owner said we could have it when we pried it off their cold dead hands. Dry cleaning not included."
+ item = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
+
+ price_min = 1250
+ price_max = 2500
+ stock = 1
+ availability_prob = 30
+
+/datum/blackmarket_item/clothing/frontiersmen_hardsuit
+ name = "Frontiersmen hardsuit"
+ desc = "An old, if not durable hardsuit typically used by the Frontiersmen. We accept no liability if you're shot by CLIP while wearing this."
+ item = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
+
+ price_min = 1000
+ price_max = 2000
+ stock_max = 2
+ availability_prob = 30
From 0fd92f1a1350330f279dd96065a7913b670099fa Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 20:55:02 -0700
Subject: [PATCH 06/59] New Consumables
---
.../blackmarket_items/consumables.dm | 149 ++++++++++++++++--
1 file changed, 139 insertions(+), 10 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 00cfd456ea13..5bf95ffced26 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -1,16 +1,6 @@
/datum/blackmarket_item/consumable
category = "Consumables"
-/datum/blackmarket_item/consumable/clown_tears
- name = "Bowl of Clown's Tears"
- desc = "Guaranteed fresh from Weepy Boggins Tragic Kitchen"
- item = /obj/item/reagent_containers/food/snacks/soup/clownstears
- stock = 1
-
- price_min = 520
- price_max = 600
- availability_prob = 10
-
/datum/blackmarket_item/consumable/donk_pocket_box
name = "Box of Donk Pockets"
desc = "A well packaged box containing the favourite snack of every spacefarer."
@@ -61,3 +51,142 @@
price_min = 50
price_max = 150
availability_prob = 90
+
+/datum/blackmarket_item/consumable/morphine
+ name = "Morphine Bottle"
+ desc = "Medicinal? Recreational? You decide!"
+ item = /obj/item/reagent_containers/glass/bottle/morphine
+
+ price_min = 50
+ price_max = 150
+ stock_max = 4
+ availability_prob = 50
+
+/datum/blackmarket_item/consumable/cyanide
+ name = "Cyanide Bottle"
+ desc = "Cyanide, a tried and true classic for all your poisoning needs."
+ item = /obj/item/reagent_containers/glass/bottle/cyanide
+
+ price_min = 300
+ price_max = 600
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/consumable/sodium_thiopental
+ name = "Sodium Thiopental Bottle"
+ desc = "Sodium Thiopental, a potent and fast acting sedative for any occasion."
+ item = /obj/item/reagent_containers/glass/bottle/sodium_thiopental
+
+ price_min = 300
+ price_max = 600
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/consumable/amanitin
+ name = "Amanitin bottle"
+ desc = "A slow acting, but nearly undetectable poison. For the dignified assassin."
+ item = /obj/item/reagent_containers/glass/bottle/amanitin
+
+ price_min = 300
+ price_max = 600
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/consumable/gumballs
+ name = "Gumball"
+ desc = "Looking for a sweet treat? These gumballs are sure to satisfy."
+ item = /obj/item/reagent_containers/food/snacks/gumball
+
+ price_min = 10
+ price_max = 20
+ stock_min = 10
+ stock_max = 20
+ availability_prob = 80
+
+/datum/blackmarket_item/consumable/xeno_meat
+ name = "Xenomorph steak"
+ desc = "The Frontier's most dangerous game, delivered right to your plate! May constitute a violation of your local BARD laws and regulations."
+ item = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+
+ price_min = 300
+ price_max = 500
+ stock_max = 5
+ availability_prob = 20
+
+/datum/blackmarket_item/consumable/berries
+ name = "Berries"
+ desc = "Some fresh berries we found growing in the corner of our hangar. We're not 100% sure what species these are."
+ item = /obj/item/reagent_containers/food/snacks/grown/berries
+
+ price_min = 25
+ price_max = 100
+ stock_max = 10
+ availability_prob = 40
+
+/datum/blackmarket_item/consumable/berries/spawn_item(loc)
+ var/berries = pick(list(/obj/item/reagent_containers/food/snacks/grown/berries,
+ /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth,
+ /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth))
+ return new berries(loc)
+
+/datum/blackmarket_item/consumable/ration
+ name = "Ration Pack"
+ desc = "PGF military surplus rations. What's in them? Who knows. Surprise is the spice of life after all."
+ item = /obj/effect/spawner/lootdrop/ration
+
+ price_min = 200
+ price_max = 400
+ stock_min = 5
+ stock_max = 15
+ availability_prob = 80
+
+/datum/blackmarket_item/consumable/thirteenloko
+ name = "Can of Thirteen Loko"
+ desc = "This product was quietly discontinued after multiple health related incidents. But you aren't a coward, are you?"
+ item = /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
+
+ price_min = 10
+ price_max = 20
+ stock_min = 10
+ stock_max = 20
+ availability_prob = 50
+
+/datum/blackmarket_item/consumable/sutures
+ name = "Sutures"
+ desc = "A bundle of sutures for stitching up your latest bullet wound."
+ item = /obj/item/stack/medical/suture
+
+ price_min = 200
+ price_max = 500
+ stock_max = 5
+ availability_prob = 40
+
+/datum/blackmarket_item/consumable/regen_mesh
+ name = "Regenerative Mesh"
+ desc = "A smoothing pack of regenerative mesh for your burns."
+ item = /obj/item/stack/medical/mesh
+
+ price_min = 200
+ price_max = 500
+ stock_max = 5
+ availability_prob = 40
+
+/datum/blackmarket_item/consumable/bruise_pack
+ name = "Bruise Packs"
+ desc = "A bundle of old bruise packs, for you guessed it, bruises. Any rumors of these containing hazardous chemicals are just that. Rumors."
+ item = /obj/item/stack/medical/bruise_pack
+
+ price_min = 300
+ price_max = 600
+ stock_max = 5
+ availability_prob = 30
+
+/datum/blackmarket_item/consumable/ointment
+ name = "Burn ointment"
+ desc = "A tube of burn ointment. It's past the expiry date, but those are only suggestions."
+ item = /obj/item/stack/medical/ointment
+
+ price_min = 300
+ price_max = 600
+ stock_max = 5
+ availability_prob = 30
From 32a54fc735e0a0f18581bf265b3ff1b7356545e9 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 20:59:15 -0700
Subject: [PATCH 07/59] misc price changes
---
code/modules/cargo/blackmarket/blackmarket_items/misc.dm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index c9a165faaa2f..b67b9959a890 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -16,7 +16,7 @@
desc = "Yeehaw, hardboiled friends! This holster is the first step in your dream of becoming a detective and being allowed to shoot real guns!"
item = /obj/item/clothing/accessory/holster
- price_min = 400
+ price_min = 200
price_max = 800
stock_max = 8
availability_prob = 60
@@ -51,7 +51,8 @@
desc = "This easily hidden satchel can become a versatile tool to anybody with the desire to keep certain items out of sight and out of mind."
item = /obj/item/storage/backpack/satchel/flat/empty
- price_min = 750
+ price_min = 250
price_max = 1000
stock_max = 2
availability_prob = 30
+
From 1ddb3100ecb13a19966570b5ad159c11c3a4b6c8 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 21:11:49 -0700
Subject: [PATCH 08/59] fancy clothing
---
.../blackmarket/blackmarket_items/clothing.dm | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index 6ac891173a67..0f87209106fb 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -11,6 +11,36 @@
stock_max = 5
availability_prob = 80
+/datum/blackmarket_item/clothing/crown
+ name = "Crown"
+ desc = "A beautiful golden crown, rich with history and pedigree. I'm sure they won't miss it."
+ item = /obj/item/clothing/head/crown/fancy
+
+ price_min = 1000
+ price_max = 2000
+ stock_max = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/clothing/galaxy_blue
+ name = "Blue Galaxy Suit"
+ desc = "A handsome silk suit, treated with a finish of bluespace dust for an out of this world sheen."
+ item = /obj/item/clothing/under/rank/civilian/lawyer/galaxy
+
+ price_min = 500
+ price_max = 2000
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/clothing/galaxy_red
+ name = "Red Galaxy Suit"
+ desc = "A handsome silk suit, treated with a finish of telecrystal dust. It cuts a menacing figure."
+ item = /obj/item/clothing/under/rank/civilian/lawyer/galaxy/red
+
+ price_min = 500
+ price_max = 2000
+ stock = 1
+ availability_prob = 20
+
/datum/blackmarket_item/clothing/durathread_vest
name = "Durathread Vest"
desc = "Don't let them tell you this stuff is \"Like asbestos\" or \"Pulled from the market for safety concerns\". It could be the difference between a robusting and a retaliation."
From 5987c4a4d0993f3d27c6d3e3aebb480646b26d92 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 21:14:47 -0700
Subject: [PATCH 09/59] less jokey name
---
code/modules/cargo/blackmarket/blackmarket_items/misc.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index b67b9959a890..d7eff699c1bc 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -23,7 +23,7 @@
/datum/blackmarket_item/misc/holywater
name = "Flask of holy water"
- desc = "Father Lootius' own brand of ready-made holy water."
+ desc = "Father Fictus' own brand of ready-made holy water."
item = /obj/item/reagent_containers/food/drinks/bottle/holywater
price_min = 400
From 081ce690887435740f07b146d297a385d48616d4 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 21:26:36 -0700
Subject: [PATCH 10/59] Adds the emergency tab to the black market
Basically, they're gouging you since you have no better options
---
.../cargo/blackmarket/blackmarket_items/emergency.dm | 12 ++++++++++++
shiptest.dme | 1 +
2 files changed, 13 insertions(+)
create mode 100644 code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
new file mode 100644
index 000000000000..89f2b1a3110f
--- /dev/null
+++ b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
@@ -0,0 +1,12 @@
+/datum/blackmarket_item/emergency
+ category = "Emergency"
+
+/datum/blackmarket_item/emergency/plasma
+ name = "Plasma Fuel"
+ desc = "Low on fuel? We can part with some plasma... for a reasonable price."
+ item = /obj/item/stack/sheet/mineral/plasma/twenty
+
+ price_min = 2000
+ price_max = 4000
+ availability_prob = 100
+ unlimited = TRUE
diff --git a/shiptest.dme b/shiptest.dme
index d89b0c12c2b1..f47262455ab4 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1876,6 +1876,7 @@
#include "code\modules\cargo\blackmarket\blackmarket_uplink.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\clothing.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\consumables.dm"
+#include "code\modules\cargo\blackmarket\blackmarket_items\emergency.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\misc.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\tools.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\weapons.dm"
From dd66b474e435a99ea2515c17c3152092208fc90d Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 21:43:53 -0700
Subject: [PATCH 11/59] emergency tab stuff
---
.../blackmarket_items/emergency.dm | 40 +++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
index 89f2b1a3110f..81512191f1f4 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
@@ -10,3 +10,43 @@
price_max = 4000
availability_prob = 100
unlimited = TRUE
+
+/datum/blackmarket_item/emergency/uranium
+ name = "Uranium"
+ desc = "Fuel? Dirty Bomb? Fancy nightlight? Doesn't matter, we'll supply."
+ item = /obj/item/stack/sheet/mineral/uranium/twenty
+
+ price_min = 2000
+ price_max = 4000
+ availability_prob = 100
+ unlimited = TRUE
+
+/datum/blackmarket_item/emergency/ion_thruster
+ name = "Ion Thruster"
+ desc = "Need a boost? We have a leftover engine board or two from a ship we happened to find. If you're lucky, you won't be the next."
+ item = /obj/item/circuitboard/machine/shuttle/engine/electric
+
+ price_min = 2000
+ price_max = 400
+ stock_max = 5
+ availability_prob = 100
+
+/datum/blackmarket_item/emergency/oyxgen
+ name = "Oxygen Canister"
+ desc = "What keeps us all breathing. It'll keep you breathing too, if you know what's good for you."
+ item = /obj/machinery/portable_atmospherics/canister/oxygen
+
+ price_min = 2000
+ price_max = 4000
+ stock_max = 3
+ availability_prob = 100
+
+/datum/blackmarket_item/emergency/metal_foam
+ name = "Metal Foam Grenade"
+ desc = "Poor piloting blow a hole in the side of your hull? These metal foam grenades should keep everything important in."
+ item = /obj/item/grenade/chem_grenade/metalfoam
+
+ price_min = 300
+ price_max = 750
+ availability_prob = 100
+ unlimited = TRUE
From 4d576ea48e927aed5ee742754dc86d1315790cdb Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 22:09:35 -0700
Subject: [PATCH 12/59] new misc items
---
.../blackmarket/blackmarket_items/misc.dm | 40 +++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index d7eff699c1bc..01ef4a01f304 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -56,3 +56,43 @@
stock_max = 2
availability_prob = 30
+/datum/blackmarket_item/misc/organs
+ name = "Organ Freezer"
+ desc = "Need some fresh organs in a jiffy? We got you covered. Make good use of them. Someone died to get these to you."
+ item = /obj/structure/closet/crate/freezer/surplus_limbs/organs
+
+ price_min = 1000
+ price_max = 3000
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/misc/abandoned_crate
+ name = "Abandoned Crate"
+ desc = "Why, it could be \"anything\". Are you feeling lucky?"
+ item = /obj/structure/closet/crate/secure/loot
+
+ price_min = 250
+ price_max = 500
+ stock_min = 5
+ stock_max = 10
+ availability_prob = 50
+
+/datum/blackmarket_item/misc/spygass
+ name = "Spy Glass Kit"
+ desc = "A set of trick glasses and a linked camera. Suit and dashing shades not included."
+ item = /obj/item/storage/box/rxglasses/spyglasskit
+
+ price_min = 250
+ price_max = 1000
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/misc/bepis_disk
+ name = "BEPIS Technology Disk"
+ desc = "An ancient technology disk containing some probably useful data. No refunds."
+ item = /obj/item/disk/tech_disk/major
+
+ price_min = 250
+ price_max = 1000
+ stock_max = 10
+ availability_prob = 30
From a77dc718d8f356d084c83f0f5600e7c59e7ba98b Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 22:15:33 -0700
Subject: [PATCH 13/59] tools price adjustment
---
.../blackmarket/blackmarket_items/tools.dm | 52 +++++++++----------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 0b2cb16aa827..6722c7548358 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -5,60 +5,60 @@
name = "Experimental Wrench"
desc = "The extra fast and handy wrench you always wanted!"
item = /obj/item/wrench/caravan
- stock = 1
- price_min = 400
- price_max = 800
- availability_prob = 20
+ price_min = 50
+ price_max = 200
+ stock_max = 3
+ availability_prob = 40
/datum/blackmarket_item/tool/caravan_wirecutters
name = "Experimental Wirecutters"
desc = "The extra fast and handy wirecutters you always wanted!"
item = /obj/item/wirecutters/caravan
- stock = 1
- price_min = 400
- price_max = 800
- availability_prob = 20
+ price_min = 50
+ price_max = 200
+ stock_max = 3
+ availability_prob = 40
/datum/blackmarket_item/tool/caravan_screwdriver
name = "Experimental Screwdriver"
desc = "The extra fast and handy screwdriver you always wanted!"
item = /obj/item/screwdriver/caravan
- stock = 1
- price_min = 400
- price_max = 800
- availability_prob = 20
+ price_min = 50
+ price_max = 200
+ stock_max = 3
+ availability_prob = 40
/datum/blackmarket_item/tool/caravan_crowbar
name = "Experimental Crowbar"
desc = "The extra fast and handy crowbar you always wanted!"
item = /obj/item/crowbar/red/caravan
- stock = 1
- price_min = 400
- price_max = 800
- availability_prob = 20
+ price_min = 50
+ price_max = 200
+ stock_max = 3
+ availability_prob = 40
/datum/blackmarket_item/tool/binoculars
name = "Binoculars"
desc = "Increase your sight by 150% with this handy Tool!"
item = /obj/item/binoculars
- stock = 1
- price_min = 400
- price_max = 960
- availability_prob = 30
+ price_min = 50
+ price_max = 300
+ stock_max = 3
+ availability_prob = 40
/datum/blackmarket_item/tool/riot_shield
name = "Riot Shield"
desc = "Protect yourself from an unexpected Riot at your local Police department!"
item = /obj/item/shield/riot
- price_min = 450
- price_max = 650
- stock_max = 2
+ price_min = 300
+ price_max = 800
+ stock_max = 3
availability_prob = 50
/datum/blackmarket_item/tool/thermite_bottle
@@ -66,9 +66,9 @@
desc = "30u of Thermite to assist in creating a quick access point or get away!"
item = /obj/item/reagent_containers/glass/bottle/thermite
- price_min = 500
- price_max = 1500
- stock_max = 3
+ price_min = 100
+ price_max = 600
+ stock_max = 10
availability_prob = 30
/datum/blackmarket_item/tool/science_goggles
From 156552c88aec1b743f07a0e4f7efeb40202aca2b Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Sun, 21 Apr 2024 23:38:05 -0700
Subject: [PATCH 14/59] Tools, plus price adjustments
---
.../blackmarket/blackmarket_items/clothing.dm | 2 +-
.../blackmarket/blackmarket_items/tools.dm | 68 +++++++++++++++++--
.../blackmarket/blackmarket_items/weapons.dm | 2 +
3 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index 0f87209106fb..e0195d2c1958 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -141,7 +141,7 @@
item = /obj/item/clothing/suit/space/hardsuit/combatmedic
price_min = 1000
- price_max = 1750
+ price_max = 2500
stock_max = 2
availability_prob = 40
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 6722c7548358..91cd90199803 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -6,7 +6,7 @@
desc = "The extra fast and handy wrench you always wanted!"
item = /obj/item/wrench/caravan
- price_min = 50
+ price_min = 100
price_max = 200
stock_max = 3
availability_prob = 40
@@ -16,7 +16,7 @@
desc = "The extra fast and handy wirecutters you always wanted!"
item = /obj/item/wirecutters/caravan
- price_min = 50
+ price_min = 100
price_max = 200
stock_max = 3
availability_prob = 40
@@ -26,7 +26,7 @@
desc = "The extra fast and handy screwdriver you always wanted!"
item = /obj/item/screwdriver/caravan
- price_min = 50
+ price_min = 100
price_max = 200
stock_max = 3
availability_prob = 40
@@ -36,11 +36,21 @@
desc = "The extra fast and handy crowbar you always wanted!"
item = /obj/item/crowbar/red/caravan
- price_min = 50
+ price_min = 100
price_max = 200
stock_max = 3
availability_prob = 40
+/datum/blackmarket_item/tools/syndi_toolbox
+ name = "Syndicate Toolbox"
+ desc = "A set of specialized tools, built to precision perfection and certified by the GEC."
+ item = /obj/item/storage/toolbox/syndicate
+
+ price_min = 500
+ price_max = 2000
+ stock = 1
+ availability_prob = 20
+
/datum/blackmarket_item/tool/binoculars
name = "Binoculars"
desc = "Increase your sight by 150% with this handy Tool!"
@@ -80,3 +90,53 @@
price_max = 200
stock_max = 3
availability_prob = 50
+
+/datum/blackmarket_item/tools/thermal_eyepatch
+ name = "Thermal Eyepatch"
+ desc = "A thermal eyepatch, capable of tracking the heat signatures of living beings through solid objects."
+ item = /obj/item/clothing/glasses/thermal/eyepatch
+
+ price_min = 1000
+ price_max = 3000
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/tools/jumpboots
+ name = "Jump Boots"
+ desc = "Jump ahead of the competition with these specialized mining boots!"
+ item = /obj/item/clothing/shoes/bhop
+
+ price_min = 100
+ price_max = 1000
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/tools/rocket_gloves
+ name = "Rocket Gloves"
+ desc = "The pinacle of tackling technology, no one will be able to resist a tackle from these rocket propelled gloves. Make sure not to miss though, we don't sell wheelchairs."
+ item = /obj/item/clothing/gloves/tackler/rocket
+
+ price_min = 500
+ price_max = 2000
+ stock_max = 2
+ availability_prob = 30
+
+/datum/blackmarket_item/tools/chem_master
+ name = "Chem Master Board"
+ desc = "A Chem Master board, capable of seperating and packaging reagents. Perfect for any aspiring at home chemist."
+ item = /obj/item/circuitboard/machine/chem_master
+
+ price_min = 1000
+ price_max = 3000
+ stock = 1
+ availability_prob = 30
+
+/datum/blackmarket_item/tools/rcd
+ name = "Rapid Construction Device"
+ desc = "Borrowed from a GEC construction site, this handy device will make building a cinch."
+ item = /obj/item/construction/rcd
+
+ price_min = 1000
+ price_max = 3000
+ stock = 1
+ availability_prob = 30
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index dea11a4c36d3..78607aaf01eb 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -61,3 +61,5 @@
price_max = 3000
stock_max = 1
availability_prob = 5
+
+
From 35040b5b89e8bcdc6d335426fda14f51a7366650 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 00:17:14 -0700
Subject: [PATCH 15/59] Tools and a weapon
---
.../cargo/blackmarket/blackmarket_items/tools.dm | 10 ++++++++++
.../cargo/blackmarket/blackmarket_items/weapons.dm | 14 ++++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 91cd90199803..73f57490b629 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -41,6 +41,16 @@
stock_max = 3
availability_prob = 40
+/datum/blackmarket_item/tools/combat_wrench
+ name = "Combat Wrench"
+ desc = "Under fire while doing repairs? With this dual purpose wrench, never be caught unprepared again!"
+ item = /obj/item/wrench/combat
+
+ price_min = 500
+ price_max = 2500
+ stock = 1
+ availability_prob = 20
+
/datum/blackmarket_item/tools/syndi_toolbox
name = "Syndicate Toolbox"
desc = "A set of specialized tools, built to precision perfection and certified by the GEC."
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 78607aaf01eb..9819c01c0d54 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -48,7 +48,7 @@
name = "Derringer"
desc = "A concealable handgun small enough to hide nearly anywhere. Uses .38 revolver rounds."
item = /obj/item/gun/ballistic/derringer
- price_min = 400
+ price_min = 100
price_max = 600
stock_max = 6
availability_prob = 50
@@ -60,6 +60,16 @@
price_min = 1000
price_max = 3000
stock_max = 1
- availability_prob = 5
+ availability_prob = 10
+
+/datum/blackmarket_item/weapons/himehabu
+ name = "Himehabu Pistol"
+ desc = "Great things come in small packages. The Himehabu is perfect for all your espionage needs. Chambered in .22lr."
+ item = /obj/item/gun/ballistic/automatic/pistol/himehabu
+
+ price_min = 100
+ price_max = 600
+ stock_max = 6
+ availability_prob = 50
From dbd27c760f8346507154053caaa3fe9b692011b0 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:56:10 -0700
Subject: [PATCH 16/59] Item pairing in the catalogue
---
code/controllers/subsystem/blackmarket.dm | 4 +++-
.../modules/cargo/blackmarket/blackmarket_item.dm | 2 ++
.../cargo/blackmarket/blackmarket_items/tools.dm | 12 ++++++------
.../blackmarket/blackmarket_items/weapons.dm | 15 +++++++++++++--
.../cargo/blackmarket/blackmarket_market.dm | 4 ++--
5 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index 85992e57bae6..01ac500dce65 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -29,7 +29,9 @@ SUBSYSTEM_DEF(blackmarket)
if(!markets[M])
stack_trace("SSblackmarket: Item [I] available in market that does not exist.")
continue
- markets[M].add_item(item)
+ markets[M].add_item(item,FALSE)
+ if(I.pair_item)
+ markets[M].add_item(I.pair_item,TRUE)
qdel(I)
. = ..()
diff --git a/code/modules/cargo/blackmarket/blackmarket_item.dm b/code/modules/cargo/blackmarket/blackmarket_item.dm
index fa09c3985de6..cbadddcf1221 100644
--- a/code/modules/cargo/blackmarket/blackmarket_item.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_item.dm
@@ -28,6 +28,8 @@
var/availability_prob = 0
// Should there be an unlimited stock of an item
var/unlimited = FALSE
+ /// Should another item spawn alongside this one in the catalogue?
+ var/datum/blackmarket_item/pair_item
/datum/blackmarket_item/New()
if(isnull(price))
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 73f57490b629..306c5cd32af0 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -51,7 +51,7 @@
stock = 1
availability_prob = 20
-/datum/blackmarket_item/tools/syndi_toolbox
+/datum/blackmarket_item/tool/syndi_toolbox
name = "Syndicate Toolbox"
desc = "A set of specialized tools, built to precision perfection and certified by the GEC."
item = /obj/item/storage/toolbox/syndicate
@@ -101,7 +101,7 @@
stock_max = 3
availability_prob = 50
-/datum/blackmarket_item/tools/thermal_eyepatch
+/datum/blackmarket_item/tool/thermal_eyepatch
name = "Thermal Eyepatch"
desc = "A thermal eyepatch, capable of tracking the heat signatures of living beings through solid objects."
item = /obj/item/clothing/glasses/thermal/eyepatch
@@ -111,7 +111,7 @@
stock = 1
availability_prob = 20
-/datum/blackmarket_item/tools/jumpboots
+/datum/blackmarket_item/tool/jumpboots
name = "Jump Boots"
desc = "Jump ahead of the competition with these specialized mining boots!"
item = /obj/item/clothing/shoes/bhop
@@ -121,7 +121,7 @@
stock_max = 3
availability_prob = 30
-/datum/blackmarket_item/tools/rocket_gloves
+/datum/blackmarket_item/tool/rocket_gloves
name = "Rocket Gloves"
desc = "The pinacle of tackling technology, no one will be able to resist a tackle from these rocket propelled gloves. Make sure not to miss though, we don't sell wheelchairs."
item = /obj/item/clothing/gloves/tackler/rocket
@@ -131,7 +131,7 @@
stock_max = 2
availability_prob = 30
-/datum/blackmarket_item/tools/chem_master
+/datum/blackmarket_item/tool/chem_master
name = "Chem Master Board"
desc = "A Chem Master board, capable of seperating and packaging reagents. Perfect for any aspiring at home chemist."
item = /obj/item/circuitboard/machine/chem_master
@@ -141,7 +141,7 @@
stock = 1
availability_prob = 30
-/datum/blackmarket_item/tools/rcd
+/datum/blackmarket_item/tool/rcd
name = "Rapid Construction Device"
desc = "Borrowed from a GEC construction site, this handy device will make building a cinch."
item = /obj/item/construction/rcd
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 9819c01c0d54..f76edef125a1 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -62,14 +62,25 @@
stock_max = 1
availability_prob = 10
-/datum/blackmarket_item/weapons/himehabu
+/datum/blackmarket_item/weapon/himehabu
name = "Himehabu Pistol"
desc = "Great things come in small packages. The Himehabu is perfect for all your espionage needs. Chambered in .22lr."
item = /obj/item/gun/ballistic/automatic/pistol/himehabu
+ pair_item = /datum/blackmarket_item/weapon/himehabu_mag
price_min = 100
price_max = 600
stock_max = 6
- availability_prob = 50
+ availability_prob = 100
+
+/datum/blackmarket_item/weapon/himehabu_mag
+ name = "Himehabu Magazines"
+ desc = "Compact .22lr magazines for use in the Himehabu pistol."
+ item = /obj/item/ammo_box/magazine/m22lr
+
+ price_min = 100
+ price_max = 200
+ stock_max = 6
+ availability_prob = 0
diff --git a/code/modules/cargo/blackmarket/blackmarket_market.dm b/code/modules/cargo/blackmarket/blackmarket_market.dm
index fc46f63b4783..74a45557b9b4 100644
--- a/code/modules/cargo/blackmarket/blackmarket_market.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_market.dm
@@ -13,8 +13,8 @@
var/list/categories = list()
/// Adds item to the available items and add it's category if it is not in categories yet.
-/datum/blackmarket_market/proc/add_item(datum/blackmarket_item/item)
- if(!prob(initial(item.availability_prob)))
+/datum/blackmarket_market/proc/add_item(datum/blackmarket_item/item, paired)
+ if(!prob(initial(item.availability_prob)) && !paired)
return FALSE
if(ispath(item))
From a37a69d9c0d817cff8afbf97dc2d004374c469f0 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 17:27:53 -0700
Subject: [PATCH 17/59] More weapons, corrupt power cell
---
.../blackmarket/blackmarket_items/weapons.dm | 140 +++++++++++++++++-
code/modules/power/cell.dm | 3 +
2 files changed, 141 insertions(+), 2 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index f76edef125a1..d8dfa95c0006 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -34,6 +34,26 @@
stock_max = 3
availability_prob = 60
+/datum/blackmarket_item/weapon/switchblade
+ name = "Switchblade"
+ desc = "Extra shrap switchblades for intimidation AND style. Bandages not included if you cut yourself."
+ item = /obj/item/switchblade
+
+ price_min = 500
+ price_max = 700
+ stock_max = 3
+ availability_prob = 50
+
+/datum/blackmarket_item/weapon/sabre
+ name = "SUNS Dueling Sabre"
+ desc = "A mastercrafted sabre formerly wielded by a SUNS academic. It's very sharp, we had to spend hours stitching our fingers back on after getting it."
+ item = /obj/item/storage/belt/sabre/suns
+
+ price_min = 1500
+ price_max = 3500
+ stock = 1
+ availability_prob = 20
+
/datum/blackmarket_item/weapon/emp_grenade
name = "EMP Grenade"
desc = "Use this grenade for SHOCKING results!"
@@ -49,7 +69,7 @@
desc = "A concealable handgun small enough to hide nearly anywhere. Uses .38 revolver rounds."
item = /obj/item/gun/ballistic/derringer
price_min = 100
- price_max = 600
+ price_max = 500
stock_max = 6
availability_prob = 50
@@ -71,7 +91,7 @@
price_min = 100
price_max = 600
stock_max = 6
- availability_prob = 100
+ availability_prob = 40
/datum/blackmarket_item/weapon/himehabu_mag
name = "Himehabu Magazines"
@@ -83,4 +103,120 @@
stock_max = 6
availability_prob = 0
+/datum/blackmarket_item/weapon/e10
+ name = "E-10 Laser Pistol"
+ desc = "Sharplite letting you down? Try these classic Eoehoma Firearms E-10 Laser Pistols."
+ item = /obj/item/gun/energy/laser/e10
+
+ price_min = 500
+ price_max = 1250
+ stock_max = 5
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/e11
+ name = "E-11 Energy Gun"
+ desc = "Look. I'll be straight with you. These guns are awful. But, they are cheap if you're that desperate."
+ item = /obj/item/gun/energy/e_gun/e11
+
+ price_min = 250
+ price_max = 750
+ stock = 5
+ availability_prob = 40
+
+/datum/blackmarket_item/weapon/e40
+ name = "E-40 Hybrid Assault Rifle"
+ desc = "A dual mode hybrid assault rifle made by the now defunct Eoehoma Firearms. Capable of firing both bullets AND lasers, for the discerning dealer in death. Chambered in Eoehoma .299 Caseless."
+ item = /obj/item/gun/ballistic/automatic/assault/e40
+ pair_item = /datum/blackmarket_item/weapon/e40_mag
+
+ price_min = 7000
+ price_max = 13000
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/e40_mag
+ name = "Eoehoma .299 Caseless Magazine"
+ desc = "30 round magazines for the E-40 Hybrid Rifle."
+ item = /obj/item/ammo_box/magazine/e40
+
+ price_min = 750
+ price_max = 1250
+ stock_max = 3
+ availability_prob = 0
+
+/datum/blackmarket_item/weapon/e50
+ name = "E-50 Energy Emitter"
+ desc = "An Eoehoma Firearms E-50 Emitter cannon. For when you want a send a message. A really big message."
+ item = /obj/item/gun/energy/laser/e50
+
+ price_min = 4000
+ price_max = 7000
+ stock_max = 2
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/corrupt_gun_cell
+ name = "Damaged Weapon Cell"
+ desc = "These got a bit dinged up in their crate after a close shave with GOLD inspectors. The cells are probably still safe to use though."
+ item = /obj/item/stock_parts/cell/gun/corrupt
+
+ price_min = 250
+ price_max = 500
+ stock_min = 4
+ stock_max = 10
+ availability_prob = 40
+
+/datum/blackmarket_item/weapon/saber_smg
+ name = "Saber 9mm SMG"
+ desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase into distribution. But we happen know a guy."
+ item = /obj/item/gun/ballistic/automatic/smg/proto
+ pair_item = /datum/blackmarket_item/weapon/saber_mag
+
+ price_min = 2500
+ price_max = 4200
+ stock_max = 2
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/saber_mag
+ name = "Saber 9mm SMG Magazines"
+ desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords."
+ item = /obj/item/ammo_box/magazine/smgm9mm
+
+ price_min = 500
+ price_max = 1000
+ stock_max = 2
+ availability_prob = 0
+
+/datum/blackmarket_item/weapon/bg_16
+ name = "BG-16 Beam Gun"
+ desc = "Not satisfied by Etherbor's civilian offerings? Try this military grade one we found!"
+ item = /obj/item/gun/energy/kalix/pgf
+
+ price_min = 2500
+ price_max = 5000
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/bioterror_foam
+ name = "Bioterror Foam Sprayer"
+ desc = "Banned in at least 17 jurisdictions for being 'cruel', 'inhumane', and 'causing indiscriminate lifelong generational health complications'. Though if you actually cared about those things, you wouldn't be shopping here in the first place."
+ item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
+
+ price_min = 3000
+ price_max = 6000
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/sawn_illestren
+ name = "Sawn off Illestren Rifle"
+ desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
+ item = /obj/item/gun/ballistic/rifle/illestren/sawoff
+
+ price_min = 600
+ price_max = 1250
+ stock_min = 2
+ stock_max = 5
+ availability_prob = 50
+
+
+
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 1a2f87c70dd9..3e026decf6cd 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -419,6 +419,9 @@
charge = 0
update_appearance()
+/obj/item/stock_parts/cell/gun/corrupt()
+ return
+
/obj/item/stock_parts/cell/gun/update_appearance()
cut_overlays()
if(grown_battery)
From bac5029ca0fda3b86d3ccc853630fb9bf7be70c6 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 17:34:57 -0700
Subject: [PATCH 18/59] A few more tools
---
.../blackmarket/blackmarket_items/tools.dm | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 306c5cd32af0..ad8cbc238eeb 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -89,7 +89,17 @@
price_min = 100
price_max = 600
stock_max = 10
- availability_prob = 30
+ availability_prob = 50
+
+/datum/blackmarket_item/tools/thermite_jug
+ name = "Thermite Jug"
+ desc = "An extra large 150u jug of thermite. For those hard to reach places."
+ item = /obj/item/reagent_containers/glass/chem_jug/thermite
+
+ price_min = 400
+ price_max = 2600
+ stock_max = 3
+ availability_prob = 20
/datum/blackmarket_item/tool/science_goggles
name = "Science Goggles"
@@ -150,3 +160,13 @@
price_max = 3000
stock = 1
availability_prob = 30
+
+/datum/blackmarket_item/tool/suppressor
+ name = "Suppressor"
+ desc = "A suppressor, for when you to keep your murder on the down low."
+ item = new /obj/item/suppressor
+
+ price_min = 100
+ price_max = 700
+ stock_max = 6
+ availability_prob = 40
From 20090633c022c2b2b6611ead6d1998886f6d52e7 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:48:45 -0700
Subject: [PATCH 19/59] proc call items dont work :(
---
.../blackmarket/blackmarket_items/weapons.dm | 25 +++++++++++--------
code/modules/power/cell.dm | 3 ---
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index d8dfa95c0006..1d01c1813b63 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -157,7 +157,7 @@
/datum/blackmarket_item/weapon/corrupt_gun_cell
name = "Damaged Weapon Cell"
desc = "These got a bit dinged up in their crate after a close shave with GOLD inspectors. The cells are probably still safe to use though."
- item = /obj/item/stock_parts/cell/gun/corrupt
+ item = /obj/item/stock_parts/cell/gun
price_min = 250
price_max = 500
@@ -165,6 +165,11 @@
stock_max = 10
availability_prob = 40
+/datum/blackmarket_item/weapon/corrupt_gun_cell/spawn_item(loc)
+ var/stock_parts/cell/gun = C()
+ c.corrupt()
+ return new berries(loc)
+
/datum/blackmarket_item/weapon/saber_smg
name = "Saber 9mm SMG"
desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase into distribution. But we happen know a guy."
@@ -206,16 +211,16 @@
stock = 1
availability_prob = 20
-/datum/blackmarket_item/weapon/sawn_illestren
- name = "Sawn off Illestren Rifle"
- desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
- item = /obj/item/gun/ballistic/rifle/illestren/sawoff
+// /datum/blackmarket_item/weapon/sawn_illestren
+// name = "Sawn off Illestren Rifle"
+// desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
+// item = /obj/item/gun/ballistic/rifle/illestren/sawoff
- price_min = 600
- price_max = 1250
- stock_min = 2
- stock_max = 5
- availability_prob = 50
+// price_min = 600
+// price_max = 1250
+// stock_min = 2
+// stock_max = 5
+// availability_prob = 50
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 3e026decf6cd..1a2f87c70dd9 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -419,9 +419,6 @@
charge = 0
update_appearance()
-/obj/item/stock_parts/cell/gun/corrupt()
- return
-
/obj/item/stock_parts/cell/gun/update_appearance()
cut_overlays()
if(grown_battery)
From 1381c24775cdeeee0a16bf66bac9ffa7d06eed61 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:49:07 -0700
Subject: [PATCH 20/59] Update weapons.dm
---
.../blackmarket/blackmarket_items/weapons.dm | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 1d01c1813b63..f347958ef709 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -154,21 +154,21 @@
stock_max = 2
availability_prob = 20
-/datum/blackmarket_item/weapon/corrupt_gun_cell
- name = "Damaged Weapon Cell"
- desc = "These got a bit dinged up in their crate after a close shave with GOLD inspectors. The cells are probably still safe to use though."
- item = /obj/item/stock_parts/cell/gun
-
- price_min = 250
- price_max = 500
- stock_min = 4
- stock_max = 10
- availability_prob = 40
-
-/datum/blackmarket_item/weapon/corrupt_gun_cell/spawn_item(loc)
- var/stock_parts/cell/gun = C()
- c.corrupt()
- return new berries(loc)
+// /datum/blackmarket_item/weapon/corrupt_gun_cell
+// name = "Damaged Weapon Cell"
+// desc = "These got a bit dinged up in their crate after a close shave with GOLD inspectors. The cells are probably still safe to use though."
+// item = /obj/item/stock_parts/cell/gun
+
+// price_min = 250
+// price_max = 500
+// stock_min = 4
+// stock_max = 10
+// availability_prob = 40
+
+// /datum/blackmarket_item/weapon/corrupt_gun_cell/spawn_item(loc)
+// var/stock_parts/cell/gun = Cell()
+// Cell.corrupt()
+// return new berries(loc)
/datum/blackmarket_item/weapon/saber_smg
name = "Saber 9mm SMG"
From d471b8bf1536ae67cbca8843af859de8fab67944 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 20:01:38 -0700
Subject: [PATCH 21/59] bye corrupt cells
---
.../blackmarket/blackmarket_items/weapons.dm | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index f347958ef709..e8dab5749346 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -154,22 +154,6 @@
stock_max = 2
availability_prob = 20
-// /datum/blackmarket_item/weapon/corrupt_gun_cell
-// name = "Damaged Weapon Cell"
-// desc = "These got a bit dinged up in their crate after a close shave with GOLD inspectors. The cells are probably still safe to use though."
-// item = /obj/item/stock_parts/cell/gun
-
-// price_min = 250
-// price_max = 500
-// stock_min = 4
-// stock_max = 10
-// availability_prob = 40
-
-// /datum/blackmarket_item/weapon/corrupt_gun_cell/spawn_item(loc)
-// var/stock_parts/cell/gun = Cell()
-// Cell.corrupt()
-// return new berries(loc)
-
/datum/blackmarket_item/weapon/saber_smg
name = "Saber 9mm SMG"
desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase into distribution. But we happen know a guy."
From 6cd26efddb35a44b1283281d7bf9a3f51e9aa1f5 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 20:15:08 -0700
Subject: [PATCH 22/59] Fixes Paired items always spawning. Also typos
---
code/controllers/subsystem/blackmarket.dm | 5 ++---
code/modules/cargo/blackmarket/blackmarket_items/tools.dm | 4 ++--
code/modules/cargo/blackmarket/blackmarket_market.dm | 3 +++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index 01ac500dce65..1571f82d3fe1 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -29,9 +29,8 @@ SUBSYSTEM_DEF(blackmarket)
if(!markets[M])
stack_trace("SSblackmarket: Item [I] available in market that does not exist.")
continue
- markets[M].add_item(item,FALSE)
- if(I.pair_item)
- markets[M].add_item(I.pair_item,TRUE)
+ markets[M].add_item(item, FALSE)
+
qdel(I)
. = ..()
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index ad8cbc238eeb..d8f4fb77ac22 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -41,7 +41,7 @@
stock_max = 3
availability_prob = 40
-/datum/blackmarket_item/tools/combat_wrench
+/datum/blackmarket_item/tool/combat_wrench
name = "Combat Wrench"
desc = "Under fire while doing repairs? With this dual purpose wrench, never be caught unprepared again!"
item = /obj/item/wrench/combat
@@ -91,7 +91,7 @@
stock_max = 10
availability_prob = 50
-/datum/blackmarket_item/tools/thermite_jug
+/datum/blackmarket_item/tool/thermite_jug
name = "Thermite Jug"
desc = "An extra large 150u jug of thermite. For those hard to reach places."
item = /obj/item/reagent_containers/glass/chem_jug/thermite
diff --git a/code/modules/cargo/blackmarket/blackmarket_market.dm b/code/modules/cargo/blackmarket/blackmarket_market.dm
index 74a45557b9b4..436c2e90d791 100644
--- a/code/modules/cargo/blackmarket/blackmarket_market.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_market.dm
@@ -20,6 +20,9 @@
if(ispath(item))
item = new item()
+ if(item.pair_item)
+ add_item(item.pair_item, TRUE)
+
if(!(item.category in categories))
categories += item.category
available_items[item.category] = list()
From 68fa9d9ba26a7c9d033acd5518bafc01bcc25d98 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 20:26:31 -0700
Subject: [PATCH 23/59] Clothing tidbits
---
.../blackmarket/blackmarket_items/clothing.dm | 31 +++++++++++++------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index e0195d2c1958..55157807b331 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -13,7 +13,7 @@
/datum/blackmarket_item/clothing/crown
name = "Crown"
- desc = "A beautiful golden crown, rich with history and pedigree. I'm sure they won't miss it."
+ desc = "A beautiful golden crown, rich with history and pedigree. Better worn than left to collect dust in a museum, right?"
item = /obj/item/clothing/head/crown/fancy
price_min = 1000
@@ -98,15 +98,26 @@
return B
/datum/blackmarket_item/clothing/gezena_armor
- name = "Raksha-plating vest"
- desc = "Genuine armor vests used by the PGF Marine Corp. This is hot merchandise, so we need to move it fast."
+ name = "Raksha-Plating vest"
+ desc = "Genuine armor vests used by the PGF Marine Corp. If a military guy in a cape comes by, play dumb."
item = /obj/item/clothing/suit/armor/gezena/marine
+ pair_item = /datum/blackmarket_item/clothing/gezena_helmet
- price_min = 1500
- price_max = 2000
- stock_max = 2
+ price_min = 750
+ price_max = 1500
+ stock_max = 3
availability_prob = 20
+/datum/blackmarket_item/clothing/gezena_helmet
+ name = "Raksha-Helm"
+ desc = "A helmet used by the PGF Marine Corp. They won't miss it. Not like there's much to protect up there anyways."
+ item = /obj/item/clothing/head/helmet/gezena
+
+ price_min = 500
+ price_max = 600
+ stock_max = 3
+ availability_prob = 0
+
/datum/blackmarket_item/clothing/full_spacesuit_set
name = "\improper Nanotrasen Branded Spacesuit Box"
desc = "A few boxes of \"Old Style\" space suits fell off the back of a space truck."
@@ -136,8 +147,8 @@
availability_prob = 70
/datum/blackmarket_item/clothing/combatmedic_suit
- name = "Combat Medic hardsuit"
- desc = "A discarded combat medic hardsuit, found in the ruins of a carpet bombed xeno hive. Definately used, but as sturdy as an anchor."
+ name = "Combat Medic Hardsuit"
+ desc = "A discarded combat medic hardsuit, found in the ruins of a carpet bombed xeno hive. Definetely used, but as sturdy as an anchor."
item = /obj/item/clothing/suit/space/hardsuit/combatmedic
price_min = 1000
@@ -146,7 +157,7 @@
availability_prob = 40
/datum/blackmarket_item/clothing/ramzi_suit
- name = "Rusted Red hardsuit"
+ name = "Rusted Red Hardsuit"
desc = "A vintage ICW Era Gorlex Maruader hardsuit. The previous owner said we could have it when we pried it off their cold dead hands. Dry cleaning not included."
item = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
@@ -156,7 +167,7 @@
availability_prob = 30
/datum/blackmarket_item/clothing/frontiersmen_hardsuit
- name = "Frontiersmen hardsuit"
+ name = "Frontiersmen Hardsuit"
desc = "An old, if not durable hardsuit typically used by the Frontiersmen. We accept no liability if you're shot by CLIP while wearing this."
item = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
From 158ac56d34702bab0bfaca1f0b954371706d4710 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 20:52:54 -0700
Subject: [PATCH 24/59] Desc clean up + Sawn off Illestren works
---
.../blackmarket/blackmarket_items/weapons.dm | 24 +++++++++----------
.../projectiles/guns/ballistic/rifle.dm | 6 +++++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index e8dab5749346..110a8a10f963 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -156,7 +156,7 @@
/datum/blackmarket_item/weapon/saber_smg
name = "Saber 9mm SMG"
- desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase into distribution. But we happen know a guy."
+ desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase and into distribution. But we happen know a guy."
item = /obj/item/gun/ballistic/automatic/smg/proto
pair_item = /datum/blackmarket_item/weapon/saber_mag
@@ -182,12 +182,12 @@
price_min = 2500
price_max = 5000
- stock = 1
+ stock = 2
availability_prob = 20
/datum/blackmarket_item/weapon/bioterror_foam
name = "Bioterror Foam Sprayer"
- desc = "Banned in at least 17 jurisdictions for being 'cruel', 'inhumane', and 'causing indiscriminate lifelong generational health complications'. Though if you actually cared about those things, you wouldn't be shopping here in the first place."
+ desc = "Banned in at least 17 jurisdictions for being \"cruel\",\"inhumane\", and \"causing indiscriminate lifelong generational health complications\". Though if you actually cared about those things, you wouldn't be shopping here in the first place."
item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
price_min = 3000
@@ -195,16 +195,16 @@
stock = 1
availability_prob = 20
-// /datum/blackmarket_item/weapon/sawn_illestren
-// name = "Sawn off Illestren Rifle"
-// desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
-// item = /obj/item/gun/ballistic/rifle/illestren/sawoff
+/datum/blackmarket_item/weapon/sawn_illestren
+ name = "Sawn off Illestren Rifle"
+ desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
+ item = /obj/item/gun/ballistic/rifle/illestren/sawn
-// price_min = 600
-// price_max = 1250
-// stock_min = 2
-// stock_max = 5
-// availability_prob = 50
+ price_min = 600
+ price_max = 1250
+ stock_min = 2
+ stock_max = 5
+ availability_prob = 50
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 9c45ac569da8..a52e2cf2a895 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -113,6 +113,12 @@
item_state = "illestren_factory_sawn"
mob_overlay_state = item_state
+/obj/item/gun/ballistic/rifle/illestren/sawn
+ name = "sawn-off Illestren rifle"
+ desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
+ item_state = "illestren_sawn"
+ sawn_off = TRUE
+
/obj/item/gun/ballistic/rifle/solgov
name = "SSG-669C"
desc = "A bolt-action sniper rifle used by Solarian troops. Beloved for its rotary design and accuracy. Chambered in 8x58mm Caseless."
From 343f7177e55b9fa48b1ffdbbfc181e64e3497a32 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 21:24:24 -0700
Subject: [PATCH 25/59] Explosives Tab
---
.../blackmarket_items/explosives.dm | 76 +++++++++++++++++++
.../blackmarket/blackmarket_items/weapons.dm | 12 +--
shiptest.dme | 1 +
3 files changed, 78 insertions(+), 11 deletions(-)
create mode 100644 code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
new file mode 100644
index 000000000000..4219179486ea
--- /dev/null
+++ b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
@@ -0,0 +1,76 @@
+/datum/blackmarket_item/explosive
+ category = "Explosives"
+
+/datum/blackmarket_item/explosive/emp_grenade
+ name = "EMP Grenade"
+ desc = "Use this grenade for SHOCKING results!"
+ item = /obj/item/grenade/empgrenade
+
+ price_min = 100
+ price_max = 400
+ stock_max = 5
+ availability_prob = 50
+
+/datum/blackmarket_item/explosive/h_e
+ name = "HE Grenade"
+ desc = "These high explosive grenades are sure to get some bang for your buck."
+ item = /obj/item/grenade/syndieminibomb/concussion
+
+ price_min = 100
+ price_max = 500
+ stock_max = 5
+ availability_prob = 25
+
+/datum/blackmarket_item/explosive/frag
+ name = "Fragmentation Grenade"
+ desc = "Pull the pin, count to three, and throw for best results."
+ item = /obj/item/grenade/frag
+
+ price_min = 100
+ price_max = 500
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 40
+
+/datum/blackmarket_item/explosive/c4
+ name = "C4"
+ desc = "Looking to make an explosive entrance? These plastic explosives are perfect for the job."
+ item = obj/item/grenade/c4
+
+ price_min = 100
+ price_max = 400
+ stock_min = 5
+ stock_max = 10
+ availability_prob = 50
+
+/datum/blackmarket_item/explosive/x4
+ name = "X4"
+ desc = "X4 Plastic Explosives! Better than W4, worse than Y4."
+ item = obj/item/grenade/c4/x4
+
+ price_min = 400
+ price_max = 700
+ stock_min = 2
+ stock_max = 3
+ availability_prob = 25
+
+/datum/blackmarket_item/explosive/slipocalypse
+ name = "Slipocalyse Cluster Bomb"
+ desc = "Wash away the opposition with sudstastic grenade!"
+ item = /obj/item/grenade/clusterbuster/soap
+
+ price_min = 500
+ price_max = 1500
+ stock = 1
+ availability_prob = 10
+
+/datum/blackmarket_item/explosive/rusted_mine
+ name = "Landmine"
+ desc = "Recovered from a decades old ICW battlefield by our best EOD tech, Nicky Nine Fingers."
+ item = /obj/item/mine/pressure/explosive/rusty
+
+ price_min = 250
+ price_max = 500
+ stock_max = 7
+ availability_prob = 50
+
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 110a8a10f963..255c18fe8ed2 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -54,16 +54,6 @@
stock = 1
availability_prob = 20
-/datum/blackmarket_item/weapon/emp_grenade
- name = "EMP Grenade"
- desc = "Use this grenade for SHOCKING results!"
- item = /obj/item/grenade/empgrenade
-
- price_min = 100
- price_max = 400
- stock_max = 2
- availability_prob = 50
-
/datum/blackmarket_item/weapon/derringer
name = "Derringer"
desc = "A concealable handgun small enough to hide nearly anywhere. Uses .38 revolver rounds."
@@ -163,7 +153,7 @@
price_min = 2500
price_max = 4200
stock_max = 2
- availability_prob = 20
+ availability_prob = 25
/datum/blackmarket_item/weapon/saber_mag
name = "Saber 9mm SMG Magazines"
diff --git a/shiptest.dme b/shiptest.dme
index f47262455ab4..ba6db92ad797 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1877,6 +1877,7 @@
#include "code\modules\cargo\blackmarket\blackmarket_items\clothing.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\consumables.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\emergency.dm"
+#include "code\modules\cargo\blackmarket\blackmarket_items\explosives.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\misc.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\tools.dm"
#include "code\modules\cargo\blackmarket\blackmarket_items\weapons.dm"
From 64e9980e7aa574c99141d9e4e4b8b9f34eadd13b Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 21:40:18 -0700
Subject: [PATCH 26/59] Reduces telepad order time, fixes typos
---
.../cargo/blackmarket/blackmarket_items/explosives.dm | 4 ++--
code/modules/cargo/blackmarket/blackmarket_telepad.dm | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
index 4219179486ea..066e3c23e640 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
@@ -35,7 +35,7 @@
/datum/blackmarket_item/explosive/c4
name = "C4"
desc = "Looking to make an explosive entrance? These plastic explosives are perfect for the job."
- item = obj/item/grenade/c4
+ item = /obj/item/grenade/c4
price_min = 100
price_max = 400
@@ -46,7 +46,7 @@
/datum/blackmarket_item/explosive/x4
name = "X4"
desc = "X4 Plastic Explosives! Better than W4, worse than Y4."
- item = obj/item/grenade/c4/x4
+ item = /obj/item/grenade/c4/x4
price_min = 400
price_max = 700
diff --git a/code/modules/cargo/blackmarket/blackmarket_telepad.dm b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
index c2ef78027d0f..0dea6c59b819 100644
--- a/code/modules/cargo/blackmarket/blackmarket_telepad.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
@@ -27,7 +27,7 @@
/// Current recharge progress.
var/recharge_cooldown = 0
/// Base recharge time which is used to get recharge_time.
- var/base_recharge_time = 100
+ var/base_recharge_time = 10
/// Current /datum/blackmarket_purchase being recieved.
var/recieving
/// Current /datum/blackmarket_purchase being sent to the target uplink.
@@ -47,9 +47,9 @@
/obj/machinery/ltsrbt/RefreshParts()
recharge_time = base_recharge_time
- // On tier 4 recharge_time should be 20 and by default it is 80 as scanning modules should be tier 1.
+ // On tier 4 recharge_time should be 2 and by default it is 8 as scanning modules should be tier 1.
for(var/obj/item/stock_parts/scanning_module/scan in component_parts)
- recharge_time -= scan.rating * 10
+ recharge_time -= scan.rating
recharge_cooldown = recharge_time
power_efficiency = 0
From 1d1fe43f07211ff46f9438a518240000367145bb Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 21:42:32 -0700
Subject: [PATCH 27/59] Paired Items show up AFTER their main item
---
code/modules/cargo/blackmarket/blackmarket_market.dm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_market.dm b/code/modules/cargo/blackmarket/blackmarket_market.dm
index 436c2e90d791..3e055048a85b 100644
--- a/code/modules/cargo/blackmarket/blackmarket_market.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_market.dm
@@ -20,14 +20,15 @@
if(ispath(item))
item = new item()
- if(item.pair_item)
- add_item(item.pair_item, TRUE)
-
if(!(item.category in categories))
categories += item.category
available_items[item.category] = list()
available_items[item.category] += item
+
+ if(item.pair_item)
+ add_item(item.pair_item, TRUE)
+
return TRUE
/// Handles buying the item, this is mainly for future use and moving the code away from the uplink.
From 29ee452fda61ee810ec5c71d4075620f38aa8745 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 21:54:00 -0700
Subject: [PATCH 28/59] safethrow
---
code/controllers/subsystem/blackmarket.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index 1571f82d3fe1..255d77face73 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(blackmarket)
var/pickedloc = vlevel.get_side_turf(startSide)
var/atom/movable/item = purchase.entry.spawn_item(pickedloc)
- item.throw_at(purchase.uplink, 3, 3, spin = FALSE)
+ item.safe_throw_at(purchase.uplink, 3, 3, spin = FALSE)
to_chat(recursive_loc_check(purchase.uplink.loc, /mob), "[purchase.uplink] flashes a message noting the order is being launched at your coordinates from [dir2text(startSide)].")
From 48e4143ff34b8317e1acb53a5fe1c59511687fc7 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 21:58:50 -0700
Subject: [PATCH 29/59] descriptions for sending methods
---
code/controllers/subsystem/blackmarket.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index 255d77face73..a318110c5209 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -5,8 +5,8 @@ SUBSYSTEM_DEF(blackmarket)
/// Descriptions for each shipping methods.
var/shipping_method_descriptions = list(
- SHIPPING_METHOD_LAUNCH="Launches the item at your coordinates from across deep space, cheap but you might not recieve your item at all.",
- SHIPPING_METHOD_LTSRBT="Long-To-Short-Range-Bluespace-Transceiver, a machine that prepares items at a remote storage location and then teleports them to the location of the uplink."
+ SHIPPING_METHOD_LAUNCH="Launches the item at your coordinates from across deep space, cheap but you might not recieve your item at all. We reccomend being stationary in space away from any large structures for best results.",
+ SHIPPING_METHOD_LTSRBT="Long-To-Short-Range-Bluespace-Transceiver, a machine that prepares items at a remote storage location and then teleports them to the location of the LTRSBT."
)
/// List of all existing markets.
From 9486776bf2c5b2361a59bdbcef193c8ec9b32459 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 22:00:26 -0700
Subject: [PATCH 30/59] reduce LTSRBT cost
---
code/modules/cargo/packs/machinery.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm
index 0bf718fffdd5..825329e97c80 100644
--- a/code/modules/cargo/packs/machinery.dm
+++ b/code/modules/cargo/packs/machinery.dm
@@ -176,7 +176,7 @@
/datum/supply_pack/machinery/blackmarket_telepad
name = "Black Market LTSRBT"
desc = "Need a faster and better way of transporting your illegal goods from and to the sector? Fear not, the Long-To-Short-Range-Bluespace-Transceiver (LTSRBT for short) is here to help. Contains a LTSRBT circuit, two bluespace crystals, and one ansible."
- cost = 5000
+ cost = 1000
contains = list(
/obj/item/circuitboard/machine/ltsrbt,
/obj/item/stack/ore/bluespace_crystal/artificial,
From c0c5dcafb5d531d889714be7d6136cba11e4aa52 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 22:19:53 -0700
Subject: [PATCH 31/59] Final passover and additions
---
.../blackmarket/blackmarket_items/clothing.dm | 17 +++++++++--------
.../blackmarket_items/consumables.dm | 7 ++++---
.../blackmarket/blackmarket_items/emergency.dm | 2 +-
.../blackmarket/blackmarket_items/explosives.dm | 11 +++++++++++
.../cargo/blackmarket/blackmarket_items/misc.dm | 11 +++++------
.../blackmarket/blackmarket_items/tools.dm | 9 +++++----
.../blackmarket/blackmarket_items/weapons.dm | 16 +++++++++++++---
7 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index 55157807b331..b8041c05df3d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -68,7 +68,8 @@
price_min = 100
price_max = 400
- stock_max = 3
+ stock_min = 4
+ stock_max = 6
availability_prob = 80
/datum/blackmarket_item/clothing/degraded_armor_set/spawn_item(loc)
@@ -86,7 +87,7 @@
price_min = 1000
price_max = 1750
- stock_max = 2
+ stock_max = 3
availability_prob = 50
/datum/blackmarket_item/clothing/frontiersmen_armor_set/spawn_item(loc)
@@ -153,25 +154,25 @@
price_min = 1000
price_max = 2500
- stock_max = 2
- availability_prob = 40
+ stock_max = 3
+ availability_prob = 30
/datum/blackmarket_item/clothing/ramzi_suit
name = "Rusted Red Hardsuit"
desc = "A vintage ICW Era Gorlex Maruader hardsuit. The previous owner said we could have it when we pried it off their cold dead hands. Dry cleaning not included."
item = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
- price_min = 1250
+ price_min = 1500
price_max = 2500
stock = 1
availability_prob = 30
/datum/blackmarket_item/clothing/frontiersmen_hardsuit
name = "Frontiersmen Hardsuit"
- desc = "An old, if not durable hardsuit typically used by the Frontiersmen. We accept no liability if you're shot by CLIP while wearing this."
+ desc = "An old but durable hardsuit typically used by the Frontiersmen. We accept no liability if you're shot by CLIP while wearing this."
item = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
price_min = 1000
price_max = 2000
- stock_max = 2
- availability_prob = 30
+ stock_max = 3
+ availability_prob = 40
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 5bf95ffced26..0f667d049b8d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -54,7 +54,7 @@
/datum/blackmarket_item/consumable/morphine
name = "Morphine Bottle"
- desc = "Medicinal? Recreational? You decide!"
+ desc = "Medicinal? Recreational? You can decide with this 30u bottle of morphine!"
item = /obj/item/reagent_containers/glass/bottle/morphine
price_min = 50
@@ -120,7 +120,8 @@
price_min = 25
price_max = 100
- stock_max = 10
+ stock_min = 10
+ stock_max = 20
availability_prob = 40
/datum/blackmarket_item/consumable/berries/spawn_item(loc)
@@ -146,7 +147,7 @@
item = /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
price_min = 10
- price_max = 20
+ price_max = 50
stock_min = 10
stock_max = 20
availability_prob = 50
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
index 81512191f1f4..eba0822d0071 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
@@ -27,7 +27,7 @@
item = /obj/item/circuitboard/machine/shuttle/engine/electric
price_min = 2000
- price_max = 400
+ price_max = 4000
stock_max = 5
availability_prob = 100
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
index 066e3c23e640..dce8a1903e1a 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
@@ -74,3 +74,14 @@
stock_max = 7
availability_prob = 50
+/datum/blackmarket_item/explosive/rpg
+ name = "PML-9 RPG"
+ desc = "Offically, it's an anti-armor RPG launcher. Technically, it's anti-everything. Most things don't enjoy being hit in the face with high explosives."
+ item = /obj/item/gun/ballistic/rocketlauncher
+
+ price_min = 2000
+ price_max = 5000
+ stock_min = 2
+ stock_max = 5
+ availability_prob = 20
+
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index 01ef4a01f304..e914482f064c 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -58,7 +58,7 @@
/datum/blackmarket_item/misc/organs
name = "Organ Freezer"
- desc = "Need some fresh organs in a jiffy? We got you covered. Make good use of them. Someone died to get these to you."
+ desc = "Need some fresh organs in a jiffy? We got you covered. Make good use of them, someone died to get these to you."
item = /obj/structure/closet/crate/freezer/surplus_limbs/organs
price_min = 1000
@@ -68,14 +68,13 @@
/datum/blackmarket_item/misc/abandoned_crate
name = "Abandoned Crate"
- desc = "Why, it could be \"anything\". Are you feeling lucky?"
+ desc = "Why, it could be anything. Are you feeling lucky?"
item = /obj/structure/closet/crate/secure/loot
price_min = 250
price_max = 500
- stock_min = 5
- stock_max = 10
- availability_prob = 50
+ availability_prob = 100
+ unlimited = TRUE
/datum/blackmarket_item/misc/spygass
name = "Spy Glass Kit"
@@ -95,4 +94,4 @@
price_min = 250
price_max = 1000
stock_max = 10
- availability_prob = 30
+ availability_prob = 40
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index d8f4fb77ac22..87adc721d34d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -97,7 +97,7 @@
item = /obj/item/reagent_containers/glass/chem_jug/thermite
price_min = 400
- price_max = 2600
+ price_max = 1500
stock_max = 3
availability_prob = 20
@@ -128,7 +128,7 @@
price_min = 100
price_max = 1000
- stock_max = 3
+ stock = 3
availability_prob = 30
/datum/blackmarket_item/tool/rocket_gloves
@@ -138,7 +138,7 @@
price_min = 500
price_max = 2000
- stock_max = 2
+ stock_max = 3
availability_prob = 30
/datum/blackmarket_item/tool/chem_master
@@ -168,5 +168,6 @@
price_min = 100
price_max = 700
+ stock_min = 3
stock_max = 6
- availability_prob = 40
+ availability_prob = 60
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 255c18fe8ed2..408950d47a97 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -111,7 +111,7 @@
price_min = 250
price_max = 750
stock = 5
- availability_prob = 40
+ availability_prob = 60
/datum/blackmarket_item/weapon/e40
name = "E-40 Hybrid Assault Rifle"
@@ -126,7 +126,7 @@
/datum/blackmarket_item/weapon/e40_mag
name = "Eoehoma .299 Caseless Magazine"
- desc = "30 round magazines for the E-40 Hybrid Rifle."
+ desc = "A 30 round magazine for the E-40 Hybrid Rifle."
item = /obj/item/ammo_box/magazine/e40
price_min = 750
@@ -194,7 +194,17 @@
price_max = 1250
stock_min = 2
stock_max = 5
- availability_prob = 50
+ availability_prob = 60
+
+/datum/blackmarket_item/weapon/combat_shotgun
+ name = "Combat Shotgun"
+ desc = "Are your arms tired from pumping Hunter's Pride shotguns? This semi-automatic combat shotgun will make killing a breeze."
+ item = /obj/item/gun/ballistic/shotgun/automatic/combat
+
+ price_min = 2000
+ price_max = 4000
+ stock_max = 3
+ availability_prob = 40
From bfeef5aa421d619fac6564917c69626041ef5a1f Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:09:06 -0700
Subject: [PATCH 32/59] plasma name
---
code/modules/cargo/blackmarket/blackmarket_items/emergency.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
index eba0822d0071..6406ad3923d2 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
@@ -2,7 +2,7 @@
category = "Emergency"
/datum/blackmarket_item/emergency/plasma
- name = "Plasma Fuel"
+ name = "Plasma"
desc = "Low on fuel? We can part with some plasma... for a reasonable price."
item = /obj/item/stack/sheet/mineral/plasma/twenty
From ae7dd475222e65aba57926e45f06b5e3e3d08dce Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:53:25 -0700
Subject: [PATCH 33/59] Bioterror Spray go bye bye
---
.../cargo/blackmarket/blackmarket_items/weapons.dm | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 408950d47a97..070b2da741b0 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -175,16 +175,6 @@
stock = 2
availability_prob = 20
-/datum/blackmarket_item/weapon/bioterror_foam
- name = "Bioterror Foam Sprayer"
- desc = "Banned in at least 17 jurisdictions for being \"cruel\",\"inhumane\", and \"causing indiscriminate lifelong generational health complications\". Though if you actually cared about those things, you wouldn't be shopping here in the first place."
- item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
-
- price_min = 3000
- price_max = 6000
- stock = 1
- availability_prob = 20
-
/datum/blackmarket_item/weapon/sawn_illestren
name = "Sawn off Illestren Rifle"
desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
From 8ae39fefc70c70499296f0ea142ad697cb5baf38 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:57:10 -0700
Subject: [PATCH 34/59] Fixes derringer datum
---
code/modules/cargo/blackmarket/blackmarket_items/weapons.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 070b2da741b0..5989f0dec59d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -63,7 +63,7 @@
stock_max = 6
availability_prob = 50
-/datum/blackmarket_item/weapon/derringer
+/datum/blackmarket_item/weapon/golden
name = "Golden Derringer"
desc = "A rare custom-made concealable weapon designed to fire illegal .357 rounds."
item = /obj/item/gun/ballistic/derringer/gold
From 18442cef8b2130927ea8837fb27198bceba1bdd1 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:58:17 -0700
Subject: [PATCH 35/59] Shipping descs typos
Co-authored-by: meem <75212565+meemofcourse@users.noreply.github.com>
Signed-off-by: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
---
code/controllers/subsystem/blackmarket.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index a318110c5209..cbd07fcd8fda 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(blackmarket)
/// Descriptions for each shipping methods.
var/shipping_method_descriptions = list(
- SHIPPING_METHOD_LAUNCH="Launches the item at your coordinates from across deep space, cheap but you might not recieve your item at all. We reccomend being stationary in space away from any large structures for best results.",
+ SHIPPING_METHOD_LAUNCH="Launches the item at your coordinates from across deep space. Cheap, but you might not recieve your item at all. We recommend being stationary in space, away from any large structures, for best results.",
SHIPPING_METHOD_LTSRBT="Long-To-Short-Range-Bluespace-Transceiver, a machine that prepares items at a remote storage location and then teleports them to the location of the LTRSBT."
)
From 578e4deac7a97bb296df4a31992b6de74f925e7a Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 00:01:36 -0700
Subject: [PATCH 36/59] bepis disk go bye bye
---
code/modules/cargo/blackmarket/blackmarket_items/misc.dm | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index e914482f064c..ff6cb7e13f00 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -86,12 +86,3 @@
stock_max = 3
availability_prob = 30
-/datum/blackmarket_item/misc/bepis_disk
- name = "BEPIS Technology Disk"
- desc = "An ancient technology disk containing some probably useful data. No refunds."
- item = /obj/item/disk/tech_disk/major
-
- price_min = 250
- price_max = 1000
- stock_max = 10
- availability_prob = 40
From 9fe84128224301ed5457dad37d4a7c294a86ecb3 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 00:03:00 -0700
Subject: [PATCH 37/59] more expensive RPGS
---
.../modules/cargo/blackmarket/blackmarket_items/explosives.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
index dce8a1903e1a..c9c68ab70414 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
@@ -79,8 +79,8 @@
desc = "Offically, it's an anti-armor RPG launcher. Technically, it's anti-everything. Most things don't enjoy being hit in the face with high explosives."
item = /obj/item/gun/ballistic/rocketlauncher
- price_min = 2000
- price_max = 5000
+ price_min = 3500
+ price_max = 6500
stock_min = 2
stock_max = 5
availability_prob = 20
From 9d06b1785cf69e44aa4f642005e3e1543e5325fb Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 00:29:16 -0700
Subject: [PATCH 38/59] Mech Equipment DLC Pack
---
code/modules/cargo/blackmarket/blackmarket_items/misc.dm | 9 +++++++++
.../cargo/blackmarket/blackmarket_items/weapons.dm | 8 ++++++++
2 files changed, 17 insertions(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index ff6cb7e13f00..02ea3775e7a7 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -86,3 +86,12 @@
stock_max = 3
availability_prob = 30
+/datum/blackmarket_item/misc/ripley_mk_4
+ name = "Ripley Mk IV Upgrade Kit"
+ desc = "Pimp out your Ripley to the CLIP Mark IV Rogue Model today! Killjoy bureaucrats not included, thank god."
+ item = /obj/item/mecha_parts/mecha_equipment/conversion_kit/ripley/clip
+
+ price_min = 1500
+ price_max = 2500
+ stock_max = 3
+ availability_prob = 30
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 5989f0dec59d..a288fa53c532 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -196,6 +196,14 @@
stock_max = 3
availability_prob = 40
+/datum/blackmarket_item/weapon/mecha_weapon_bay
+ name = "Concealed Weapons Bay"
+ desc = "Ripley with a laser cannon? Odysseus with a missile rack? Sky's the limit with this omni-compatible weapons bay! (Missiles and lasers not included)"
+ item = /obj/item/mecha_parts/concealed_weapon_bay
+ price_min = 1250
+ price_max = 2000
+ stock_max = 2
+ availability_prob = 30
From 549538ac8d5d4ef07d52bb0f3c3548713d17dbe8 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 00:31:24 -0700
Subject: [PATCH 39/59] typo fixes
---
code/modules/cargo/blackmarket/blackmarket_items/clothing.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index b8041c05df3d..6b3bc0c9241b 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -149,7 +149,7 @@
/datum/blackmarket_item/clothing/combatmedic_suit
name = "Combat Medic Hardsuit"
- desc = "A discarded combat medic hardsuit, found in the ruins of a carpet bombed xeno hive. Definetely used, but as sturdy as an anchor."
+ desc = "A discarded combat medic hardsuit, found in the ruins of a carpet bombed xeno hive. Definitely used, but as sturdy as an anchor."
item = /obj/item/clothing/suit/space/hardsuit/combatmedic
price_min = 1000
From ffa0d8f499d66f69a061d5db40f33d2f4b39053c Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 00:41:13 -0700
Subject: [PATCH 40/59] Secret Intel DLC
---
.../blackmarket/blackmarket_items/misc.dm | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index 02ea3775e7a7..df36e39313de 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -95,3 +95,30 @@
price_max = 2500
stock_max = 3
availability_prob = 30
+
+/datum/blackmarket_item/misc/secret_docs
+ name = "Classified Documents"
+ desc = "Good people died to get these. Luckily, we aren't good people."
+ item = /obj/item/documents
+
+ price_min = 2000
+ price_max = 10000
+ stock = 1
+ availability_prob = 40
+
+/datum/blackmarket_item/consumable/secret_docs/spawn_item(loc)
+ var/docs = pick(list(/obj/item/documents/nanotrasen,
+ /obj/item/documents/solgov,
+ /obj/item/documents/terragov,
+ /obj/item/documents/syndicate/red))
+ return new docs(loc)
+
+/datum/blackmarket_item/misc/black_box
+ name = "Blackbox"
+ desc = "Recorded in here is final moments of some poor souls who are no longer with us. We suggest watching it with friends and popcorn."
+ item = /obj/item/blackbox
+
+ price_min = 1000
+ price_max = 10000
+ stock = 1
+ availability_prob = 40
From 0a0759e0f70cb663efbc5993ee4b896db59a1381 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 00:47:35 -0700
Subject: [PATCH 41/59] more typos
---
code/modules/cargo/blackmarket/blackmarket_uplink.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_uplink.dm b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
index de799f5540ce..26363bf71b82 100644
--- a/code/modules/cargo/blackmarket/blackmarket_uplink.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_uplink.dm
@@ -2,7 +2,7 @@
name = "Black Market Uplink"
icon = 'icons/obj/blackmarket.dmi'
icon_state = "uplink"
- desc = "A jury rigged uplink capable of accessing illcit or grey market vendors. There's a port on side for linking it to a LTSRBT for more practical shipping."
+ desc = "A jury rigged uplink capable of accessing illicit or grey market vendors. There's a port on side for linking it to a LTSRBT for more practical shipping."
// UI variables.
var/viewing_category
From 849e30346f4021919d01fb42356cd35829e2bb12 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 01:15:32 -0700
Subject: [PATCH 42/59] Solar Armories DLC
---
.../blackmarket/blackmarket_items/weapons.dm | 69 +++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index a288fa53c532..31584c46314e 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -206,4 +206,73 @@
stock_max = 2
availability_prob = 30
+/datum/blackmarket_item/weapon/model_h
+ name = "Model H"
+ desc = "A Model H slug pistol. The H stands for Hurt. Chambered in ferromagnetic slugs."
+ item = /obj/item/gun/ballistic/automatic/powered/gauss/modelh
+ pair_item = /obj/item/ammo_box/magazine/modelh
+
+ price_min = 2000
+ price_max = 4000
+ stock = 2
+ availability_prob = 35
+
+/datum/blackmarket_item/consumable/model_h/spawn_item(loc)
+ var/model_h = pick(list(/obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns,
+ /obj/item/gun/ballistic/automatic/powered/gauss/modelh))
+ return new model_h(loc)
+
+/datum/blackmarket_item/weapon/model_h_mag
+ name = "Model H Magazine"
+ desc = "A 10 round magazine for Model H slug pistol."
+ item = /obj/item/ammo_box/magazine/modelh
+
+ price_min = 500
+ price_max = 1000
+ stock_max = 4
+ availability_prob = 0
+
+/datum/blackmarket_item/weapon/sgg
+ name = "SSG-669C Rotary Sniper Rifle"
+ desc = "I could tell you it's full name, but we'd be here all day. It's a sniper rifle. It shoots people from far away. Chambered in 8x58mm."
+ item = /obj/item/gun/ballistic/rifle/solgov
+ pair_item = /datum/blackmarket_item/weapon/sgg_stripper
+
+ price_min = 3000
+ price_max = 5000
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/sgg_stripper
+ name = "8x58 Stripper Clip"
+ desc = "A five round 8x58mm stripper clip for use with the SGG-669C."
+ item = /obj/item/ammo_box/a858
+
+ price_min = 500
+ price_max = 1000
+ stock_min = 4
+ stock_max = 6
+ availability_prob = 0
+
+/datum/blackmarket_item/weapon/pistole_c
+ name = "Pistole C"
+ desc = "Pistole Compact? Pistole Caseless? Pistole Cheese? Fuck if I know. All I know is these little numbers pack a nasty sting. Chambered in 5.56 caseless."
+ item = /obj/item/gun/ballistic/automatic/pistol/solgov/old
+ pair_item =
+
+ price_min = 900
+ price_max = 1250
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/weapon/pistole_c_mag
+ name = "5.56 Caseless Magazine"
+ desc = "A 12 round magazine for the Pistole Cheese."
+ item = /obj/item/ammo_box/magazine/pistol556mm
+
+ price_min = 250
+ price_max = 750
+ stock_max = 2
+ availability_prob = 0
+
From 8b71f9f2bb93cfc748458b12b8b3b7f13e033bd6 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 01:51:39 -0700
Subject: [PATCH 43/59] Price Adjustment, couple more weapons
---
.../blackmarket/blackmarket_items/weapons.dm | 66 ++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 31584c46314e..2fac1ab1caa8 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -239,7 +239,7 @@
pair_item = /datum/blackmarket_item/weapon/sgg_stripper
price_min = 3000
- price_max = 5000
+ price_max = 6000
stock = 1
availability_prob = 20
@@ -275,4 +275,68 @@
stock_max = 2
availability_prob = 0
+/datum/blackmarket_item/weapon/proto_gauss
+ name = "Prototype Gauss Rifle"
+ desc = "A prototype gauss rifle made by Nanotrasen. Perfect for making swiss cheese out of people. Chambered in ferromagnetic pellets."
+ item = /obj/item/gun/ballistic/automatic/powered/gauss
+ pair_item = /datum/blackmarket_item/weapon/proto_gauss_mag
+
+ price_min = 4000
+ price_max = 6000
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/proto_gauss_mag
+ name = "Prototype Gauss Rifle Magazine"
+ desc = "A 30 round ferromagnetic pellet magazine for the prototype gauss rifle."
+ item = /obj/item/ammo_box/magazine/gauss
+
+ price_min = 750
+ price_max = 1250
+ stock_max = 2
+ availability_prob = 0
+
+/datum/blackmarket_item/weapon/tec
+ name = "TEC-9 Machine Pistol"
+ desc = "Hallelujah! It's raining lead! This 9mm machine pistol is capable of spitting out bullets at rapid pace."
+ item = /obj/item/gun/ballistic/automatic/pistol/tec9
+ pair_item = /datum/blackmarket_item/weapon/tec_mag
+
+ price_min = 2000
+ price_max = 3250
+ stock_max = 2
+ availability_prob = 35
+
+/datum/blackmarket_item/weapon/tec_mag
+ name = "TEC-9 AP Magazine"
+ desc = "A 20 round magazine of AP ammo for the TEC-9 machine pistol."
+ item = /obj/item/ammo_box/magazine/tec9
+
+ price_min = 600
+ price_max = 1000
+ stock_max = 2
+ availability_prob = 0
+
+/datum/blackmarket_item/weapon/scout
+ name = "HP Scout"
+ desc = "A scoped rifle chambered in .300 Magnum. As the name would imply, perfect for scouts. Sidenote, scouts are also vulnerable to ambushes."
+ item = /obj/item/gun/ballistic/rifle/scout
+ pair_item = /datum/blackmarket_item/weapon/scout_stripper
+
+ price_min = 3500
+ price_max = 6500
+ stock = 1
+ availability_prob = 20
+
+/datum/blackmarket_item/weapon/scout_stripper
+ name = ".300 Magnum Stripper Clip"
+ desc = "5 round .300 Magnun stripper clips for use with the HP Scout."
+ item = /obj/item/ammo_box/a30
+
+ price_min = 500
+ price_max = 100
+ stock_min = 4
+ stock_max = 6
+ availability_prob = 0
+
From 478f3dd1cb30636678ac2f25868e51c2d6dad6a7 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 01:55:30 -0700
Subject: [PATCH 44/59] I am gods typoest warrior
---
code/modules/cargo/blackmarket/blackmarket_items/weapons.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 2fac1ab1caa8..c8b1b476716c 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -258,7 +258,7 @@
name = "Pistole C"
desc = "Pistole Compact? Pistole Caseless? Pistole Cheese? Fuck if I know. All I know is these little numbers pack a nasty sting. Chambered in 5.56 caseless."
item = /obj/item/gun/ballistic/automatic/pistol/solgov/old
- pair_item =
+ pair_item = /datum/blackmarket_item/weapon/pistole_c_mag
price_min = 900
price_max = 1250
From 664fa9baf88b63bd935908ba3356ef28b735d1a6 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 02:00:46 -0700
Subject: [PATCH 45/59] I FORGOT THE ZERO
---
code/modules/cargo/blackmarket/blackmarket_items/weapons.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index c8b1b476716c..3dcd6427f77d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -331,10 +331,10 @@
/datum/blackmarket_item/weapon/scout_stripper
name = ".300 Magnum Stripper Clip"
desc = "5 round .300 Magnun stripper clips for use with the HP Scout."
- item = /obj/item/ammo_box/a30
+ item = /obj/item/ammo_box/a300
price_min = 500
- price_max = 100
+ price_max = 1000
stock_min = 4
stock_max = 6
availability_prob = 0
From 254b4c924158ee4e7c38a3a9b954656170ead47b Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:23:07 -0700
Subject: [PATCH 46/59] That joke sucked.
---
code/modules/cargo/blackmarket/blackmarket_items/weapons.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 3dcd6427f77d..4776dffdc05b 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -319,7 +319,7 @@
/datum/blackmarket_item/weapon/scout
name = "HP Scout"
- desc = "A scoped rifle chambered in .300 Magnum. As the name would imply, perfect for scouts. Sidenote, scouts are also vulnerable to ambushes."
+ desc = "A scoped rifle chambered in .300 Magnum. As the name would imply, perfect for scouts. Try not to tunnel vision with the scope like the last guy.."
item = /obj/item/gun/ballistic/rifle/scout
pair_item = /datum/blackmarket_item/weapon/scout_stripper
@@ -330,7 +330,7 @@
/datum/blackmarket_item/weapon/scout_stripper
name = ".300 Magnum Stripper Clip"
- desc = "5 round .300 Magnun stripper clips for use with the HP Scout."
+ desc = "A 5 round .300 Magnum stripper clips for use with the HP Scout."
item = /obj/item/ammo_box/a300
price_min = 500
From f98f6dbc17bd72cdc39fb9c7b411629043ed42e9 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:44:17 -0700
Subject: [PATCH 47/59] Salvager DLC
---
.../blackmarket/blackmarket_items/tools.dm | 41 +++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 87adc721d34d..8f5885d29cb9 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -171,3 +171,44 @@
stock_min = 3
stock_max = 6
availability_prob = 60
+
+/datum/blackmarket_item/tool/blastwave
+ name = "Blastwave Jackhammer"
+ desc = "We found a shipment of brand new hypersonic jackhammers in a cargo freighter. So we don't need these old ones anymore."
+ item = /obj/item/pickaxe/drill/jackhammer/old
+
+ price_min = 750
+ price_max = 1750
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/tool/impro_jetpack
+ name = "Improvised Jetpack"
+ desc = "A lovingly handcrafted jetpack built by our salvage techs. For the frugal space explorer."
+ item = /obj/item/tank/jetpack/improvised
+
+ price_min = 500
+ price_max = 1250
+ stock_min = 3
+ stock_max = 6
+ availability_prob = 70
+
+/datum/blackmarket_item/tool/jet_harness
+ name = "Jet Harness"
+ desc = "A compact oxygen filled jet harness for tactical EVA insertions and extractions."
+ item = /obj/item/tank/jetpack/oxygen/harness
+
+ price_min = 1250
+ price_max = 3500
+ stock_max = 3
+ availability_prob = 30
+
+/datum/blackmarket_item/tool/jetpack_upgrade
+ name = "Hardsuit Jetpack Upgrade"
+ desc = "A modular jetpack compatible with most hardsuits. If the screws feel a bit loose, it's because the last suit it was attached to was beyond recovery."
+ item = /obj/item/tank/jetpack/suit
+
+ price_min = 1750
+ price_max = 3000
+ stock = 1
+ availability_prob = 25
From b54fa6fe019887c55e5c969ed592bb9b201f343e Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:58:39 -0700
Subject: [PATCH 48/59] rerun tests
---
code/controllers/subsystem/blackmarket.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index cbd07fcd8fda..f4ac4cbcb486 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -89,3 +89,4 @@ SUBSYSTEM_DEF(blackmarket)
return FALSE
queued_purchases += P
return TRUE
+
From d7846ebff311791436a5912edc82c4a5fc777672 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 12:09:42 -0700
Subject: [PATCH 49/59] Why must you fail me so
---
code/controllers/subsystem/blackmarket.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm
index f4ac4cbcb486..cbd07fcd8fda 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/blackmarket.dm
@@ -89,4 +89,3 @@ SUBSYSTEM_DEF(blackmarket)
return FALSE
queued_purchases += P
return TRUE
-
From ed47ddded9e802a58385af68b788f1acd6731370 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 12:30:06 -0700
Subject: [PATCH 50/59] Im a fucking dumbass, thanks Meem
---
code/modules/cargo/blackmarket/blackmarket_items/weapons.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 4776dffdc05b..aa471a07882c 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -210,7 +210,7 @@
name = "Model H"
desc = "A Model H slug pistol. The H stands for Hurt. Chambered in ferromagnetic slugs."
item = /obj/item/gun/ballistic/automatic/powered/gauss/modelh
- pair_item = /obj/item/ammo_box/magazine/modelh
+ pair_item = /datum/blackmarket_item/weapon/model_h_mag
price_min = 2000
price_max = 4000
From ab2b80f5343cc5e394287b888e6e50b2b219452c Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 12:46:52 -0700
Subject: [PATCH 51/59] I shouldnt code when Im tired
---
code/modules/cargo/blackmarket/blackmarket_items/weapons.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index aa471a07882c..a798d47e577c 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -217,7 +217,7 @@
stock = 2
availability_prob = 35
-/datum/blackmarket_item/consumable/model_h/spawn_item(loc)
+/datum/blackmarket_item/weapon/model_h/spawn_item(loc)
var/model_h = pick(list(/obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns,
/obj/item/gun/ballistic/automatic/powered/gauss/modelh))
return new model_h(loc)
From 53f436245100bbd9e12a19536fa15fff5ac39e51 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 13:02:37 -0700
Subject: [PATCH 52/59] bad new
---
code/modules/cargo/blackmarket/blackmarket_items/tools.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 8f5885d29cb9..9a2b95cfd904 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -164,7 +164,7 @@
/datum/blackmarket_item/tool/suppressor
name = "Suppressor"
desc = "A suppressor, for when you to keep your murder on the down low."
- item = new /obj/item/suppressor
+ item = /obj/item/suppressor
price_min = 100
price_max = 700
From ca08ad9c1b970966ece3bee929b18694093088bd Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 23 Apr 2024 19:03:29 -0700
Subject: [PATCH 53/59] Final passover plus typo fixes
---
.../blackmarket_items/consumables.dm | 6 +++---
.../blackmarket/blackmarket_items/weapons.dm | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 0f667d049b8d..b821a4f88b7f 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -19,8 +19,8 @@
stock_min = 2
stock_max = 3
- price_min = 400
- price_max = 700
+ price_min = 200
+ price_max = 500
availability_prob = 50
/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
@@ -44,7 +44,7 @@
/datum/blackmarket_item/consumable/pumpup
name = "Maintenance Pump-Up"
- desc = "Resist any Baton stun with this handy device!"
+ desc = "Resist any Baton stun with this handy instant tetanus free injector!."
item = /obj/item/reagent_containers/hypospray/medipen/pumpup
stock_max = 3
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index a798d47e577c..60048afcf49b 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -69,7 +69,7 @@
item = /obj/item/gun/ballistic/derringer/gold
price_min = 1000
price_max = 3000
- stock_max = 1
+ stock = 1
availability_prob = 10
/datum/blackmarket_item/weapon/himehabu
@@ -85,7 +85,7 @@
/datum/blackmarket_item/weapon/himehabu_mag
name = "Himehabu Magazines"
- desc = "Compact .22lr magazines for use in the Himehabu pistol."
+ desc = "Compact 10 round .22lr magazines for use in the Himehabu pistol."
item = /obj/item/ammo_box/magazine/m22lr
price_min = 100
@@ -203,7 +203,7 @@
price_min = 1250
price_max = 2000
- stock_max = 2
+ stock_max = 3
availability_prob = 30
/datum/blackmarket_item/weapon/model_h
@@ -244,7 +244,7 @@
availability_prob = 20
/datum/blackmarket_item/weapon/sgg_stripper
- name = "8x58 Stripper Clip"
+ name = "8x58mm Stripper Clip"
desc = "A five round 8x58mm stripper clip for use with the SGG-669C."
item = /obj/item/ammo_box/a858
@@ -288,7 +288,7 @@
/datum/blackmarket_item/weapon/proto_gauss_mag
name = "Prototype Gauss Rifle Magazine"
- desc = "A 30 round ferromagnetic pellet magazine for the prototype gauss rifle."
+ desc = "A 25 round ferromagnetic pellet magazine for the prototype gauss rifle."
item = /obj/item/ammo_box/magazine/gauss
price_min = 750
@@ -302,8 +302,8 @@
item = /obj/item/gun/ballistic/automatic/pistol/tec9
pair_item = /datum/blackmarket_item/weapon/tec_mag
- price_min = 2000
- price_max = 3250
+ price_min = 1500
+ price_max = 2750
stock_max = 2
availability_prob = 35
@@ -319,11 +319,11 @@
/datum/blackmarket_item/weapon/scout
name = "HP Scout"
- desc = "A scoped rifle chambered in .300 Magnum. As the name would imply, perfect for scouts. Try not to tunnel vision with the scope like the last guy.."
+ desc = "A scoped rifle chambered in .300 Magnum. As the name would imply, perfect for scouts. Try not to tunnel vision with the scope like the last guy."
item = /obj/item/gun/ballistic/rifle/scout
pair_item = /datum/blackmarket_item/weapon/scout_stripper
- price_min = 3500
+ price_min = 4000
price_max = 6500
stock = 1
availability_prob = 20
From c09f67def120cf2e9c70b44db3f14e87a1413a63 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:18:29 -0700
Subject: [PATCH 54/59] Suggestion Pack
---
.../objects/items/stacks/sheets/mineral.dm | 6 ++++
.../blackmarket_items/consumables.dm | 28 ++++++++++++++++---
.../blackmarket_items/emergency.dm | 20 ++++++-------
.../blackmarket/blackmarket_items/misc.dm | 25 ++++++++++-------
.../projectiles/guns/ballistic/rifle.dm | 2 ++
5 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 200fc408768f..e3ef63e116d4 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -160,6 +160,9 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
/obj/item/stack/sheet/mineral/uranium/twenty
amount = 20
+/obj/item/stack/sheet/mineral/uranium/ten
+ amount = 10
+
/obj/item/stack/sheet/mineral/uranium/five
amount = 5
@@ -210,6 +213,9 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
/obj/item/stack/sheet/mineral/plasma/twenty
amount = 20
+/obj/item/stack/sheet/mineral/plasma/ten
+ amount = 10
+
/obj/item/stack/sheet/mineral/plasma/five
amount = 5
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index b821a4f88b7f..6bea1cb6c1a3 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -4,7 +4,7 @@
/datum/blackmarket_item/consumable/donk_pocket_box
name = "Box of Donk Pockets"
desc = "A well packaged box containing the favourite snack of every spacefarer."
- item = /obj/item/storage/box/donkpockets
+ item = /obj/effect/spawner/lootdrop/donkpockets
stock_min = 2
stock_max = 5
@@ -42,6 +42,27 @@
price_max = 60
availability_prob = 50
+/datum/blackmarket_item/consumable/trickwine
+ name = "Trickwine"
+ desc = "The SRM keeps the recipes for their trickwines a closely guarded secret. The Hunters carrying those bottles? Less so."
+ item = /datum/reagent/consumable/ethanol/trickwine/ash_wine
+
+ price_min = 200
+ price_max = 600
+ stock_min = 3
+ stock_max = 7
+ availability_prob = 40
+
+/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
+ var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
+ /datum/reagent/consumable/ethanol/trickwine/ice_wine,
+ /datum/reagent/consumable/ethanol/trickwine/shock_wine,
+ /datum/reagent/consumable/ethanol/trickwine/hearth_wine,
+ /datum/reagent/consumable/ethanol/trickwine/force_wine,
+ /datum/reagent/consumable/ethanol/trickwine/prism_wine))
+ return new trickwine(loc)
+
+
/datum/blackmarket_item/consumable/pumpup
name = "Maintenance Pump-Up"
desc = "Resist any Baton stun with this handy instant tetanus free injector!."
@@ -135,11 +156,10 @@
desc = "PGF military surplus rations. What's in them? Who knows. Surprise is the spice of life after all."
item = /obj/effect/spawner/lootdrop/ration
- price_min = 200
+ price_min = 150
price_max = 400
- stock_min = 5
- stock_max = 15
availability_prob = 80
+ unlimited = TRUE
/datum/blackmarket_item/consumable/thirteenloko
name = "Can of Thirteen Loko"
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
index 6406ad3923d2..b609da87945d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/emergency.dm
@@ -2,22 +2,22 @@
category = "Emergency"
/datum/blackmarket_item/emergency/plasma
- name = "Plasma"
+ name = "Ten Plasma Sheets"
desc = "Low on fuel? We can part with some plasma... for a reasonable price."
- item = /obj/item/stack/sheet/mineral/plasma/twenty
+ item = /obj/item/stack/sheet/mineral/plasma/ten
- price_min = 2000
- price_max = 4000
+ price_min = 1750
+ price_max = 2250
availability_prob = 100
unlimited = TRUE
/datum/blackmarket_item/emergency/uranium
- name = "Uranium"
+ name = "Ten Uranium Sheets"
desc = "Fuel? Dirty Bomb? Fancy nightlight? Doesn't matter, we'll supply."
- item = /obj/item/stack/sheet/mineral/uranium/twenty
+ item = /obj/item/stack/sheet/mineral/uranium/ten
- price_min = 2000
- price_max = 4000
+ price_min = 1750
+ price_max = 2250
availability_prob = 100
unlimited = TRUE
@@ -27,7 +27,7 @@
item = /obj/item/circuitboard/machine/shuttle/engine/electric
price_min = 2000
- price_max = 4000
+ price_max = 3000
stock_max = 5
availability_prob = 100
@@ -37,7 +37,7 @@
item = /obj/machinery/portable_atmospherics/canister/oxygen
price_min = 2000
- price_max = 4000
+ price_max = 3000
stock_max = 3
availability_prob = 100
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index df36e39313de..90aed98f1e20 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -21,20 +21,25 @@
stock_max = 8
availability_prob = 60
-/datum/blackmarket_item/misc/holywater
- name = "Flask of holy water"
- desc = "Father Fictus' own brand of ready-made holy water."
- item = /obj/item/reagent_containers/food/drinks/bottle/holywater
+/datum/blackmarket_item/misc/trickwine
+ name = "Trickwine"
+ desc = "The SRM keeps the recipes for their trickwines a closely guarded secret. The Hunters carrying those bottles? Less so."
+ item = /datum/reagent/consumable/ethanol/trickwine/ash_wine
- price_min = 400
+ price_min = 200
price_max = 600
- stock_max = 3
+ stock_min = 3
+ stock_max = 7
availability_prob = 40
-/datum/blackmarket_item/misc/holywater/spawn_item(loc)
- if (prob(6.66))
- return new /obj/item/reagent_containers/glass/beaker/unholywater(loc)
- return ..()
+/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
+ var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
+ /datum/reagent/consumable/ethanol/trickwine/ice_wine,
+ /datum/reagent/consumable/ethanol/trickwine/shock_wine,
+ /datum/reagent/consumable/ethanol/trickwine/hearth_wine,
+ /datum/reagent/consumable/ethanol/trickwine/force_wine,
+ /datum/reagent/consumable/ethanol/trickwine/prism_wine))
+ return new trickwine(loc)
/datum/blackmarket_item/misc/strange_seed
name = "Strange Seeds"
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index a52e2cf2a895..65405c5c935c 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -118,6 +118,8 @@
desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
item_state = "illestren_sawn"
sawn_off = TRUE
+ weight = WEAPON_MEDIUM
+
/obj/item/gun/ballistic/rifle/solgov
name = "SSG-669C"
From da13b2bbc008b5df97f8d3b73a7927056a35d1da Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:22:54 -0700
Subject: [PATCH 55/59] bwuh bwuh bwuh
---
.../blackmarket_items/consumables.dm | 2 +-
.../blackmarket/blackmarket_items/misc.dm | 20 -------------------
.../projectiles/guns/ballistic/rifle.dm | 2 +-
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 6bea1cb6c1a3..77e33d2bf565 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -53,7 +53,7 @@
stock_max = 7
availability_prob = 40
-/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
+/datum/blackmarket_item/consumable/trickwine/spawn_item(loc)
var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
/datum/reagent/consumable/ethanol/trickwine/ice_wine,
/datum/reagent/consumable/ethanol/trickwine/shock_wine,
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index 90aed98f1e20..279daa621c1c 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -21,26 +21,6 @@
stock_max = 8
availability_prob = 60
-/datum/blackmarket_item/misc/trickwine
- name = "Trickwine"
- desc = "The SRM keeps the recipes for their trickwines a closely guarded secret. The Hunters carrying those bottles? Less so."
- item = /datum/reagent/consumable/ethanol/trickwine/ash_wine
-
- price_min = 200
- price_max = 600
- stock_min = 3
- stock_max = 7
- availability_prob = 40
-
-/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
- var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
- /datum/reagent/consumable/ethanol/trickwine/ice_wine,
- /datum/reagent/consumable/ethanol/trickwine/shock_wine,
- /datum/reagent/consumable/ethanol/trickwine/hearth_wine,
- /datum/reagent/consumable/ethanol/trickwine/force_wine,
- /datum/reagent/consumable/ethanol/trickwine/prism_wine))
- return new trickwine(loc)
-
/datum/blackmarket_item/misc/strange_seed
name = "Strange Seeds"
desc = "An Exotic Variety of seed that can contain anything from glow to acid."
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 65405c5c935c..1632e175fd8e 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -118,7 +118,7 @@
desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
item_state = "illestren_sawn"
sawn_off = TRUE
- weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_MEDIUM
/obj/item/gun/ballistic/rifle/solgov
From 5eec2990a877eef59797015fb351af711563ce0b Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:29:56 -0700
Subject: [PATCH 56/59] I used datums instead of flasks. Oops
---
.../blackmarket/blackmarket_items/consumables.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 77e33d2bf565..71cbaa87f0af 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -54,12 +54,12 @@
availability_prob = 40
/datum/blackmarket_item/consumable/trickwine/spawn_item(loc)
- var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
- /datum/reagent/consumable/ethanol/trickwine/ice_wine,
- /datum/reagent/consumable/ethanol/trickwine/shock_wine,
- /datum/reagent/consumable/ethanol/trickwine/hearth_wine,
- /datum/reagent/consumable/ethanol/trickwine/force_wine,
- /datum/reagent/consumable/ethanol/trickwine/prism_wine))
+ var/trickwine = pick(list(/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine))
return new trickwine(loc)
From dd5d0fe0480c8107ce4b588e9f2d5ea77ec4a21d Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:42:16 -0700
Subject: [PATCH 57/59] Revert "I used datums instead of flasks. Oops"
This reverts commit 5eec2990a877eef59797015fb351af711563ce0b.
---
.../blackmarket/blackmarket_items/consumables.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 71cbaa87f0af..77e33d2bf565 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -54,12 +54,12 @@
availability_prob = 40
/datum/blackmarket_item/consumable/trickwine/spawn_item(loc)
- var/trickwine = pick(list(/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine))
+ var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
+ /datum/reagent/consumable/ethanol/trickwine/ice_wine,
+ /datum/reagent/consumable/ethanol/trickwine/shock_wine,
+ /datum/reagent/consumable/ethanol/trickwine/hearth_wine,
+ /datum/reagent/consumable/ethanol/trickwine/force_wine,
+ /datum/reagent/consumable/ethanol/trickwine/prism_wine))
return new trickwine(loc)
From 185e74224f4e060209e12dcc6080e998a53d4b03 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:42:22 -0700
Subject: [PATCH 58/59] Reapply "I used datums instead of flasks. Oops"
This reverts commit dd5d0fe0480c8107ce4b588e9f2d5ea77ec4a21d.
---
.../blackmarket/blackmarket_items/consumables.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 77e33d2bf565..71cbaa87f0af 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -54,12 +54,12 @@
availability_prob = 40
/datum/blackmarket_item/consumable/trickwine/spawn_item(loc)
- var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
- /datum/reagent/consumable/ethanol/trickwine/ice_wine,
- /datum/reagent/consumable/ethanol/trickwine/shock_wine,
- /datum/reagent/consumable/ethanol/trickwine/hearth_wine,
- /datum/reagent/consumable/ethanol/trickwine/force_wine,
- /datum/reagent/consumable/ethanol/trickwine/prism_wine))
+ var/trickwine = pick(list(/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine))
return new trickwine(loc)
From 3c37d76ed9af726d4067c255e8a0ee36de16e7d3 Mon Sep 17 00:00:00 2001
From: Gristlebee <56049844+Gristlebee@users.noreply.github.com>
Date: Tue, 30 Apr 2024 00:12:56 -0700
Subject: [PATCH 59/59] Value adjustment
---
.../blackmarket/blackmarket_items/clothing.dm | 2 +-
.../blackmarket_items/consumables.dm | 12 ++++---
.../blackmarket_items/explosives.dm | 3 +-
.../blackmarket/blackmarket_items/misc.dm | 6 ++--
.../blackmarket/blackmarket_items/tools.dm | 9 ++---
.../blackmarket/blackmarket_items/weapons.dm | 34 +++++++++++--------
6 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index 6b3bc0c9241b..951574fedfe2 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -105,7 +105,7 @@
pair_item = /datum/blackmarket_item/clothing/gezena_helmet
price_min = 750
- price_max = 1500
+ price_max = 1250
stock_max = 3
availability_prob = 20
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 71cbaa87f0af..6e6551b58e86 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -178,7 +178,8 @@
item = /obj/item/stack/medical/suture
price_min = 200
- price_max = 500
+ price_max = 450
+ stock_min = 2
stock_max = 5
availability_prob = 40
@@ -188,7 +189,8 @@
item = /obj/item/stack/medical/mesh
price_min = 200
- price_max = 500
+ price_max = 450
+ stock_min = 2
stock_max = 5
availability_prob = 40
@@ -198,7 +200,8 @@
item = /obj/item/stack/medical/bruise_pack
price_min = 300
- price_max = 600
+ price_max = 500
+ stock_min = 2
stock_max = 5
availability_prob = 30
@@ -208,6 +211,7 @@
item = /obj/item/stack/medical/ointment
price_min = 300
- price_max = 600
+ price_max = 500
+ stock_min = 2
stock_max = 5
availability_prob = 30
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
index c9c68ab70414..7fe78cdcd055 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/explosives.dm
@@ -18,6 +18,7 @@
price_min = 100
price_max = 500
+ stock_min = 2
stock_max = 5
availability_prob = 25
@@ -51,7 +52,7 @@
price_min = 400
price_max = 700
stock_min = 2
- stock_max = 3
+ stock_max = 4
availability_prob = 25
/datum/blackmarket_item/explosive/slipocalypse
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index 279daa621c1c..eb3de3c4040d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -47,7 +47,7 @@
item = /obj/structure/closet/crate/freezer/surplus_limbs/organs
price_min = 1000
- price_max = 3000
+ price_max = 2500
stock_max = 3
availability_prob = 30
@@ -57,7 +57,7 @@
item = /obj/structure/closet/crate/secure/loot
price_min = 250
- price_max = 500
+ price_max = 400
availability_prob = 100
unlimited = TRUE
@@ -86,7 +86,7 @@
desc = "Good people died to get these. Luckily, we aren't good people."
item = /obj/item/documents
- price_min = 2000
+ price_min = 1000
price_max = 10000
stock = 1
availability_prob = 40
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 9a2b95cfd904..0c86f608e51c 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -59,7 +59,7 @@
price_min = 500
price_max = 2000
stock = 1
- availability_prob = 20
+ availability_prob = 30
/datum/blackmarket_item/tool/binoculars
name = "Binoculars"
@@ -68,8 +68,9 @@
price_min = 50
price_max = 300
- stock_max = 3
- availability_prob = 40
+ stock_min = 2
+ stock_max = 4
+ availability_prob = 70
/datum/blackmarket_item/tool/riot_shield
name = "Riot Shield"
@@ -188,7 +189,7 @@
item = /obj/item/tank/jetpack/improvised
price_min = 500
- price_max = 1250
+ price_max = 1000
stock_min = 3
stock_max = 6
availability_prob = 70
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 60048afcf49b..8832729e58af 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -6,9 +6,10 @@
desc = "Get the janitor back at his own game with this affordable prank kit."
item = /obj/item/restraints/legcuffs/beartrap
- price_min = 300
- price_max = 550
- stock_max = 3
+ price_min = 150
+ price_max = 400
+ stock_min = 3
+ stock_max = 7
availability_prob = 40
/datum/blackmarket_item/weapon/shotgun_dart
@@ -52,7 +53,7 @@
price_min = 1500
price_max = 3500
stock = 1
- availability_prob = 20
+ availability_prob = 25
/datum/blackmarket_item/weapon/derringer
name = "Derringer"
@@ -81,7 +82,7 @@
price_min = 100
price_max = 600
stock_max = 6
- availability_prob = 40
+ availability_prob = 50
/datum/blackmarket_item/weapon/himehabu_mag
name = "Himehabu Magazines"
@@ -90,6 +91,7 @@
price_min = 100
price_max = 200
+ stock_min = 3
stock_max = 6
availability_prob = 0
@@ -131,7 +133,8 @@
price_min = 750
price_max = 1250
- stock_max = 3
+ stock_min = 2
+ stock_max = 4
availability_prob = 0
/datum/blackmarket_item/weapon/e50
@@ -162,7 +165,7 @@
price_min = 500
price_max = 1000
- stock_max = 2
+ stock = 2
availability_prob = 0
/datum/blackmarket_item/weapon/bg_16
@@ -201,7 +204,7 @@
desc = "Ripley with a laser cannon? Odysseus with a missile rack? Sky's the limit with this omni-compatible weapons bay! (Missiles and lasers not included)"
item = /obj/item/mecha_parts/concealed_weapon_bay
- price_min = 1250
+ price_min = 1000
price_max = 2000
stock_max = 3
availability_prob = 30
@@ -213,7 +216,7 @@
pair_item = /datum/blackmarket_item/weapon/model_h_mag
price_min = 2000
- price_max = 4000
+ price_max = 3500
stock = 2
availability_prob = 35
@@ -281,19 +284,20 @@
item = /obj/item/gun/ballistic/automatic/powered/gauss
pair_item = /datum/blackmarket_item/weapon/proto_gauss_mag
- price_min = 4000
+ price_min = 3500
price_max = 6000
- stock = 1
- availability_prob = 20
+ stock = 2
+ availability_prob = 25
/datum/blackmarket_item/weapon/proto_gauss_mag
name = "Prototype Gauss Rifle Magazine"
desc = "A 25 round ferromagnetic pellet magazine for the prototype gauss rifle."
item = /obj/item/ammo_box/magazine/gauss
- price_min = 750
- price_max = 1250
- stock_max = 2
+ price_min = 600
+ price_max = 1100
+ stock_min = 2
+ stock_max = 4
availability_prob = 0
/datum/blackmarket_item/weapon/tec