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 now comes in 24-round boxes #3986

Merged
merged 4 commits into from
Jan 19, 2025
Merged

.45-70 now comes in 24-round boxes #3986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8191e9f
initial commit
firebudgy Jan 11, 2025
8ed69dd
undo
firebudgy Jan 11, 2025
893ccff
nevermind
firebudgy Jan 11, 2025
816033b
Merge branch 'master' into 45-70-cost-adjustment
firebudgy Jan 16, 2025
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
8 changes: 4 additions & 4 deletions code/modules/cargo/packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,15 @@

/datum/supply_pack/ammo/a4570_box
name = ".45-70 Ammo Box Crate"
desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition."
desc = "Contains a 24-round box containing devastatingly powerful .45-70 caliber ammunition."
contains = list(/obj/item/storage/box/ammo/a4570)
cost = 400
cost = 300

/datum/supply_pack/ammo/a4570_box/match
name = ".45-70 Match Crate"
desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets."
desc = "Contains a 24-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets."
contains = list(/obj/item/storage/box/ammo/a4570_match)
cost = 800
firebudgy marked this conversation as resolved.
Show resolved Hide resolved
cost = 400

/* 7.62 */

Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@

/obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570
ammo_type = /obj/item/ammo_casing/a4570
max_ammo = 5
max_ammo = 6

/obj/item/storage/box/ammo/a4570
name = "box of .45-70 ammo"
Expand Down
Loading