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

Ammo boxes now have sprites for being parially filled! #32930

Merged
merged 1 commit into from
Oct 22, 2024

Conversation

Moomoobeef
Copy link
Contributor

About the PR

Ammo boxes no longer show up as empty after removing just one bullet.

Why / Balance

Annoying and ugly.

Technical details

Added new sprites, modified ammo-box ymls to use the new stages

Media

ammos

Requirements

Breaking changes

None (probably)

Changelog
🆑

  • fix: Ammo-boxes no longer appear empty when only one bullet is removed.

Created new sprites for all the partial fills and modified the ammo-case ymls to accomodate the new stages
@github-actions github-actions bot added No C# For things that don't need code. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Oct 20, 2024
Copy link
Contributor

RSI Diff Bot; head commit a4b4c03 merging into c221ef0
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

State Old New Status
mag-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
magb-2 Added
magb-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

State Old New Status
mag-1 Modified
mag10-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
mag10-2 Added
mag10-3 Added
magb-2 Added
magb-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

State Old New Status
mag-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
magb-2 Added
magb-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

State Old New Status
mag-1 Modified
mag-2 Added
mag-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

State Old New Status
mag-1 Modified
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

State Old New Status
mag-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
magb-2 Added
magb-3 Added

@Moomoobeef
Copy link
Contributor Author

Test has again failed for reasons seemingly unrelated to the changes made and completely related to the test being consistently buggy and intermittently broken.

@SlamBamActionman SlamBamActionman self-assigned this Oct 22, 2024
@Errant-4
Copy link
Member

This is nice, thank you for your contribution

@Errant-4 Errant-4 merged commit 5f1b848 into space-wizards:master Oct 22, 2024
14 checks passed
@Errant-4
Copy link
Member

As an aside, I found it weird that some (light_rifle.rsi, magnum.rsi, caseless_rifle.rsi) of these have very clearly "4 quadrants of fill" but go from 1 missing to 3 missing. But it seems this has nothing to do with the configuration in this PR, there isn't even a "2 missing" sprite for those boxes.
I can only assume it was added like this back in Space station 13 because they did not want those boxes to have so many states of depletion?

@Moomoobeef
Copy link
Contributor Author

if ss13 had partial sprites these aren't from there, I made them myself. As for why, it was kind of stylistic choice and kind of me being lazy and not wanting to make more sprites

@Moomoobeef Moomoobeef deleted the ammo-box-partial-sprites branch October 22, 2024 18:14
@Everturning
Copy link

danke

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants