Replace the teleportation logic on the SCRAM implant!

Content.Server/Implants/Components/ScramImplantComponent.cs

@@ -15,12 +15,6 @@ public sealed partial class ScramImplantComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float TeleportRadius = 100f;
 
-    /// <summary>
-    /// How many times to check for a valid tile to teleport to
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadOnly)]
-    public int TeleportAttempts = 20;
-
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
 }

Content.Server/Implants/SubdermalImplantSystem.cs

@@ -1,4 +1,5 @@
-using Content.Server.Cuffs;
+using System.Linq;
+using Content.Server.Cuffs;
 using Content.Server.Forensics;
 using Content.Server.Humanoid;
 using Content.Server.Implants.Components;
@@ -21,6 +22,7 @@
 using System.Numerics;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Implants;
 
@@ -37,6 +39,8 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
     [Dependency] private readonly SharedTransformSystem _xform = default!;
     [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
     [Dependency] private readonly PullingSystem _pullingSystem = default!;
+    [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
 
@@ -107,42 +111,84 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
             _pullingSystem.TryStopPull(ent, pull);
 
         var xform = Transform(ent);
-        var entityCoords = xform.Coordinates.ToMap(EntityManager, _xform);
+        var targetCoords = SelectRandomTileInRange(xform, implant.TeleportRadius);
 
-        // try to find a valid position to teleport to, teleport to whatever works if we can't
-        var targetCoords = new MapCoordinates();
-        for (var i = 0; i < implant.TeleportAttempts; i++)
+        if (targetCoords != null)
         {
-            var distance = implant.TeleportRadius * MathF.Sqrt(_random.NextFloat()); // to get an uniform distribution
-            targetCoords = entityCoords.Offset(_random.NextAngle().ToVec() * distance);
+            _xform.SetWorldPosition(ent, targetCoords.Value.Position);
+            _xform.AttachToGridOrMap(ent, xform);
+            _audio.PlayPvs(implant.TeleportSound, ent);
+            args.Handled = true;
+        }
+    }
 
-            // prefer teleporting to grids
-            if (!_mapManager.TryFindGridAt(targetCoords, out var gridUid, out var grid))
-                continue;
+    private MapCoordinates? SelectRandomTileInRange(TransformComponent userXform, float radius)
+    {
+        var userCoords = userXform.Coordinates.ToMap(EntityManager, _xform);
+        var grids = _lookupSystem.GetEntitiesInRange<MapGridComponent>(userCoords, radius).ToList();
+        _random.Shuffle(grids);
 
-            // the implant user probably does not want to be in your walls
-            var valid = true;
-            foreach (var entity in grid.GetAnchoredEntities(targetCoords))
+        // Give preference to the grid the entity is currently on.
+        var idx = grids.FindIndex(grid => grid.Owner == userXform.GridUid);
+        if (idx != -1)
+        {
+            if (_random.Prob(0.66f))
+            {
+                (grids[0], grids[idx]) = (grids[idx], grids[0]);
+            }
+            else
             {
-                if (!_physicsQuery.TryGetComponent(entity, out var body))
-                    continue;
+                (grids[^1], grids[idx]) = (grids[idx], grids[^1]);
+            }
+        }
 
-                if (body.BodyType != BodyType.Static ||
-                    !body.Hard ||
-                    (body.CollisionLayer & (int) CollisionGroup.Impassable) == 0)
-                    continue;
+        MapCoordinates? targetCoords = null;
 
-                valid = false;
-                break;
+        foreach (var grid in grids)
+        {
+            var valid = false;
+
+            var range = (float) Math.Sqrt(radius);
+            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
+            var tilesInRange = _mapSystem.GetTilesEnumerator(grid.Owner, grid.Comp, box, false);
+            var tileList = new List<TileRef>();
+
+            while (tilesInRange.MoveNext(out var tile))
+            {
+                tileList.Add(tile);
             }
+
+            _random.Shuffle(tileList);
+
+            foreach (var tile in tileList)
+            {
+                valid = true;
+                foreach(var entity in _mapSystem.GetAnchoredEntities(grid.Owner, grid.Comp, tile.GridIndices))
+                {
+                    if (!_physicsQuery.TryGetComponent(entity, out var body))
+                        continue;
+
+                    if (body.BodyType != BodyType.Static ||
+                        !body.Hard ||
+                        (body.CollisionLayer & (int) CollisionGroup.Impassable) == 0)
+                        continue;
+
+                    valid = false;
+                    break;
+                }
+
+                if (valid)
+                {
+                    targetCoords = _mapSystem.GridTileToWorld(grid.Owner, grid.Comp, tile.GridIndices);
+                    break;
+                }
+            }
+
             if (valid)
                 break;
         }
-        _xform.SetWorldPosition(ent, targetCoords.Position);
-        _xform.AttachToGridOrMap(ent, xform);
-        _audio.PlayPvs(implant.TeleportSound, ent);
 
-        args.Handled = true;
+        return targetCoords;
     }
 
     private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent component, UseDnaScramblerImplantEvent args)