From 2a3e36fe55a9f1638ac81b2b69f70ea86ff5d53e Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Sat, 17 Feb 2024 02:00:21 -0500 Subject: [PATCH 1/6] Update magazine_boxes.dm --- code/modules/projectiles/ammo_boxes/magazine_boxes.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index ff90a6659f..09d98809a7 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -60,6 +60,17 @@ /obj/item/ammo_box/magazine/heap/empty empty = TRUE + +/obj/item/ammo_box/magazine/mk1 + name = "magazine box (M41A MK1 X 10)" + flags_equip_slot = SLOT_BACK + overlay_ammo_type = "_reg" + overlay_content = "_reg" + magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1 + +/obj/item/ammo_box/magazine/mk1/empty + empty = TRUE + //-----------------------M39 Rifle Mag Boxes----------------------- /obj/item/ammo_box/magazine/m39 From b5d80fd538184dd11cf06bca3cae1473559f5dd8 Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Sat, 17 Feb 2024 02:05:45 -0500 Subject: [PATCH 2/6] Update sheet_types.dm --- code/game/objects/items/stacks/sheets/sheet_types.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 07345dcdc0..42d42c10cb 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -255,6 +255,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ new/datum/stack_recipe("empty magazine box (M41A Ext)", /obj/item/ammo_box/magazine/ext/empty), \ new/datum/stack_recipe("empty magazine box (M41A Incen)", /obj/item/ammo_box/magazine/incen/empty), \ new/datum/stack_recipe("empty magazine box (M41A LE)", /obj/item/ammo_box/magazine/le/empty), \ + new/datum/stack_recipe("empty magazine box (M41A MK1)", /obj/item/ammo_box/magazine/mk1/empty), \ null, \ new/datum/stack_recipe("empty shotgun shell box (Beanbag)", /obj/item/ammo_box/magazine/shotgun/beanbag/empty), \ new/datum/stack_recipe("empty shotgun shell box (Buckshot)", /obj/item/ammo_box/magazine/shotgun/buckshot/empty), \ From 9b13a2ed510a2daa70564cc0e773912ae7a7cd89 Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Sat, 17 Feb 2024 18:32:32 -0500 Subject: [PATCH 3/6] Update round_boxes.dm --- code/modules/projectiles/ammo_boxes/round_boxes.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/projectiles/ammo_boxes/round_boxes.dm b/code/modules/projectiles/ammo_boxes/round_boxes.dm index 95115b76df..fcd6a3125f 100644 --- a/code/modules/projectiles/ammo_boxes/round_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/round_boxes.dm @@ -40,6 +40,19 @@ /obj/item/ammo_box/rounds/heap/empty empty = TRUE +//----------------10x28mm Ammunition Boxes (for smartguns)------------------ + +/obj/item/ammo_box/rounds/smartgun + name = "\improper rifle ammunition box (10x28mm)" + desc = "A 10x28mm ammunition box. Used to refill smartgun drum magazines. It comes with a leather strap allowing to wear it on the back." + overlay_content = "_reg" + default_ammo = /datum/ammo/bullet/smartgun + caliber = "10x28mm" + max_bullet_amount = 1000 + +/obj/item/ammo_box/rounds/smartgun/empty + empty = TRUE + //----------------10x20mm Ammunition Boxes (for M39 SMG)------------------ /obj/item/ammo_box/rounds/smg From 72e15e99fb85ac51e230a51ca3c126543c2f117d Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Sat, 17 Feb 2024 18:33:47 -0500 Subject: [PATCH 4/6] Update sheet_types.dm --- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 42d42c10cb..3efad57e07 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -280,6 +280,8 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ new/datum/stack_recipe("empty rifle ammo box (10x24mm Incen)", /obj/item/ammo_box/rounds/incen/empty), \ new/datum/stack_recipe("empty rifle ammo box (10x24mm LE)", /obj/item/ammo_box/rounds/le/empty), \ null, \ + new/datum/stack_recipe("empty rifle ammo box (10x28mm)", /obj/item/ammo_box/rounds/smartgun/empty), \ + null, \ new/datum/stack_recipe("empty box of MREs", /obj/item/ammo_box/magazine/misc/mre/empty), \ new/datum/stack_recipe("empty box of M94 Marking Flare Packs", /obj/item/ammo_box/magazine/misc/flares/empty), \ new/datum/stack_recipe("empty box of flashlights", /obj/item/ammo_box/magazine/misc/flashlight/empty), \ From baee7e2762046bb17c63cd066ca222d3daae75c4 Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Sun, 18 Feb 2024 00:23:44 -0500 Subject: [PATCH 5/6] Update sheet_types.dm --- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 3efad57e07..0ed2894150 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -280,7 +280,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ new/datum/stack_recipe("empty rifle ammo box (10x24mm Incen)", /obj/item/ammo_box/rounds/incen/empty), \ new/datum/stack_recipe("empty rifle ammo box (10x24mm LE)", /obj/item/ammo_box/rounds/le/empty), \ null, \ - new/datum/stack_recipe("empty rifle ammo box (10x28mm)", /obj/item/ammo_box/rounds/smartgun/empty), \ + new/datum/stack_recipe("empty smartgun ammo box (10x28mm)", /obj/item/ammo_box/rounds/smartgun/empty), \ null, \ new/datum/stack_recipe("empty box of MREs", /obj/item/ammo_box/magazine/misc/mre/empty), \ new/datum/stack_recipe("empty box of M94 Marking Flare Packs", /obj/item/ammo_box/magazine/misc/flares/empty), \ From 49733f8747c2d95407067dae38a07c5699668c88 Mon Sep 17 00:00:00 2001 From: grifp71 <39208328+grifp71@users.noreply.github.com> Date: Sun, 18 Feb 2024 00:25:04 -0500 Subject: [PATCH 6/6] Update round_boxes.dm --- code/modules/projectiles/ammo_boxes/round_boxes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_boxes/round_boxes.dm b/code/modules/projectiles/ammo_boxes/round_boxes.dm index fcd6a3125f..f3a50f64b2 100644 --- a/code/modules/projectiles/ammo_boxes/round_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/round_boxes.dm @@ -43,7 +43,7 @@ //----------------10x28mm Ammunition Boxes (for smartguns)------------------ /obj/item/ammo_box/rounds/smartgun - name = "\improper rifle ammunition box (10x28mm)" + name = "\improper smartgun ammunition box (10x28mm)" desc = "A 10x28mm ammunition box. Used to refill smartgun drum magazines. It comes with a leather strap allowing to wear it on the back." overlay_content = "_reg" default_ammo = /datum/ammo/bullet/smartgun