From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 13 Apr 2024 15:25:53 +0000 (-0700)
Subject: Fix incorrect "Cycled" and "Bolted" popups when (un)wielding a gun (#26924)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b51482f51a67bb90f6ccc7fb355c316e200bb36d;p=space-station-14.git

Fix incorrect "Cycled" and "Bolted" popups when (un)wielding a gun (#26924)
---

diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index b752932879..9fe76c625b 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -34,7 +34,7 @@ public sealed class WieldableSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<WieldableComponent, UseInHandEvent>(OnUseInHand);
+        SubscribeLocalEvent<WieldableComponent, UseInHandEvent>(OnUseInHand, before: [typeof(SharedGunSystem)]);
         SubscribeLocalEvent<WieldableComponent, ItemUnwieldedEvent>(OnItemUnwielded);
         SubscribeLocalEvent<WieldableComponent, GotUnequippedHandEvent>(OnItemLeaveHand);
         SubscribeLocalEvent<WieldableComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);