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 C4 and runtime #1636

Merged
merged 1 commit into from
Dec 16, 2023
Merged

[MIRROR] Fixes C4 and runtime #1636

merged 1 commit into from
Dec 16, 2023

Conversation

SierraHelper
Copy link
Collaborator

@SierraHelper SierraHelper commented Dec 15, 2023

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

🆑 emmanuelbassil
bugfix: Fixes C4/Plastique. It now explodes again.
bugfix: Fixes runtime when blob attacks people
/🆑

At the moment; general_health_adjustment is never called with a used_weapon; so technically this runtime could also be fixed by just calling apply_damage() at the end without used_weapon and used_weapon.armorpenetration. Did it this way in case someone decides to call it with a weapon down the road; your call how you want it fixed.

Also fixed oversight in stun baton's throw impact proc.
Added better feedback to C4.

@SierraHelper SierraHelper requested a review from a team as a code owner December 15, 2023 20:49
@SierraHelper SierraHelper added 🪞 MIR ЯОЯ 📜 CL валиден Ченджлог не содержит ошибок labels Dec 15, 2023
@SuhEugene SuhEugene merged commit 82e88ef into dev-sierra Dec 16, 2023
14 of 15 checks passed
@SuhEugene SuhEugene deleted the upstream-pr-34381 branch December 16, 2023 20:51
SierraHelper added a commit that referenced this pull request Dec 16, 2023
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.

3 participants