tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/space-wizards/space-station-14

Browse Source
This commit is contained in:
DrSmugleaf
2021-11-22 20:59:30 +01:00
parent ff81f819e6 c46feaefb9
commit 3ba58e2d9c
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/GameTicking/Commands/MappingCommand.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Server.GameTicking.Commands
case 1:
if (player.AttachedEntity == null)
{
shell.WriteLine("The map name argument cannot be omitted if you have no entity.");
shell.WriteError("The map name argument cannot be omitted if you have no entity.");
return;
}
@@ -52,7 +52,7 @@ namespace Content.Server.GameTicking.Commands
case 2:
if (!int.TryParse(args[0], out var id))
{
shell.WriteLine($"{args[0]} is not a valid integer.");
shell.WriteError($"{args[0]} is not a valid integer.");
return;
}
@@ -66,7 +66,10 @@ namespace Content.Server.GameTicking.Commands
shell.ExecuteCommand($"addmap {mapId} false");
shell.ExecuteCommand($"loadbp {mapId} \"{CommandParsing.Escape(mapName)}\" true");
shell.ExecuteCommand("aghost");
if (player.AttachedEntity?.Prototype?.ID != "AdminObserver")
shell.ExecuteCommand("aghost");
shell.ExecuteCommand($"tp 0 0 {mapId}");
var newGrid = mapManager.GetAllGrids().OrderByDescending(g => (int) g.Index).First();