From edea4c054915e2cc012ac74ca0a2ac93825c7704 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 8 Jun 2023 05:38:52 +1000
Subject: [PATCH] Fix teleport here for grids (#17194)

---
 .../Administration/Systems/AdminVerbSystem.cs   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 4ed0bb9341..5b3c1efc8b 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -27,6 +27,7 @@ using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -158,7 +159,21 @@ namespace Content.Server.Administration.Systems
                     Text = Loc.GetString("admin-verbs-teleport-here"),
                     Category = VerbCategory.Admin,
                     Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/close.svg.192dpi.png")),
-                    Act = () => _console.ExecuteCommand(player, $"tpto {args.User} {args.Target}"),
+                    Act = () =>
+                    {
+                        if (HasComp<MapGridComponent>(args.Target))
+                        {
+                            if (player.AttachedEntity != null)
+                            {
+                                var mapPos = Transform(player.AttachedEntity.Value).MapPosition;
+                                _console.ExecuteCommand(player, $"tpgrid {args.Target} {mapPos.X} {mapPos.Y} {mapPos.MapId}");
+                            }
+                        }
+                        else
+                        {
+                            _console.ExecuteCommand(player, $"tpto {args.User} {args.Target}");
+                        }
+                    },
                     Impact = LogImpact.Low
                 });