-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
TiniestShark
wants to merge
5
commits into
space-wizards:master
Choose a base branch
from
TiniestShark:GrabDemMags
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
RSI Diff Bot; head commit 0c85261 merging into b5125f0 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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.
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 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
Requirements
Changelog
🆑