diff --git a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm index 99f027555bf..5c359566428 100644 --- a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm +++ b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm @@ -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() . = ..() diff --git a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm index 603b83c325c..d34b3cfa4ff 100644 --- a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -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]" diff --git a/modular_zubbers/code/modules/research/designs/weapon_designs.dm b/modular_zubbers/code/modules/research/designs/weapon_designs.dm index 7ff968eef11..526acb51cff 100644 --- a/modular_zubbers/code/modules/research/designs/weapon_designs.dm +++ b/modular_zubbers/code/modules/research/designs/weapon_designs.dm @@ -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 diff --git a/modular_zubbers/icons/obj/weapons/guns/ammo.dmi b/modular_zubbers/icons/obj/weapons/guns/ammo.dmi index 14482eb9799..ef9008588f2 100644 Binary files a/modular_zubbers/icons/obj/weapons/guns/ammo.dmi and b/modular_zubbers/icons/obj/weapons/guns/ammo.dmi differ