Skip to content

Commit

Permalink
Adds a few clip weapons to black market (#3662)
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
adds cm5, cm70, and cm23 to black market
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
apogee said i could
<!-- 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. -->

## Changelog

:cl:
add:the CM-5, CM-23, and CM-70 will now appear in the black market from
time to time
/: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. -->

---------

Co-authored-by: Bjarl <[email protected]>
  • Loading branch information
Erikafox and Erikafox authored Nov 3, 2024
1 parent 78e8551 commit 28e1440
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 9 deletions.
33 changes: 33 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,39 @@
stock = 6
availability_prob = 0

/datum/blackmarket_item/ammo/cm23_mag
name = "CM-23 Magazines"
desc = "10 round 10mm magazines for use in the CM-23 pistol."
item = /obj/item/ammo_box/magazine/cm23

price_min = 150
price_max = 300
stock_min = 6
stock_max = 10
availability_prob = 0

/datum/blackmarket_item/ammo/cm70_mag
name = "CM-70 Magazines"
desc = "18 round 9mm magazines for use in the CM-70 pistol."
item = /obj/item/ammo_box/magazine/m9mm_cm70

price_min = 200
price_max = 300
stock_min = 4
stock_max = 8
availability_prob = 0

/datum/blackmarket_item/ammo/cm5_mag
name = "CM-5 Magazines"
desc = "30 round 9mm magazines for use in the CM-5 SMG."
item = /obj/item/ammo_box/magazine/cm5_9mm

price_min = 300
price_max = 600
stock_min = 2
stock_max = 6
availability_prob = 0

/datum/blackmarket_item/ammo/saber_mag
name = "Saber 9mm SMG Magazines"
desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords."
Expand Down
52 changes: 43 additions & 9 deletions code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
stock_max = 3
availability_prob = 50

/datum/blackmarket_item/weapon/fireaxe
name = "Fire Axe"
desc = "An incredibly sharp axe of reputable make, used by various engineers to settle arguments while hammered. Sold to us by a very friendly man in a suit."
item = /obj/item/melee/axe/fire

price_min = 1200
price_max = 2300
stock_max = 3
availability_prob = 40

/datum/blackmarket_item/weapon/powerfist
name = "Powerfist"
desc = "Need a bit more... omph in your right hook? This gas operated powerfist will put you in the heavyweight."
Expand Down Expand Up @@ -159,6 +169,39 @@
stock_max = 3
availability_prob = 40

/datum/blackmarket_item/weapon/cm23
name = "CM-23 pistol"
desc = "The service pistol of the Confederated League. Chambered in 10mm and fresh off a crashed clipper. We made sure to scratch the ID off this time."

item = /obj/item/gun/ballistic/automatic/pistol/cm23
pair_item = list(/datum/blackmarket_item/ammo/cm23_mag)
price_min = 500
price_max = 1500
stock_max = 4
availability_prob = 50

/datum/blackmarket_item/weapon/cm70
name = "CM-70 Machine Pistol"
desc = "One slick piece from the Confederated League. Chambered in 9mm. That officer wasn't happy to lose this but you should be safe."

item = /obj/item/gun/ballistic/automatic/pistol/cm70
pair_item = list(/datum/blackmarket_item/ammo/cm70_mag)
price_min = 900
price_max = 2100
stock_max = 2
availability_prob = 50

/datum/blackmarket_item/weapon/cm5
name = "CM-5 SMG"
desc = "Now isn't this a good find. A whole League sub-machinegun, chambered in 9mm. We're pretty sure no one is gonna notice the pallet of these missing."

item = /obj/item/gun/ballistic/automatic/smg/cm5
pair_item = list(/datum/blackmarket_item/ammo/cm5_mag)
price_min = 1750
price_max = 3500
stock_max = 2
availability_prob = 30

/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 and into distribution. But we happen know a guy."
Expand Down Expand Up @@ -351,15 +394,6 @@
stock_max = 2
availability_prob = 20

/datum/blackmarket_item/weapon/fireaxe
name = "Fire Axe"
desc = "An incredibly sharp axe of reputable make, used by various engineers to settle arguments while hammered. Sold to us by a very friendly man in a suit."
item = /obj/item/melee/axe/fire

price_min = 1200
price_max = 2300
stock_max = 3
availability_prob = 40

/datum/blackmarket_item/weapon/oneshot
name = "Hammer Launcher"
Expand Down

0 comments on commit 28e1440

Please sign in to comment.