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

Jump to bottom

Changes to M44 Special Ammo #4683

Closed
wants to merge 1 commit into from
Closed

Changes to M44 Special Ammo #4683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions code/datums/supply_packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
contains = list(
/obj/item/ammo_box/magazine/m44/marksman,
)
cost = 30
cost = 24
containertype = /obj/structure/closet/crate/ammo
containername = "\improper M44 Marksman speed loaders crate"
group = "Ammo"
Expand All @@ -171,7 +171,7 @@
contains = list(
/obj/item/ammo_box/magazine/m44/heavy,
)
cost = 40
cost = 28
containertype = /obj/structure/closet/crate/ammo
containername = "\improper M44 Heavy speed loaders crate"
group = "Ammo"
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@
list("SPECIAL AMMUNITION", -1, null, null),
list("M56 Battery", 4, /obj/item/smartgun_battery, VENDOR_ITEM_REGULAR),
list("M56 Smartgun Drum", 4, /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR),
list("M44 Heavy Speed Loader (.44)", round(scale * 10.5), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR),
list("M44 Marksman Speed Loader (.44)", round(scale * 5.7), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR),
list("M44 Heavy Speed Loader (.44)", round(scale * 8), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR),
list("M44 Marksman Speed Loader (.44)", round(scale * 10.5), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR),
list("M4A3 HP Magazine (9mm)", round(scale * 2), /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR),
list("M41AE2 Holo Target Rounds (10x24mm)", round(scale * 2), /obj/item/ammo_magazine/rifle/lmg/holo_target, VENDOR_ITEM_REGULAR),

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@

list("SPECIAL AMMUNITION", -1, null, null),
list("M56 Smartgun Drum", 1, /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR),
list("M44 Heavy Speed Loader (.44)", round(scale * 2), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR),
list("M44 Marksman Speed Loader (.44)", round(scale * 2), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR),
list("M44 Heavy Speed Loader (.44)", round(scale * 1.6), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR),
list("M44 Marksman Speed Loader (.44)", round(scale * 2.5), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR),

list("RESTRICTED FIREARM AMMUNITION", -1, null, null),
list("VP78 Magazine", round(scale * 5), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR),
Expand Down
Loading