From: I.K <45953835+notquitehadouken@users.noreply.github.com> Date: Tue, 9 May 2023 07:37:55 +0000 (-0500) Subject: Fix mice tabling (#16251) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ce2ad3a315cf06b23413d71c1a9b6698a7b17d5d;p=space-station-14.git Fix mice tabling (#16251) --- diff --git a/Content.Server/Climbing/ClimbSystem.cs b/Content.Server/Climbing/ClimbSystem.cs index 3f50fa824b..d0bcd61a35 100644 --- a/Content.Server/Climbing/ClimbSystem.cs +++ b/Content.Server/Climbing/ClimbSystem.cs @@ -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(args.User)) + return; TryClimb(args.User, args.Dragged, uid, component); }