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

Adds new magazine/drum sprites + code fixes / additions #5901

Closed
wants to merge 18 commits into from

Conversation

AMcilraith
Copy link
Contributor

@AMcilraith AMcilraith commented Dec 7, 2024

About The Pull Request

Adds new sprites for ammunition magazines and containers.

This PR is my unabashed attempt at spriting in the following variants for magazines of varying kinds, along with adding the code to spawn/use if it's ever decided these are wanted later. Included are:
- SI LASER magazines, for each provided caliber. Added to code in the event future use is needed.
- Pepperball magazines, now distinctly different from hollow point mags. Added new iconstates to code.
- Fixes to some of the High-Velocity mags that were not previously green.
- Changing incendiary magazines/drums to white.
- CBO sleeper rounds drum is now legally distinct from rubbers. Added new iconstates to code.

Changelog

🆑
add: SI LASER ammo magazines (code and sprites)
add: new pepperball ammo magazines (sprites)
add: new CBO ammo drum (sprites)
fix: fixed inconsistent green-ness on hv mag sprites (sprites)
fix: changed incendiary to be white lines (sprites)
Trilby Edits:
Fixes inconstant naming in bullet fab
/:cl:

Screenshots

SI LASER Magazines
image
New Pepperball Magazines
image
Consistent High Velocity Magazines
image
Consistent Incendiary Magazines/Drums
image
New CBO Sleeper Drum
image

@AMcilraith AMcilraith changed the title Adds new sprites + code fixes / additions Adds new magazine/drum sprites + code fixes / additions Dec 7, 2024
@Trilbyspaceclone Trilbyspaceclone added Sprite Work Improves or adds a sprite Game Breaking A PR that will break the game or Master. labels Dec 7, 2024
@AMcilraith
Copy link
Contributor Author

@Trilbyspaceclone tests seem to run fine on my end, getitng no syntax errors.

when the checks (probably, hopefully) pass, can we at least remove the "GAME BREAKING" tag?

@Trilbyspaceclone Trilbyspaceclone removed the Game Breaking A PR that will break the game or Master. label Dec 7, 2024
@Trilbyspaceclone Trilbyspaceclone added Bug-Fix Fixes issues Balance Improves on fairness labels Dec 8, 2024
Trilbyspaceclone and others added 4 commits December 7, 2024 23:18
LASER is an acronym. 
Light Amplification by the Stimulated Emission of Radiation.

It should be caps-case.
@Trilbyspaceclone Trilbyspaceclone added the Test Merged A RP that is test merged before added to the code itself label Dec 8, 2024
@AMcilraith AMcilraith closed this by deleting the head repository Dec 21, 2024
@Trilbyspaceclone Trilbyspaceclone removed the Test Merged A RP that is test merged before added to the code itself label Dec 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Improves on fairness Bug-Fix Fixes issues Sprite Work Improves or adds a sprite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants