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 Mag + Speedloader Inhand Sprites #34235

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

Conversation

TiniestShark
Copy link
Contributor

About the PR

Adds inhand visuals to (most) ammo magazines and speedloaders

Why / Balance

Being able to see ammo mags gives reloading a bit more of a tactile feel, as well as altering how combat can flow to a small degree. Physically seeing an opponent reloading can give a good indicator of when to push, rush or retreat (even if some people are REALLY fast with their reloading.)

Technical details

Simple addition of inhand sprites.

Media

ammo demo master

Requirements

Changelog

🆑

  • add: Inhand sprites for (most) ammo mags and speedloaders.

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. size/S Denotes a PR that changes 10-99 lines. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Jan 5, 2025
Copy link
Contributor

github-actions bot commented Jan 5, 2025

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

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi

State Old New Status
inhand-left Added
inhand-right Added

Edit: diff updated after 0c85261

@beck-thompson beck-thompson added P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: Art Area: Art with no implications for other areas. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game. labels Jan 5, 2025
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Feb 4, 2025
Copy link
Contributor

github-actions bot commented Feb 4, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Art Area: Art with no implications for other areas. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted size/S Denotes a PR that changes 10-99 lines. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants