Skip to content

Commit

Permalink
Adds some of the new Frontiersmen weapons to the Black Market (#3332)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Adds the Mauler, Spitter and Pounder and their respective magazines to
the Black Market

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

They're illicit, pirate weapons, and the Spitter itself was made in mind
for black market usage in it's descriptions, so they're fitting
additions to the black market, and gives these interesting weapons a
place to be bought and seen.

## Changelog

:cl:
add: Adds the Mauler, Spitter, and Pounder to the black market
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Gristlebee authored Sep 8, 2024
1 parent 7865f8a commit d0eadcb
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 0 deletions.
31 changes: 31 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 submachine gun."
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

34 changes: 34 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,40 @@
stock = 2
availability_prob = 30

/datum/blackmarket_item/weapon/mauler
name = "Mauler Machine Pistol"
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)

price_min = 1000
price_max = 2000
stock_max = 3
availability_prob = 50

/datum/blackmarket_item/weapon/spitter
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)

price_min = 1500
price_max = 2250
stock_min = 1
stock_max = 2
availability_prob = 30

/datum/blackmarket_item/weapon/pounder
name = "Pounder Submachine Gun"
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 = 1
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."
Expand Down

0 comments on commit d0eadcb

Please sign in to comment.