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.

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

Morebox2 #318

Merged
merged 17 commits into from
Sep 14, 2024
3 changes: 3 additions & 0 deletions code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@
/obj/item/ammo_magazine/packet/p9mm = -1,
/obj/item/ammo_magazine/packet/p9mm/ap = -1,
/obj/item/ammo_magazine/packet/acp = -1,
/obj/item/ammo_magazine/packet/acp_ap = -1,
/obj/item/ammo_magazine/packet/acp_hp = -1,
/obj/item/ammo_magazine/packet/rifle762X39 = -1,
/obj/item/ammo_magazine/packet/pthreeightyacp = -1,
/obj/item/ammo_magazine/packet/magnum = -1,
Expand All @@ -184,6 +186,7 @@
/obj/item/ammo_magazine/packet/p10x27mm = -1,
/obj/item/ammo_magazine/packet/p492x34mm = -1,
/obj/item/ammo_magazine/packet/p86x70mm = -1,
/obj/item/ammo_magazine/packet/svd762x54mmR = -1,
/obj/item/ammo_magazine/packet/standardautoshotgun = -1,
/obj/item/ammo_magazine/packet/standardautoshotgun/flechette = -1,
/obj/item/ammo_magazine/packet/p4570 = -1,
Expand Down
33 changes: 30 additions & 3 deletions code/modules/projectiles/magazines/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,28 @@
name = "box of .45 ACP"
icon_state = "box_.45acp"
default_ammo = /datum/ammo/bullet/pistol/heavy
w_class = WEIGHT_CLASS_SMALL
w_class = WEIGHT_CLASS_NORMAL
caliber = CALIBER_45ACP
current_rounds = 150
max_rounds = 150
current_rounds = 160
max_rounds = 160

/obj/item/ammo_magazine/packet/acp_ap
name = "box of .45 ACP(AP)"
icon_state = "box_.45acp_ap"
default_ammo = /datum/ammo/bullet/smg/acp/ap
w_class = WEIGHT_CLASS_NORMAL
caliber = CALIBER_45ACP
current_rounds = 160
max_rounds = 160

/obj/item/ammo_magazine/packet/acp_hp
name = "box of .45 ACP(HP)"
icon_state = "box_.45acp_hp"
default_ammo = /datum/ammo/bullet/smg/acp/hp
w_class = WEIGHT_CLASS_NORMAL
caliber = CALIBER_45ACP
current_rounds = 160
max_rounds = 160
Ghostkokos marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/ammo_magazine/packet/rifle762X39
name = "box of 7.62X39"
Expand All @@ -178,6 +196,15 @@
current_rounds = 150
max_rounds = 150

/obj/item/ammo_magazine/packet/svd762x54mmR
name = "box of 7.62X54"
icon_state = "box_7.62x54mm"
default_ammo = /datum/ammo/bullet/sniper/svd
w_class = WEIGHT_CLASS_NORMAL
caliber = CALIBER_762X54
current_rounds = 50
max_rounds = 50

/obj/item/ammo_magazine/packet/p9mm/ap
name = "packet of 9mm AP"
desc = "A packet containing 70 rounds of 9mm armor-piercing."
Expand Down
Binary file modified icons/obj/items/ammo.dmi
Binary file not shown.
Loading