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

[MIRROR] Fixes #34570 and wrapping boxes #2191

Merged
merged 1 commit into from
May 22, 2024
Merged

Conversation

SierraHelper
Copy link
Collaborator

Оригинальный PR: Baystation12#34583

🆑 emmanuelbassil
bugfix: Can wrap boxes again.
bugfix: Fixed being able to wrap items in storage containers, breaking the entire interaction.
bugfix: Fixes gun-bashing. Clicking on someone while on harm intent with safety enabled will bash with the gun.
/🆑

Prior behavior was having disarm do a gun bash but that was broken by the attack refactor. Current behavior has all melee use need harm intent, so made it based around safety. If safety set but on harm, will bash with gun. Can do a different behavior if needed.

Fixes Baystation12#34570

@SierraHelper SierraHelper requested a review from a team as a code owner April 30, 2024 17:44
@SierraHelper SierraHelper added 🪞 MIR ЯОЯ 📜 CL валиден Ченджлог не содержит ошибок labels Apr 30, 2024
@UEDCommander UEDCommander merged commit b718003 into dev-sierra May 22, 2024
14 checks passed
@UEDCommander UEDCommander deleted the upstream-pr-34583 branch May 22, 2024 16:40
SierraHelper added a commit that referenced this pull request May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🪞 MIR ЯОЯ 📜 CL валиден Ченджлог не содержит ошибок
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bashing with guns is currently impossible
3 participants