Fixes

new-frontiers-14 · Feb 10, 2024 · dc65e3d · dc65e3d
1 parent ba46cc6
commit dc65e3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.Popups;
 using Content.Server.Contests;
 using Content.Server.Item.PseudoItem;
+using Content.Server.Storage.EntitySystems;
 using Content.Shared.Climbing; // Shared instead of Server
 using Content.Shared.Mobs;
 using Content.Shared.DoAfter;
@@ -170,6 +171,9 @@ private void OnMoveInput(EntityUid uid, BeingCarriedComponent component, ref Mov
             if (!TryComp<CanEscapeInventoryComponent>(uid, out var escape))
                 return;
 
+            if (args.OldMovement == MoveButtons.None || args.OldMovement == MoveButtons.Walk)
+                return; // Don't try to escape if not moving *cries*
+
             if (_actionBlockerSystem.CanInteract(uid, component.Carrier))
             {
                 _escapeInventorySystem.AttemptEscape(uid, component.Carrier, escape, _contests.MassContest(uid, component.Carrier));
@@ -381,15 +385,15 @@ private void AddInsertCarriedVerb(EntityUid uid, CarryingComponent component, Ge
             if (toInsert is not { Valid: true } || !args.CanAccess || !TryComp<PseudoItemComponent>(toInsert, out var pseudoItem))
                 return;
 
-            if (!TryComp<StorageComponent>(args.Target, out var storage) || storage.StorageUsed + pseudoItem.Size > storage.StorageCapacityMax)
-                return;
+            if (!HasComp<StorageComponent>(args.Target))
+                return; // Can't check if the person would actually fit here
 
             InnateVerb verb = new()
             {
                 Act = () =>
                 {
                     DropCarried(uid, toInsert.Value);
-                    _pseudoItem.TryInsert(args.Target, toInsert.Value, pseudoItem, storage);
+                    _pseudoItem.TryInsert(args.Target, toInsert.Value, args.User, pseudoItem);
                 },
                 Text = Loc.GetString("action-name-insert-other", ("target", toInsert)),
                 Priority = 2

diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -17,6 +17,7 @@
 using Content.Server.Storage.Components;
 using Content.Server.Carrying;
 using Content.Shared.Actions;
+using Content.Shared.Movement.Systems;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Resist;
@@ -57,6 +58,9 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
         if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
             return;
 
+        if (args.OldMovement == MoveButtons.None || args.OldMovement == MoveButtons.Walk)
+            return; // This event gets fired when the user holds down shift, which makes no sense
+
         // Contested
         if (_handsSystem.IsHolding(container.Owner, uid, out var inHand))
         {
@@ -96,7 +100,7 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
         if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out component.DoAfter))
             return;
 
-        Dirty(user, component);
+        //Dirty(user, component);
         _popupSystem.PopupEntity(Loc.GetString("escape-inventory-component-start-resisting"), user, user);
         _popupSystem.PopupEntity(Loc.GetString("escape-inventory-component-start-resisting-target"), container, container);