Skip to content

Commit

Permalink
10mm Drum Magazine (#258)
Browse files Browse the repository at this point in the history
  • Loading branch information
andy-temps authored Nov 29, 2024
1 parent e7411b2 commit 206229d
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 1 deletion.
14 changes: 14 additions & 0 deletions code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion code/game/objects/items/granters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 13 additions & 0 deletions code/modules/projectiles/boxes_magazines/external/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/ballistic/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/fallout/objects/guns/ammo.dmi
Binary file not shown.
Binary file modified icons/obj/guns/projectile.dmi
Binary file not shown.

0 comments on commit 206229d

Please sign in to comment.