Add viewer parameter to Identity.Entity (#35861)

* Add viewer parameter to Identity.Entity

* Docs

diff --git a/Content.Shared/IdentityManagement/Identity.cs b/Content.Shared/IdentityManagement/Identity.cs
index cdb3c81adacc53a7f349dd23a5f0896bc88b589d..836adfcdf851c3e0e17bd2df0a7b5d5d24709251 100644 (file)
--- a/Content.Shared/IdentityManagement/Identity.cs
+++ b/Content.Shared/IdentityManagement/Identity.cs
@@ -49,11 +49,17 @@ public static class Identity
     ///     This is an extension method because of its simplicity, and if it was any harder to call it might not
     ///     be used enough for loc.
     /// </summary>
-    public static EntityUid Entity(EntityUid uid, IEntityManager ent)
+    /// <param name="viewer">
+    ///     If this entity can see through identities, this method will always return the actual target entity.
+    /// </param>
+    public static EntityUid Entity(EntityUid uid, IEntityManager ent, EntityUid? viewer = null)
     {
         if (!ent.TryGetComponent<IdentityComponent>(uid, out var identity))
             return uid;
 
+        if (viewer != null && CanSeeThroughIdentity(uid, viewer.Value, ent))
+            return uid;
+
         return identity.IdentityEntitySlot.ContainedEntity ?? uid;
     }