Context menu tweaks (#10883)

Content.Client/Verbs/VerbSystem.cs

@@ -21,6 +21,7 @@ using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Verbs
 {
@@ -130,43 +131,53 @@ namespace Content.Client.Verbs
             // remove any entities in containers
             if ((visibility & MenuVisibility.InContainer) == 0)
             {
-                foreach (var entity in entities.ToList())
+                for (var i = entities.Count - 1; i >= 0; i--)
                 {
-                    if (!ContainerSystem.IsInSameOrTransparentContainer(player.Value, entity))
+                    var entity = entities[i];
-                        entities.Remove(entity);
+
+                    if (ContainerSystem.IsInSameOrTransparentContainer(player.Value, entity))
+                        continue;
+
+                    entities.RemoveSwap(i);
                 }
             }
 
             // remove any invisible entities
             if ((visibility & MenuVisibility.Invisible) == 0)
             {
-                foreach (var entity in entities.ToList())
+                var spriteQuery = GetEntityQuery<SpriteComponent>();
-                {
+                var tagQuery = GetEntityQuery<TagComponent>();
-                    if (!EntityManager.TryGetComponent(entity, out ISpriteComponent? spriteComponent) ||
-                    !spriteComponent.Visible)
-                    {
-                        entities.Remove(entity);
-                        continue;
-                    }
 
-                    if (_tagSystem.HasTag(entity, "HideContextMenu"))
+                for (var i = entities.Count - 1; i >= 0; i--)
-                        entities.Remove(entity);
+                {
+                    var entity = entities[i];
+
+                    if (!spriteQuery.TryGetComponent(entity, out var spriteComponent) ||
+                        !spriteComponent.Visible ||
+                        _tagSystem.HasTag(entity, "HideContextMenu", tagQuery))
+                    {
+                        entities.RemoveSwap(i);
+                    }
                 }
             }
 
             // Remove any entities that do not have LOS
             if ((visibility & MenuVisibility.NoFov) == 0)
             {
-                var playerPos = EntityManager.GetComponent<TransformComponent>(player.Value).MapPosition;
+                var xformQuery = GetEntityQuery<TransformComponent>();
-                foreach (var entity in entities.ToList())
+                var playerPos = xformQuery.GetComponent(player.Value).MapPosition;
+
+                for (var i = entities.Count - 1; i >= 0; i--)
                 {
+                    var entity = entities[i];
+
                     if (!ExamineSystemShared.InRangeUnOccluded(
                         playerPos,
-                        EntityManager.GetComponent<TransformComponent>(entity).MapPosition,
+                        xformQuery.GetComponent(entity).MapPosition,
                         ExamineSystemShared.ExamineRange,
                         null))
                     {
-                        entities.Remove(entity);
+                        entities.RemoveSwap(i);
                     }
                 }
             }

Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml

@@ -6,7 +6,7 @@
     lifetime: 2
   - type: Sprite
     netsync: false
-    drawdepth: Effects
+    drawdepth: SmallMobs
     noRot: true
     layers:
     - shader: unshaded
@@ -14,6 +14,9 @@
       sprite: Effects/atmospherics.rsi
       state: frezon_old
   - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
   - type: AnimationPlayer
 
 - type: entity

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml

@@ -10,6 +10,9 @@
     - shader: unshaded
       map: ["enum.EffectLayers.Unshaded"]
   - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
   - type: AnimationPlayer
 
 - type: hitscan

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml

@@ -13,6 +13,9 @@
       sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
       state: impact_bullet
   - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
 
 - type: entity
   id: BulletImpactEffectDisabler
@@ -29,6 +32,9 @@
           sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
           state: impact_laser_blue
     - type: EffectVisuals
+    - type: Tag
+      tags:
+        - HideContextMenu
 
 - type: entity
   id: BulletImpactEffectKinetic
@@ -45,3 +51,6 @@
       sprite: Effects/arcs.rsi
       state: punch
   - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -13,6 +13,9 @@
       sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
       state: muzzle_bullet
   - type: EffectVisuals
+  - type: Tag
+    tags:
+      - HideContextMenu
   - type: AnimationPlayer
 
 # One bullet to bring them all into the darkness and bind them