From d92be5b3025d8494af1761f0a535fc96dc3fcf66 Mon Sep 17 00:00:00 2001 From: Gristlebee <56049844+Gristlebee@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:04:27 -0700 Subject: [PATCH 1/4] frontie weapons --- .../blackmarket/blackmarket_items/ammo.dm | 31 +++++++++++++++++ .../blackmarket/blackmarket_items/weapons.dm | 33 +++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm index aaa24731c1ea..33813ed38da4 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm @@ -230,3 +230,34 @@ stock_max = 5 availability_prob = 0 +/datum/blackmarket_item/ammo/mauler_mag + name = "Mauler Magazine" + desc = "A 12 round 9mm magazine for the Mauler Machine Pistol." + item = /obj/item/ammo_box/magazine/m9mm_mauler + price_min = 250 + price_max = 750 + stock_min = 3 + stock_max = 5 + availability_prob = 0 + +/datum/blackmarket_item/ammo/spitter_mag + name = "Spitter Magazine" + desc = "A 30 round 9mm magazine for the Spitter Machine Pistol." + item = /obj/item/ammo_box/magazine/spitter_9mm + + price_min = 250 + price_max = 750 + stock_min = 2 + stock_max = 5 + availability_prob = 0 + +/datum/blackmarket_item/ammo/pounder_mag + name = "Pounder Pan Magazine" + desc = "A 50 round pan magazine for the Pounder submachine gun. Heavy enough to double as an emergency melee weapon to beat off your enemies in a pinch." + item = /obj/item/ammo_box/magazine/c22lr_pounder_pan + + price_min = 400 + price_max = 750 + stock = 2 + availability_prob = 0 + diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index 3bfda20e8654..dd9abc0c37f5 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -304,6 +304,39 @@ stock = 2 availability_prob = 30 +/datum/blackmarket_item/weapon/mauler + name = "Mauler Machine Pistol" + desc = "This gun's got teeth! A Shoal classic, the Mauler 9mm machine pistol is suited to close quarter combat with an insane fire rate beating out even dedicated assault rifles." + item = /obj/item/gun/ballistic/automatic/pistol/mauler + pair_item = list(/datum/blackmarket_item/ammo/mauler_mag) + + price_min = 1000 + price_max = 2000 + stock = 2 + availability_prob = 50 + +/datum/blackmarket_item/weapon/spitter + name = "Spitter Machine Pistol" + desc = "The aptly named Spitter won't be hitting anything outside of spitting distance. Anything in that range on the otherhand? Let's just say the bereaved will be wanting a closed casket funeral. Chambered in 9mm." + item = /obj/item/gun/ballistic/automatic/pistol/spitter + pair_item = list(/datum/blackmarket_item/ammo/spitter_mag) + + price_min = 1500 + price_max = 2250 + stock = 2 + availability_prob = 30 + +/datum/blackmarket_item/weapon/pounder + name = "Pounder Submachine Gun" + desc = "Give your enemies the pounding of their life with this 50 round .22lr Submachine Gun! This baby can blast it's whole load in mere moments!" + item = /obj/item/gun/ballistic/automatic/smg/pounder + pair_item = list(/datum/blackmarket_item/ammo/pounder_mag) + + price_min = 1500 + price_max = 2000 + stock = 2 + availability_prob = 35 + /datum/blackmarket_item/weapon/polymer name = "Polymer Survivor Rifle" desc = "A slapdash rifle held together by spite, dreams and a good helping of duct tape. Chambered in 7.62x40mm CLIP." From f10ca82a9cd7a86cef11c4e6cd20f7e9f3408bf1 Mon Sep 17 00:00:00 2001 From: Gristlebee <56049844+Gristlebee@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:05:40 -0700 Subject: [PATCH 2/4] Update weapons.dm --- 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 dd9abc0c37f5..1185979168fb 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -330,7 +330,7 @@ name = "Pounder Submachine Gun" desc = "Give your enemies the pounding of their life with this 50 round .22lr Submachine Gun! This baby can blast it's whole load in mere moments!" item = /obj/item/gun/ballistic/automatic/smg/pounder - pair_item = list(/datum/blackmarket_item/ammo/pounder_mag) + pair_item = list(/datum/blackmarket_item/ammo/pounder_mag,/datum/blackmarket_item/ammo/himehabu_box) price_min = 1500 price_max = 2000 From d79cdb2d9652ec7d1d9e6e9044b5bd64999316fc Mon Sep 17 00:00:00 2001 From: Gristlebee <56049844+Gristlebee@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:25:14 -0700 Subject: [PATCH 3/4] desc --- .../cargo/blackmarket/blackmarket_items/weapons.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index 1185979168fb..ee3765fa582c 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -312,7 +312,7 @@ price_min = 1000 price_max = 2000 - stock = 2 + stock_max = 3 availability_prob = 50 /datum/blackmarket_item/weapon/spitter @@ -323,18 +323,19 @@ price_min = 1500 price_max = 2250 - stock = 2 + stock_min = 1 + stock_max = 2 availability_prob = 30 /datum/blackmarket_item/weapon/pounder name = "Pounder Submachine Gun" - desc = "Give your enemies the pounding of their life with this 50 round .22lr Submachine Gun! This baby can blast it's whole load in mere moments!" + desc = "There's a certain quality to quantity. With a massive 50 round capacity, this .22lr submachine is capable of laying down an jawdropping amount of fire." item = /obj/item/gun/ballistic/automatic/smg/pounder pair_item = list(/datum/blackmarket_item/ammo/pounder_mag,/datum/blackmarket_item/ammo/himehabu_box) price_min = 1500 price_max = 2000 - stock = 2 + stock = 1 availability_prob = 35 /datum/blackmarket_item/weapon/polymer From b23b6b2309e17f5223ea5b4ba72ecd12cbdc0a28 Mon Sep 17 00:00:00 2001 From: Gristlebee <56049844+Gristlebee@users.noreply.github.com> Date: Thu, 5 Sep 2024 23:25:52 -0700 Subject: [PATCH 4/4] I gaslighted myself. It's over. Fixes descs. --- code/modules/cargo/blackmarket/blackmarket_items/ammo.dm | 2 +- code/modules/cargo/blackmarket/blackmarket_items/weapons.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm index 33813ed38da4..c794eb040389 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm @@ -242,7 +242,7 @@ /datum/blackmarket_item/ammo/spitter_mag name = "Spitter Magazine" - desc = "A 30 round 9mm magazine for the Spitter Machine Pistol." + desc = "A 30 round 9mm magazine for the Spitter submachine gun." item = /obj/item/ammo_box/magazine/spitter_9mm price_min = 250 diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index ee3765fa582c..d0db4253d77e 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -306,7 +306,7 @@ /datum/blackmarket_item/weapon/mauler name = "Mauler Machine Pistol" - desc = "This gun's got teeth! A Shoal classic, the Mauler 9mm machine pistol is suited to close quarter combat with an insane fire rate beating out even dedicated assault rifles." + desc = "This gun's got teeth! Twelve 9mm teeth to be exact. Hardly a full smile, and you'll be losing the rest pretty quick with this thing's rate of fire." item = /obj/item/gun/ballistic/automatic/pistol/mauler pair_item = list(/datum/blackmarket_item/ammo/mauler_mag) @@ -316,7 +316,7 @@ availability_prob = 50 /datum/blackmarket_item/weapon/spitter - name = "Spitter Machine Pistol" + name = "Spitter Submachine Gun" desc = "The aptly named Spitter won't be hitting anything outside of spitting distance. Anything in that range on the otherhand? Let's just say the bereaved will be wanting a closed casket funeral. Chambered in 9mm." item = /obj/item/gun/ballistic/automatic/pistol/spitter pair_item = list(/datum/blackmarket_item/ammo/spitter_mag)