]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix incorrect "Cycled" and "Bolted" popups when (un)wielding a gun (#26924)
authorDrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Sat, 13 Apr 2024 15:25:53 +0000 (08:25 -0700)
committerGitHub <noreply@github.com>
Sat, 13 Apr 2024 15:25:53 +0000 (11:25 -0400)
Content.Shared/Wieldable/WieldableSystem.cs

index b7529328793a651bc37d1155dcfa192f0e0a3c01..9fe76c625b8ffb616686a8860d098f8f11a9b118 100644 (file)
@@ -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);