mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
Adds the 9mm Speed Loader (#5665)
## About The Pull Request I've added a speed loader usable by the new Protector revolver, sprited by both me and Niim. It holds five 9mm bullets, craftable from both the security fabricator and the autolathe, just like the .38 speedloader. Obviously, it can only hold 9mm bullets, you can't use it to pick up other ammo types. ## Why It's Good For The Game The new revolver is EXTREMELY janky to reload otherwise, only allowing one single bullet at a time from Murphy magazines. ## Proof Of Testing https://files.catbox.moe/zy8hcw.mp4 I've since fixed some spelling mistakes visible in the preview (was speedloader, changed to speed loader) ## Changelog 🆑 IbexGoetia, Niim add: Added a speed loader for the Protector revolver. It holds five 9mm bullets, and can be crafted from the security fabricator and the autolathe. /🆑
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
design_ids += "ammoworkbench_disk_lethal"
|
||||
design_ids += "ammo_workbench"
|
||||
design_ids += "m9mm_sec"
|
||||
design_ids += "m9mm_sec_speedloader"
|
||||
|
||||
/datum/techweb_node/sec_equip/New()
|
||||
. = ..()
|
||||
|
||||
@@ -65,3 +65,26 @@
|
||||
for(var/i = 0; i < bullets_to_remove; i++)
|
||||
qdel(get_round())
|
||||
update_icon()
|
||||
|
||||
/obj/item/ammo_box/speedloader/security
|
||||
name = "speed loader (9mm Murphy)"
|
||||
desc = "Designed to quickly reload five-chambered 9mm revolvers."
|
||||
icon = 'modular_zubbers/icons/obj/weapons/guns/ammo.dmi'
|
||||
icon_state = "9mm"
|
||||
base_icon_state = "9mm"
|
||||
ammo_type = /obj/item/ammo_casing/security
|
||||
caliber = CALIBER_9MM_SEC
|
||||
max_ammo = 5
|
||||
ammo_band_icon = null
|
||||
ammo_band_color = null
|
||||
|
||||
/obj/item/ammo_box/speedloader/security/update_icon_state()
|
||||
. = ..()
|
||||
icon_state = "[base_icon_state]-base"
|
||||
|
||||
/obj/item/ammo_box/speedloader/security/update_overlays()
|
||||
. = ..()
|
||||
if(!LAZYLEN(stored_ammo))
|
||||
return
|
||||
for(var/inserted_ammo in 1 to stored_ammo.len)
|
||||
. += "9mm-revolver-[inserted_ammo]"
|
||||
|
||||
@@ -270,3 +270,19 @@
|
||||
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
|
||||
)
|
||||
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
|
||||
|
||||
/datum/design/m9mm_sec_speedloader
|
||||
name = "Speed Loader (9x25mm Murphy) (Lethal)"
|
||||
desc = "Designed to quickly reload five-chambered 9mm revolvers."
|
||||
id = "m9mm_sec_speedloader"
|
||||
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
|
||||
materials = list(
|
||||
/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 15,
|
||||
/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 2,
|
||||
)
|
||||
build_path = /obj/item/ammo_box/speedloader/security
|
||||
category = list(
|
||||
RND_CATEGORY_INITIAL,
|
||||
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
|
||||
)
|
||||
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 667 B After Width: | Height: | Size: 1.0 KiB |
Reference in New Issue
Block a user