Merge pull request #393 from Mnemotechnician/floof/tweak/various-issues

Small Fixes and Tweaks

Content.Client/Jittering/JitteringSystem.cs

@@ -45,7 +45,8 @@ private void OnShutdown(EntityUid uid, JitteringComponent jittering, ComponentSh
 
         private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, AnimationCompletedEvent args)
         {
-            if(args.Key != _jitterAnimationKey)
+            // FLoofstation - avoid restarting the jittering animation on entites that already stopped jittering
+            if(args.Key != _jitterAnimationKey || jittering.LifeStage >= ComponentLifeStage.Stopping)
                 return;
 
             if (TryComp(uid, out AnimationPlayerComponent? animationPlayer)

Content.Server/Carrying/CarryingSystem.cs

@@ -162,11 +162,17 @@ private void OnMobStateChanged(EntityUid uid, CarryingComponent component, MobSt
         /// </summary>
         private void OnInteractionAttempt(EntityUid uid, BeingCarriedComponent component, InteractionAttemptEvent args)
         {
-            if (args.Target == null)
+            // Floofstation - function body reviewed
+            Predicate<TransformComponent> isChildOfCarrier = null!; // C# doesn't have local functions eugh
+            isChildOfCarrier = (childXForm) => childXForm.ParentUid == component.Carrier
+                             || (childXForm.ParentUid is {Valid: true} parent && isChildOfCarrier(Transform(parent)));
+
+            if (args.Target == null // Allow self-interacts
+                || isChildOfCarrier(Transform(args.Target.Value))) // Allow interacting with everything on the carriee
                 return;
 
+            // Also check if the interacted-with entity is on the carrier and cancel the event if not
             var targetParent = Transform(args.Target.Value).ParentUid;
-
             if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid)
                 args.Cancel();
         }
@@ -201,8 +207,9 @@ private void OnStandAttempt(EntityUid uid, BeingCarriedComponent component, Stan
 
         private void OnInteractedWith(EntityUid uid, BeingCarriedComponent component, GettingInteractedWithAttemptEvent args)
         {
-            if (args.Uid != component.Carrier)
-                args.Cancel();
+            // Floofstation - why.
+            // if (args.Uid != component.Carrier)
+            //     args.Cancel();
         }
 
         private void OnPullAttempt(EntityUid uid, BeingCarriedComponent component, PullAttemptEvent args)