NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix setmind command (#18799)

Browse source
This commit is contained in:
Leon Friedrich 2023-08-07 19:18:39 +12:00 • committed by GitHub
parent 6183640d02
commit 88b3417c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Content.Server/Administration/Commands/SetMindCommand.cs
View file

@ -10,7 +10,7 @@ namespace Content.Server.Administration.Commands
[AdminCommand(AdminFlags.Admin)]
sealed class SetMindCommand : IConsoleCommand
{
public string Command => "setmind";
public string Description => Loc.GetString("set-mind-command-description", ("requiredComponent", nameof(MindContainerComponent)));
@ -19,7 +19,7 @@ namespace Content.Server.Administration.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length != 2)
if (args.Length < 2)
{
shell.WriteLine(Loc.GetString("shell-wrong-arguments-number"));
return;
@ -31,6 +31,12 @@ namespace Content.Server.Administration.Commands
return;
}
bool ghostOverride = true;
if (args.Length > 2)
{
ghostOverride = bool.Parse(args[2]);
}
var entityManager = IoCManager.Resolve<IEntityManager>();
var eUid = new EntityUid(entityUid);
@ -62,7 +68,7 @@ namespace Content.Server.Administration.Commands
}
var mindSystem = entityManager.System<MindSystem>();
var mind = playerCData.Mind;
if (mind == null)
{
@ -70,7 +76,7 @@ namespace Content.Server.Administration.Commands
mind.CharacterName = entityManager.GetComponent<MetaDataComponent>(eUid).EntityName;
}
mindSystem.TransferTo(mind, eUid);
mindSystem.TransferTo(mind, eUid, ghostOverride);
}
}
}

6
Resources/Locale/en-US/administration/commands/set-mind-command.ftl
View file

@ -1,4 +1,4 @@
set-mind-command-description = Transfers a mind to the specified entity. The entity must have a {$requiredComponent}.
set-mind-command-help-text = Usage: {$command} <entityUid> <username>
set-mind-command-description = Transfers a mind to the specified entity. The entity must have a {$requiredComponent}. By default this will force minds that are currently visiting other entities to return (i.e., return a ghost to their main body).
set-mind-command-help-text = Usage: {$command} <entityUid> <username> [unvisit]
set-mind-command-target-has-no-content-data-message = Target player does not have content data (wtf?)
set-mind-command-target-has-no-mind-message = Target entity does not have a mind (did you forget to make sentient?)
set-mind-command-target-has-no-mind-message = Target entity does not have a mind (did you forget to make sentient?)