Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MK1 Mag Boxes and 10x28mm ammo cans #117

Merged
merged 7 commits into from
Feb 18, 2024
Merged

MK1 Mag Boxes and 10x28mm ammo cans #117

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a3e36f
Update magazine_boxes.dm
grifp71 Feb 17, 2024
b5d80fd
Update sheet_types.dm
grifp71 Feb 17, 2024
8802842
Merge pull request #1 from grifp71/grifp71-patch-2-1
grifp71 Feb 17, 2024
9b13a2e
Update round_boxes.dm
grifp71 Feb 17, 2024
72e15e9
Update sheet_types.dm
grifp71 Feb 17, 2024
baee7e2
Update sheet_types.dm
grifp71 Feb 18, 2024
49733f8
Update round_boxes.dm
grifp71 Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
Expand All @@ -279,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), \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be drum or something like that?

Copy link
Contributor Author

@grifp71 grifp71 Feb 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be drum or something like that?

This particular one is a box of loose ammo, not drums, that you use to repack drums. I could maybe rename it to smartgun ammo box. Unfortunately I don't think sentry drums support repacking despite being the same cartridge.

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), \
Expand Down
11 changes: 11 additions & 0 deletions code/modules/projectiles/ammo_boxes/magazine_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions code/modules/projectiles/ammo_boxes/round_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this one here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made tweaks. I think I did this correctly? Not sure, still working my way through figuring out github properly.

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
Expand Down
Loading