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

.45-70 boxes hold 18 instead of 12, .45-70 specialty ammo black market #3333

Merged
merged 5 commits into from
Sep 20, 2024
Merged

.45-70 boxes hold 18 instead of 12, .45-70 specialty ammo black market #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a42a85
yea
generalthrax Sep 6, 2024
97ecd4a
a
generalthrax Sep 6, 2024
d12e4cb
ehehehe
generalthrax Sep 6, 2024
1672584
Merge branch 'master' into 4570two
generalthrax Sep 17, 2024
075f3f6
im crazy now
generalthrax Sep 17, 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
21 changes: 21 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 @@ -250,3 +250,24 @@
stock = 2
availability_prob = 0

/datum/blackmarket_item/ammo/a4570hp
name = ".45-70 Hollow Point Ammo Box"
desc = "Put the hollow in hollow point by blowing a crater in some random sod with this devastating .45-70 cartridge."
item = /obj/item/ammo_box/a4570/hp

price_min = 600
price_max = 1000
stock_min = 3
stock_max = 5
availability_prob = 20

/datum/blackmarket_item/ammo/a4570explo
name = "Single .45-70 Explosive Round"
desc = "If you need to fuck someone, hard, we got just the thing. Only one round, though, hope you got good aim."
item = /obj/item/ammo_casing/a4570/explosive

price_min = 400
price_max = 800 //still an exorbitantly high price for one round that you might not even hit
stock_min = 2
stock_max = 10
availability_prob = 10
8 changes: 4 additions & 4 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,24 @@
desc = "A box of top grade .45-70 ammo. These rounds do significant damage with average performance against armor."
icon_state = "4570"
ammo_type = /obj/item/ammo_casing/a4570
max_ammo = 12
max_ammo = 18

/obj/item/ammo_box/a4570/match
name = "ammo box (.45-70 match)"
desc = "A 12-round ammo box for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
desc = "A 18-round ammo box for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
icon_state = "4570-match"
ammo_type = /obj/item/ammo_casing/a4570/match


/obj/item/ammo_box/a4570/hp
name = "ammo box (.45-70 hollow point)"
desc = "A 12-round ammo box for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
desc = "A 18-round ammo box for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
icon_state = "4570-hp"
ammo_type = /obj/item/ammo_casing/a4570/hp

/obj/item/ammo_box/a4570/explosive
name = "ammo box (.45-70 explosive)"
desc = "A 12-round ammo box for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
desc = "A 18-round ammo box for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
icon_state = "4570-explosive"
ammo_type = /obj/item/ammo_casing/a4570/explosive

Expand Down
Loading