Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds some of the new Frontiersmen weapons to the Black Market #3332

Merged
merged 4 commits into from
Sep 8, 2024
Merged

Adds some of the new Frontiersmen weapons to the Black Market #3332

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d92be5b
frontie weapons
Gristlebee Sep 6, 2024
f10ca82
Update weapons.dm
Gristlebee Sep 6, 2024
d79cdb2
desc
Gristlebee Sep 6, 2024
b23b6b2
I gaslighted myself. It's over. Fixes descs.
Gristlebee Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
View file
Open in desktop
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 Machine Pistol."
Gristlebee marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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! 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."
Gristlebee marked this conversation as resolved.
Show resolved Hide resolved
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 Machine Pistol"
Gristlebee marked this conversation as resolved.
Show resolved Hide resolved
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
Loading