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.

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

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

merged 7 commits into from
Feb 18, 2024

Conversation

grifp71
Copy link
Contributor

@grifp71 grifp71 commented Feb 17, 2024

For some reason, these items were both missing from base CM code. This allows empty ammo cans for 10x28mm (smartgun ammo) to be crafted from cardboard and an empty mag box for MK1 magazines which will be a massive quality of life increase as our ammo just sits on the dropship to be flamed. This should theoretically make life even the slightest bit easier for GMs when it comes to resupplying platoons in round as well. MK1 boxes have been requested a few times from the community.

Copy link
Contributor

@FslashN FslashN left a comment

Choose a reason for hiding this comment

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

I think leaving it as rifle ammunition is a little confusing.

@@ -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

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.

//----------------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.

@FslashN FslashN merged commit a078ba0 into cmss13-devs:master Feb 18, 2024
32 checks passed
@grifp71 grifp71 deleted the grifp71-patch-2 branch March 21, 2024 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants