]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix mice tabling (#16251)
authorI.K <45953835+notquitehadouken@users.noreply.github.com>
Tue, 9 May 2023 07:37:55 +0000 (02:37 -0500)
committerGitHub <noreply@github.com>
Tue, 9 May 2023 07:37:55 +0000 (17:37 +1000)
Content.Server/Climbing/ClimbSystem.cs

index 3f50fa824baaeb401d76adbcb15b7b58572d24d3..d0bcd61a35b79425ce7512ed742e0e53b9fe30ce 100644 (file)
@@ -13,6 +13,7 @@ using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.GameTicking;
+using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
@@ -100,6 +101,10 @@ public sealed class ClimbSystem : SharedClimbSystem
 
     private void OnClimbableDragDrop(EntityUid uid, ClimbableComponent component, ref DragDropTargetEvent args)
     {
+        // definitely a better way to check if two entities are equal
+        // but don't have computer access and i have to do this without syntax
+        if (args.User != args.Dragged && !HasComp<HandsComponent>(args.User))
+            return;
         TryClimb(args.User, args.Dragged, uid, component);
     }