From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Thu, 18 Jul 2024 00:48:08 +0000 (-0700)
Subject: Fix stun batons using excess charges when thrown (#30136)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=961a553fa2e335bfb7edbf7c4dd2214aa68c2014;p=space-station-14.git

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

Fix stun batons

Co-authored-by: plykiya <plykiya@protonmail.com>
---

diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs
index 1f9a7f1dd8..a5c8a4b38d 100644
--- a/Content.Shared/Damage/Systems/StaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/StaminaSystem.cs
@@ -192,6 +192,11 @@ public sealed partial class StaminaSystem : EntitySystem
 
     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();
         RaiseLocalEvent(uid, ref ev);
         if (ev.Cancelled)