Stable merge (#36192)

Content.Shared/Teleportation/Components/HandTeleporterComponent.cs

@@ -21,11 +21,17 @@ public sealed partial class HandTeleporterComponent : Component
     public EntityUid? SecondPortal = null;
 
     /// <summary>
-    ///     Portals can't be placed on different grids?
+    ///     Should the portals be able to be placed across grids?
     /// </summary>
     [DataField]
     public bool AllowPortalsOnDifferentGrids;
 
+    /// <summary>
+    ///     Should the portals work across maps?
+    /// </summary>
+    [DataField]
+    public bool AllowPortalsOnDifferentMaps;
+
     [DataField("firstPortalPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string FirstPortalPrototype = "PortalRed";