Skip to content

Commit

Permalink
Black market ammo shop category + new ammo boxes (#6324)
Browse files Browse the repository at this point in the history
# About the pull request

Adds dedicated ammo category to black market, it has all the ammo types
of guns that are available on black market already.

I mostly took prices of corresponding weapon kits, doubled amount of
ammo, doubled the price, which is fair imo, since you do not get the
gun, but pay that price for practicality of packaging.
In cases of ammo boxes, just used the same logic and multipled price by
amount of ammo in ammo box.

Deagle High Impact Armor-Piercing ammo box is empty, honk.

Added a lot of new ammo boxes for all the ammo that is in the black
market, also added some additional ones (mar30 ex, mar50, they are
unavailable in req, I just added boxes), also added craft recipe to all
of them.

# Explain why it's good for the game

Balance wise, i didn't add anything new, i didn't add nsg ap/ex or type
19 ex or so on, i didn't make it cheaper to shoot those guns, you can
already just order weapon kits and gather ammo from there, and it costs
even a bit cheaper, but it's just less convenient and more frustrating
to buy 10 same kits when you just want the ammo, also buying a lot of
kits creates a lot of contraband guns in general, which isn't good.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![aFLhIk7Vfv](https://github.com/cmss13-devs/cmss13/assets/100090741/d3e17fca-118a-4971-82c6-930a76275d83)


![dreamseeker_c6Xo5oHFvn](https://github.com/cmss13-devs/cmss13/assets/100090741/0a496449-04a3-4ed3-a9ff-c8c2c1396b9d)


![dreamseeker_hccBNDu8rA](https://github.com/cmss13-devs/cmss13/assets/100090741/ee77834a-4dfd-4035-8c71-12af63896504)


</details>


# Changelog
:cl:
add: contraband ammo selection in black market
add: tons of new ammo boxes
/:cl:
  • Loading branch information
Blundir authored Jun 6, 2024
1 parent 2bd28fb commit fba613a
Show file tree
Hide file tree
Showing 7 changed files with 520 additions and 60 deletions.
137 changes: 137 additions & 0 deletions code/datums/supply_packs/black_market.dm
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,143 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted
contains = list(/obj/item/storage/box/guncase/m1911/socom)
containertype = /obj/structure/largecrate/black_market

/* --- AMMO --- */

/datum/supply_packs/contraband/ammo
group = "Contraband Ammo"

/datum/supply_packs/contraband/ammo/r4t
name = "45-70 bullet box crate (x300 rounds)"
dollar_cost = 135
contains = list(/obj/item/ammo_box/magazine/lever_action)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/r4t/training
name = "45-70 bullet box crate (x300 training rounds)"
dollar_cost = 35
contains = list(/obj/item/ammo_box/magazine/lever_action/training)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/m16
name = "Magazine box (M16, 12x regular mags)"
dollar_cost = 100
contains = list(/obj/item/ammo_box/magazine/M16)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/ar10
name = "Magazine box (AR10, 12x regular mags)"
dollar_cost = 115
contains = list(/obj/item/ammo_box/magazine/ar10)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/deagle
name = "Magazine box (Desert Eagle, 16x regular mags)"
dollar_cost = 180
contains = list(/obj/item/ammo_box/magazine/deagle)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/deagle/hiap
name = "Magazine box (Desert Eagle, 16x HIAP mags)"
dollar_cost = 260
contains = list(/obj/item/ammo_box/magazine/deagle/super/highimpact/ap/empty)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/type73
name = "Magazine box (Type 73, 16x regular mags)"
dollar_cost = 60
contains = list(/obj/item/ammo_box/magazine/type73)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/nsg
name = "Magazine box (NSG-23, 16x regular mags)"
dollar_cost = 140
contains = list(/obj/item/ammo_box/magazine/nsg23)
containertype = /obj/structure/largecrate/black_market
/datum/supply_packs/contraband/ammo/mar30
name = "Magazines box (MAR30, 10x regular mags)"
dollar_cost = 60
contains = list(/obj/item/ammo_box/magazine/mar30)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/fp9000
name = "Magazines box (FN FP9000, 10x mags)"
dollar_cost = 35
contains = list(/obj/item/ammo_box/magazine/fp9000)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/mp27
name = "Magazines box (MP-27, 12x mags)"
dollar_cost = 45
contains = list(/obj/item/ammo_box/magazine/mp27)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/uzi
name = "Magazines box (UZI, 12x mags)"
dollar_cost = 25
contains = list(/obj/item/ammo_box/magazine/uzi)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/mac15
name = "Magazines box (MAC-15, 12x mags)"
dollar_cost = 15
contains = list(/obj/item/ammo_box/magazine/mac15)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/pps43
name = "Magazines box (Type-19, 10x regular mags)"
dollar_cost = 40
contains = list(/obj/item/ammo_box/magazine/type19)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/b92fs
name = "Magazines box (Beretta 92FS, 16x mags)"
dollar_cost = 30
contains = list(/obj/item/ammo_box/magazine/b92fs)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/kt42
name = "Magazines box (KT-42, 16x mags)"
dollar_cost = 45
contains = list(/obj/item/ammo_box/magazine/kt42)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/bizon
name = "Magazines box (Type 64, 10x mags)"
dollar_cost = 40
contains = list(/obj/item/ammo_box/magazine/type64)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/m1911
name = "Magazines box (M1911, 16x mags)"
dollar_cost = 40
contains = list(/obj/item/ammo_box/magazine/m1911)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/mk45
name = "Magazines box (MK-45 Automagnum, 16x mags)"
dollar_cost = 80
contains = list(/obj/item/ammo_box/magazine/mk45)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/cmb
name = "Speed loaders box (CMB Spearhead, 16x HP loaders)"
dollar_cost = 70
contains = list(/obj/item/ammo_box/magazine/spearhead)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/smw
name = "Speed loaders box (Smith and Wesson revolver, 12x loaders)"
dollar_cost = 30
contains = list(/obj/item/ammo_box/magazine/snw)
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/ammo/zhnk
name = "Speed loaders box (ZHNK-72, 12x loaders)"
dollar_cost = 30
contains = list(/obj/item/ammo_box/magazine/zhnk)
containertype = /obj/structure/largecrate/black_market


/* --- DEEP STORAGE --- */

/*
Expand Down
28 changes: 28 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,34 @@ GLOBAL_LIST_INIT_TYPED(cardboard_recipes, /datum/stack_recipe, list ( \
null, \
new/datum/stack_recipe("empty magazine box (MP5)", /obj/item/ammo_box/magazine/mp5/empty), \
null, \
new/datum/stack_recipe("empty magazine box (MAR30)", /obj/item/ammo_box/magazine/mar30/empty), \
new/datum/stack_recipe("empty magazine box (MAR30 EX)", /obj/item/ammo_box/magazine/mar30/ext/empty), \
new/datum/stack_recipe("empty magazine box (MAR50)", /obj/item/ammo_box/magazine/mar50/empty), \
null, \
new/datum/stack_recipe("empty magazine box (UZI)", /obj/item/ammo_box/magazine/uzi/empty), \
null, \
new/datum/stack_recipe("empty magazine box (MAC-15)", /obj/item/ammo_box/magazine/mac15/empty), \
null, \
new/datum/stack_recipe("empty magazine box (MP27)", /obj/item/ammo_box/magazine/mp27/empty), \
null, \
new/datum/stack_recipe("empty magazine box (M1911)", /obj/item/ammo_box/magazine/m1911/empty), \
null, \
new/datum/stack_recipe("empty magazine box (MK-45)", /obj/item/ammo_box/magazine/mk45/empty), \
null, \
new/datum/stack_recipe("empty magazine box (KT-42)", /obj/item/ammo_box/magazine/kt42/empty), \
null, \
new/datum/stack_recipe("empty magazine box (Beretta 92FS)", /obj/item/ammo_box/magazine/b92fs/empty), \
null, \
new/datum/stack_recipe("empty magazine box (FN FP9000)", /obj/item/ammo_box/magazine/fp9000/empty), \
null, \
new/datum/stack_recipe("empty magazine box (Type19)", /obj/item/ammo_box/magazine/type19/empty), \
null, \
new/datum/stack_recipe("empty magazine box (ZhNK-72)", /obj/item/ammo_box/magazine/zhnk/empty), \
null, \
new/datum/stack_recipe("empty magazine box (Type64 Bizon)", /obj/item/ammo_box/magazine/type64/empty), \
null, \
new/datum/stack_recipe("empty magazine box (S&W .38)", /obj/item/ammo_box/magazine/snw/empty), \
null, \
new/datum/stack_recipe("empty magazine box (NSG 23)", /obj/item/ammo_box/magazine/nsg23/empty), \
new/datum/stack_recipe("empty magazine box (NSG 23 AP)", /obj/item/ammo_box/magazine/nsg23/ap/empty), \
new/datum/stack_recipe("empty magazine box (NSG 23 EX)", /obj/item/ammo_box/magazine/nsg23/ex/empty), \
Expand Down
1 change: 1 addition & 0 deletions code/game/supplyshuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
"Seized Items",
"Shipside Contraband",
"Surplus Equipment",
"Contraband Ammo",
"Deep Storage",
"Miscellaneous"
)
Expand Down
Loading

0 comments on commit fba613a

Please sign in to comment.