-
Notifications
You must be signed in to change notification settings - Fork 287
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@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? |
…urn-station into gun-ammo-sprites
LASER is an acronym. Light Amplification by the Stimulated Emission of Radiation. It should be caps-case.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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





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