tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stun batons using excess charges when thrown (#30136)

Browse Source 
Fix stun batons

Co-authored-by: plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya
2024-07-17 17:48:08 -07:00
committed by GitHub
parent d7b2e72882
commit 961a553fa2
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Damage/Systems/StaminaSystem.cs
View File

@@ -192,6 +192,11 @@ public sealed partial class StaminaSystem : EntitySystem
private void OnCollide(EntityUid uid, StaminaDamageOnCollideComponent component, EntityUid target) private void OnCollide(EntityUid uid, StaminaDamageOnCollideComponent component, EntityUid target)
{ {
// you can't inflict stamina damage on things with no stamina component
// this prevents stun batons from using up charges when throwing it at lockers or lights
if (!HasComp<StaminaComponent>(target))
return;
var ev = new StaminaDamageOnHitAttemptEvent(); var ev = new StaminaDamageOnHitAttemptEvent();
RaiseLocalEvent(uid, ref ev); RaiseLocalEvent(uid, ref ev);
if (ev.Cancelled) if (ev.Cancelled)