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

Add quick holstering and unholstering keys #2166

Merged
merged 7 commits into from
May 23, 2024

Conversation

DrSmugleaf
Copy link
Contributor

@DrSmugleaf DrSmugleaf commented May 23, 2024

About the PR

Fixes #2015
Fixes #2029

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑

  • add: Added quick holster and unholster keys.

@github-actions github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Status: Needs Review labels May 23, 2024
Copy link
Contributor

github-actions bot commented May 23, 2024

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

Resources/Textures/_CM14/Objects/Clothing/Shoes/Marines/black.rsi

State Old New Status
filled Added

Resources/Textures/_CM14/Objects/Clothing/Shoes/Marines/brown.rsi

State Old New Status
filled Added

Resources/Textures/_CM14/Objects/Clothing/Shoes/Marines/jungle.rsi

State Old New Status
filled Added

Resources/Textures/_CM14/Objects/Weapons/Guns/gun_underlays.rsi

State Old New Status
_88m4 Added
aamateba Added
amateba Added
b92fs Added
c_deagle Added
c_xm51 Added
cmateba Added
cmateba_special Added
d_xm51 Added
deagle Added
g_deagle Added
highpower Added
highpower_b Added
highpower_tac Added
m43 Added
m44r Added
m44rc Added
m4a3 Added
m4a345 Added
m4a345_s Added
m4a3c Added
m82f Added
mateba Added
np92 Added
npz92 Added
ny762 Added
pk9 Added
pk9r Added
pk9u Added
s_xm51 Added
smartpistol Added
spearhead Added
tt Added
ttb Added
vp78 Added
webley Added
xm51 Added
zhnk72 Added

Edit: diff updated after 60521fb

@DrSmugleaf DrSmugleaf merged commit a857a63 into RMC-14:master May 23, 2024
12 checks passed
@DrSmugleaf DrSmugleaf deleted the feature/holster-keys branch May 23, 2024 13:03
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 Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Guns need the same keybinds as 13 all guns should quick-equip to the suit storage slot when press a key
1 participant