diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index f717274d372..18effebddb8 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -2215,3 +2215,17 @@ Not implemented due to balance at the moment category = CAT_WEAPONRY subcategory = CAT_AMMO always_available = FALSE + +//48 Round 10mm Drum Magazine +/datum/crafting_recipe/drum10mm + name = "SMG Drum Magazine (10mm)" + result = /obj/item/ammo_box/magazine/m10mm/adv/drum/empty + reqs = list(/obj/item/stack/sheet/metal = 20, + /obj/item/stack/crafting/goodparts = 3, + /obj/item/stack/sheet/plastic = 2, + ) + tools = list(TOOL_WORKBENCH) + time = 80 + category = CAT_WEAPONRY + subcategory = CAT_AMMO + always_available = FALSE diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 29774d5ddad..cf4118c0e9f 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -657,7 +657,7 @@ icon_state = "gab4" oneuse = TRUE remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") - crafting_recipe_types = list(/datum/crafting_recipe/flux, /datum/crafting_recipe/lenses, /datum/crafting_recipe/conductors, /datum/crafting_recipe/receiver, /datum/crafting_recipe/assembly, /datum/crafting_recipe/alloys, /datum/crafting_recipe/a556extended) + crafting_recipe_types = list(/datum/crafting_recipe/flux, /datum/crafting_recipe/lenses, /datum/crafting_recipe/conductors, /datum/crafting_recipe/receiver, /datum/crafting_recipe/assembly, /datum/crafting_recipe/alloys, /datum/crafting_recipe/a556extended, /datum/crafting_recipe/drum10mm) /obj/item/book/granter/crafting_recipe/scav_one name = "SCAV! Issue 1" diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 8d119ae5ec7..8626bc510c3 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -126,6 +126,19 @@ /obj/item/ammo_box/magazine/m10mm/adv/ext/empty start_empty = 1 +//10mm drum +/obj/item/ammo_box/magazine/m10mm/adv/drum + name = "10mm drum magazine (10mm)" + icon_state = "drum10mm" + ammo_type = /obj/item/ammo_casing/c10mm + max_ammo = 48 + multiple_sprites = 2 + custom_materials = list(/datum/material/iron = MATS_SMG) + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/ammo_box/magazine/m10mm/adv/drum/empty + start_empty = 1 + //.45 /obj/item/ammo_box/magazine/m45 name = "handgun magazine (.45)" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index ed44788dedd..2959fd9b468 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1626,6 +1626,7 @@ GLOBAL_LIST_INIT(gun_yeet_words, list( new /obj/item/gun/ballistic/automatic/pistol/pistol14(src) new /obj/item/ammo_box/magazine/uzim9mm(src) new /obj/item/ammo_box/magazine/m9mm/doublestack(src) + new /obj/item/ammo_box/magazine/m10mm/adv/drum(src) new /obj/item/ammo_box/magazine/m10mm/adv/ext(src) new /obj/item/ammo_box/magazine/m10mm/adv(src) new /obj/item/ammo_box/magazine/m10mm_p90(src) diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index 0b38bbbb035..a0e871bcf18 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -272,6 +272,8 @@ disallowed_mags = list( /obj/item/ammo_box/magazine/m10mm/adv/ext, /obj/item/ammo_box/magazine/m10mm/adv/ext/empty, + /obj/item/ammo_box/magazine/m10mm/adv/drum, + /obj/item/ammo_box/magazine/m10mm/adv/drum/empty, /obj/item/ammo_box/magazine/m10mm/rifle) weapon_class = WEAPON_CLASS_SMALL weapon_weight = GUN_ONE_HAND_ONLY diff --git a/icons/fallout/objects/guns/ammo.dmi b/icons/fallout/objects/guns/ammo.dmi index 4d447e3d0db..c4a1802316d 100644 Binary files a/icons/fallout/objects/guns/ammo.dmi and b/icons/fallout/objects/guns/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 8095b37e352..81dc3ac388d 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ