Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix teleport here for grids (#17194)

Browse Source
This commit is contained in:
metalgearsloth
2023-06-08 05:38:52 +10:00
committed by GitHub
parent d2149f7eab
commit edea4c0549
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Administration/Systems/AdminVerbSystem.cs
View File

@@ -27,6 +27,7 @@ using Robust.Server.GameObjects;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Console; using Robust.Shared.Console;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -158,7 +159,21 @@ namespace Content.Server.Administration.Systems
Text = Loc.GetString("admin-verbs-teleport-here"), Text = Loc.GetString("admin-verbs-teleport-here"),
Category = VerbCategory.Admin, Category = VerbCategory.Admin,
Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/close.svg.192dpi.png")), 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 Impact = LogImpact.Low
}); });