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

Energy gun sprites + Minor bug fixes #811

Merged
merged 3 commits into from
Feb 10, 2024

Conversation

Tryded
Copy link
Contributor

@Tryded Tryded commented Feb 10, 2024

About the PR

Gives the Miniature Energy Pistol and PDW-9 energy pistol a custom in hand sprite. Fixed IK-60 In hand sprites and added a backpack sprite. Changed all settings named "Kill" to "lethal"

Why / Balance

Technical details

Media

New In hand Sprites
image

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

Breaking changes

Changelog

@Tryded Tryded requested a review from DebugOk as a code owner February 10, 2024 18:14
@github-actions github-actions bot added Status: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Feb 10, 2024
Copy link
Contributor

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi

State Old New Status
disabler-inhand-left Modified
disabler-inhand-right Modified
lethal-inhand-left Modified
lethal-inhand-right Modified

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi

State Old New Status
disabler-inhand-left Modified
disabler-inhand-right Modified
lethal-inhand-left Modified
lethal-inhand-right Modified

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi

State Old New Status
lethal-inhand-left Removed
lethal-inhand-right Removed
equipped-BACKPACK Added
inhand-left Added
inhand-right Added

@VMSolidus
Copy link
Contributor

I have verified in testing that this PR works as advertised. I believe it to be ready to merge.

@VMSolidus VMSolidus merged commit ae2790b into DeltaV-Station:master Feb 10, 2024
14 checks passed
@DebugOk DebugOk removed their request for review February 10, 2024 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants