port borg downing fix

Content.Server/Standing/StandingStateSystem.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared._NF.Standing;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Standing;
@@ -26,6 +27,9 @@ private void FallOver(EntityUid uid, StandingStateComponent component, DropHandI
         if (!TryComp(uid, out HandsComponent? handsComp))
             return;
 
+        if (HasComp<PreventDropOnDownedComponent>(uid)) // Frontier: stop dropping items when falling over.
+            return; // Frontier
+
         var worldRotation = _transformSystem.GetWorldRotation(uid).ToVec();
         foreach (var hand in handsComp.Hands.Values)
         {

Content.Shared/_NF/Interaction/Systems/SharedHandPlaceholderSystem.cs

@@ -29,34 +29,19 @@ public sealed partial class HandPlaceholderSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<HandPlaceholderRemoveableComponent, GotUnequippedHandEvent>(OnUnequipHand);
-        SubscribeLocalEvent<HandPlaceholderRemoveableComponent, DroppedEvent>(OnDropped);
+        SubscribeLocalEvent<HandPlaceholderRemoveableComponent, EntGotRemovedFromContainerMessage>(OnEntityRemovedFromContainer);
 
         SubscribeLocalEvent<HandPlaceholderComponent, AfterInteractEvent>(AfterInteract);
         SubscribeLocalEvent<HandPlaceholderComponent, BeforeRangedInteractEvent>(BeforeRangedInteract);
     }
 
-    private void OnUnequipHand(Entity<HandPlaceholderRemoveableComponent> ent, ref GotUnequippedHandEvent args)
+    private void OnEntityRemovedFromContainer(Entity<HandPlaceholderRemoveableComponent> ent, ref EntGotRemovedFromContainerMessage args)
     {
-        if (args.Handled)
-            return; // If this is happening in practice, this is a bug.
-
-        SpawnAndPickUpPlaceholder(ent, args.User);
-        RemCompDeferred<HandPlaceholderRemoveableComponent>(ent);
-        args.Handled = true;
-    }
-
-    private void OnDropped(Entity<HandPlaceholderRemoveableComponent> ent, ref DroppedEvent args)
-    {
-        if (args.Handled)
-            return; // If this is happening in practice, this is a bug.
-
-        SpawnAndPickUpPlaceholder(ent, args.User);
+        SpawnAndPickUpPlaceholder(ent, args.Container);
         RemCompDeferred<HandPlaceholderRemoveableComponent>(ent);
-        args.Handled = true;
     }
 
-    private void SpawnAndPickUpPlaceholder(Entity<HandPlaceholderRemoveableComponent> ent, EntityUid user)
+    private void SpawnAndPickUpPlaceholder(Entity<HandPlaceholderRemoveableComponent> ent, BaseContainer container)
     {
         if (_net.IsServer)
         {
@@ -71,7 +56,7 @@ private void SpawnAndPickUpPlaceholder(Entity<HandPlaceholderRemoveableComponent
             if (_proto.TryIndex(ent.Comp.Prototype, out var itemProto))
                 _metadata.SetEntityName(placeholder, itemProto.Name);
 
-            if (!_hands.TryPickup(user, placeholder)) // Can we get the hand this came from?
+            if (!_container.Insert(placeholder, container, force: true))
                 QueueDel(placeholder);
         }
     }

Content.Shared/_NF/Standing/PreventDropOnDownedComponent.cs

@@ -0,0 +1,7 @@
+namespace Content.Shared._NF.Standing;
+
+/// <summary>
+/// This component prevents an entity from dropping its held items when it falls over.
+/// </summary>
+[RegisterComponent]
+public sealed partial class PreventDropOnDownedComponent : Component;

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -258,6 +258,7 @@
     - PsionicInvisibility
     - Normal
   - type: JetpackUser # DeltaV: Lets cyborgs fly in space
+  - type: PreventDropOnDowned # Frontier: borgs don't drop items when falling (e.g. critical/dead)
 
 - type: entity
   abstract: true