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

Musket Bag + Premium Flintlock Ammo #709

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

IjNebula
Copy link
Contributor

What this PR does

  • Adds musket bag
    • Able to be restocked with premium flintlock ammo from a premium restocker
    • Found on ranged pirate crewmembers
    • Found in the nanotrasen clown vending maching
  • Adds premium flintlock ammo
    • Loads into muskets and flintlock pistols faster than normal flintlock bullets
    • Deals slightly more damage than normal flintlock bullets

Why it should be added to the game

I was doing it before because of that one guy on the discord asking for a musket bag and such, but by now I just want this to be merged to be done with it and move on to other requests.

Adds the musket bag, gives the musket bag to ranged pirates, allows it to be restocked in a premium restocker, changes how bandoliers work, adds premium flintlock ammo that gets loaded into weapons slightly faster, changes how bullet_time is saved so that one gun can have multiple loading times depending on the bullet, changes the bullet_time for flintlock pistol and musket.
Activates the bandoliers folder in clothing/belt/bandoliers and changes loadout and vendor references of bandoliers.
@IjNebula
Copy link
Contributor Author

I closed the old branch and opened a new one because my old branch was so horribly out of date.

code/_core/datum/loadout/pirate.dm Outdated Show resolved Hide resolved
code/_core/obj/item/bullet/_bullet_cartridge.dm Outdated Show resolved Hide resolved
code/_core/obj/item/weapon/ranged/bullet/_bullet.dm Outdated Show resolved Hide resolved
Brings the PR up to Burger standards
@BurgerLUA
Copy link
Owner

Will take a look at this tomorrow. Sorry for the delays.

Copy link
Owner

@BurgerLUA BurgerLUA left a comment

Choose a reason for hiding this comment

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

Looks good. Be sure to re-test everything once you do the requested changes to see if things still work and paths are correct.

@@ -0,0 +1,147 @@
/obj/item/clothing/belt/bandoliers
Copy link
Owner

Choose a reason for hiding this comment

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

Don't know how I missed this, but this should be tweaked so it's compatible with already existing instances of bandoliers. Existing code is below.

https://github.com/BurgerLUA/burgerstation/blob/1adcd75865837c6f5f43fe7d06b24055a42ede10/code/_core/obj/item/clothing/belt/bandolier.dm

Variable names that get saved/loaded should be the same, and the type paths should be the same. This is so that people don't lose their ammo when loading a character before the PR gets merged.

The only thing that needs to be changed is stored_bullets (should be stored_shells), and the path should be /obj/item/clothing/belt/bandolier

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