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

Reverts Shot Gun Sprites #594

Merged
merged 10 commits into from
Jan 1, 2024

Conversation

ps3moira
Copy link
Contributor

@ps3moira ps3moira commented Dec 23, 2023

About the PR

Reverts shotgun sprites

Why / Balance

The new sprites from upstream were missing in-hand sprites and looked a lot less detailed.

Media

New Reverted Sprites
Screenshot 2023-12-23 135326
Old Sprites
image
image
image

Changelog
🆑

  • tweak: Reverted Shotgun sprites

@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Dec 23, 2023
Copy link
Contributor

github-actions bot commented Dec 23, 2023

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
ishotgunstep1 Added
ishotgunstep2 Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Structures/Wallmounts/shotgun_cabinet.rsi

State Old New Status
cabinet-empty-open Added
cabinet-filled-closed Added
cabinet-filled-open Added
cabinet Added
glass-1 Added
glass-2 Added
glass-3 Added
glass-4 Added
glass-up Added
glass Added
locked Added
shotgun Added
unlocked Added

Edit: diff updated after d17d360

Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ❤️ sprites!

@Colin-Tel Colin-Tel merged commit 71d80b8 into DeltaV-Station:master Jan 1, 2024
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Jan 1, 2024
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
* Reverts Shot Gun Sprites

* Removed Held Prefix

(cherry picked from commit 71d80b8)
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description
Prevents players from picking up their own equipped clothing (via the
"put in hand" verb or otherwise) and thus bypassing the unequip delay
completely.

Does so by cancelling the GettingPickedUpAttemptEvent on equipped
clothing. This does not prevent unequipping the clothing normally, i.e.
by interacting with it in the inventory, or stripping clothing from
others.

# Changelog
No cl no fun - most people don't even know this was an option.
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 S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants