cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

357box (#17186)

Browse Source
This commit is contained in:
ynot01
2022-12-29 17:36:03 -05:00
committed by GitHub
parent 7347ecbcfd
commit d8ccfefcbc
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/projectiles/boxes_magazines/ammo_boxes.dm
View File

@@ -6,6 +6,13 @@
max_ammo = 7
multiple_sprites = AMMO_BOX_PER_BULLET
// Cannot be directly loaded into guns with internal magazines, but can load magazines/cylinders
/obj/item/ammo_box/no_direct/a357
name = "ammo box (.357)"
icon_state = "357box"
ammo_type = /obj/item/ammo_casing/a357
max_ammo = 20
/obj/item/ammo_box/a357/ironfeather
name = "speed loader (.357 Ironfeather)"
desc = "A seven-shot speed loader designed for .357 revolvers. \

2
code/modules/projectiles/guns/ballistic.dm
View File

@@ -354,7 +354,7 @@
else
to_chat(user, span_notice("There's already a [magazine_wording] in \the [src]."))
return
if (istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box))
if ((istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box)) && !istype(A, /obj/item/ammo_box/no_direct))
if (bolt_type == BOLT_TYPE_NO_BOLT || internal_magazine)
if (chambered && !chambered.BB)
chambered.forceMove(drop_location())