From 0e1ff2644f098688a49bf7b0bba59eb97c815da4 Mon Sep 17 00:00:00 2001 From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:01:28 -0400 Subject: [PATCH] Command resolve killing and LEC conversions batch 2 (#38367) commit progress --- Content.Server/Movement/LockEyesCommand.cs | 16 +++---- Content.Server/Movement/RotateEyesCommand.cs | 16 ++++--- Content.Server/NPC/Commands/NPCCommand.cs | 14 +++---- .../Power/SetBatteryPercentCommand.cs | 27 ++++++------ .../Systems/RadiationSystem.Debug.cs | 13 +++--- Content.Server/Roles/AddRoleCommand.cs | 37 ++++++++-------- Content.Server/Roles/ListRolesCommand.cs | 15 +++---- Content.Server/Roles/RemoveRoleCommand.cs | 31 +++++++------- .../StartSingularityEngineCommand.cs | 42 +++++++++---------- .../Locale/en-US/commands/eye-commands.ftl | 10 +++++ .../Locale/en-US/commands/npc-command.ftl | 2 + .../en-US/commands/radiation-command.ftl | 2 + .../Locale/en-US/commands/role-commands.ftl | 12 ++++++ .../commands/set-battery-percent-command.ftl | 4 ++ .../commands/start-singularity-command.ftl | 2 + Resources/Locale/en-US/movement/eye.ftl | 10 ----- .../en-US/radiation/radiation-command.ftl | 2 - Resources/Locale/en-US/shell.ftl | 1 + 18 files changed, 130 insertions(+), 126 deletions(-) create mode 100644 Resources/Locale/en-US/commands/eye-commands.ftl create mode 100644 Resources/Locale/en-US/commands/npc-command.ftl create mode 100644 Resources/Locale/en-US/commands/radiation-command.ftl create mode 100644 Resources/Locale/en-US/commands/role-commands.ftl create mode 100644 Resources/Locale/en-US/commands/set-battery-percent-command.ftl create mode 100644 Resources/Locale/en-US/commands/start-singularity-command.ftl delete mode 100644 Resources/Locale/en-US/movement/eye.ftl delete mode 100644 Resources/Locale/en-US/radiation/radiation-command.ftl diff --git a/Content.Server/Movement/LockEyesCommand.cs b/Content.Server/Movement/LockEyesCommand.cs index fd9854041e..006d8b4dce 100644 --- a/Content.Server/Movement/LockEyesCommand.cs +++ b/Content.Server/Movement/LockEyesCommand.cs @@ -6,16 +6,17 @@ using Robust.Shared.Console; namespace Content.Server.Movement; [AdminCommand(AdminFlags.Fun)] -public sealed class LockEyesCommand : IConsoleCommand +public sealed class LockEyesCommand : LocalizedEntityCommands { - public string Command => $"lockeyes"; - public string Description => Loc.GetString("lockeyes-command-description"); - public string Help => Loc.GetString("lockeyes-command-help"); - public void Execute(IConsoleShell shell, string argStr, string[] args) + [Dependency] private readonly SharedMoverController _controller = default!; + + public override string Command => $"lockeyes"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 1) { - shell.WriteError(Loc.GetString("shell-wrong-arguments-number")); + shell.WriteError(Loc.GetString("shell-need-exactly-one-argument")); return; } @@ -25,7 +26,6 @@ public sealed class LockEyesCommand : IConsoleCommand return; } - var system = IoCManager.Resolve().GetEntitySystem(); - system.CameraRotationLocked = value; + _controller.CameraRotationLocked = value; } } diff --git a/Content.Server/Movement/RotateEyesCommand.cs b/Content.Server/Movement/RotateEyesCommand.cs index 733d341820..7fff4b5ad6 100644 --- a/Content.Server/Movement/RotateEyesCommand.cs +++ b/Content.Server/Movement/RotateEyesCommand.cs @@ -6,14 +6,12 @@ using Robust.Shared.Console; namespace Content.Server.Movement; [AdminCommand(AdminFlags.Fun)] -public sealed class RotateEyesCommand : IConsoleCommand +public sealed class RotateEyesCommand : LocalizedEntityCommands { - public string Command => "rotateeyes"; - public string Description => Loc.GetString("rotateeyes-command-description"); - public string Help => Loc.GetString("rotateeyes-command-help"); - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override string Command => "rotateeyes"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) { - var entManager = IoCManager.Resolve(); var rotation = Angle.Zero; if (args.Length == 1) @@ -28,7 +26,7 @@ public sealed class RotateEyesCommand : IConsoleCommand } var count = 0; - var query = entManager.EntityQueryEnumerator(); + var query = EntityManager.EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var mover)) { if (mover.TargetRelativeRotation.Equals(rotation)) @@ -36,10 +34,10 @@ public sealed class RotateEyesCommand : IConsoleCommand mover.TargetRelativeRotation = rotation; - entManager.Dirty(uid, mover); + EntityManager.Dirty(uid, mover); count++; } - shell.WriteLine(Loc.GetString("rotateeyes-command-count", ("count", count))); + shell.WriteLine(Loc.GetString("cmd-rotateeyes-command-count", ("count", count))); } } diff --git a/Content.Server/NPC/Commands/NPCCommand.cs b/Content.Server/NPC/Commands/NPCCommand.cs index e1e432e1a4..451d440f45 100644 --- a/Content.Server/NPC/Commands/NPCCommand.cs +++ b/Content.Server/NPC/Commands/NPCCommand.cs @@ -7,12 +7,13 @@ using Robust.Shared.Console; namespace Content.Server.NPC.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class NPCCommand : IConsoleCommand +public sealed class NpcCommand : LocalizedEntityCommands { - public string Command => "npc"; - public string Description => "Opens the debug window for NPCs"; - public string Help => $"{Command}"; - public void Execute(IConsoleShell shell, string argStr, string[] args) + [Dependency] private readonly EuiManager _euiManager = default!; + + public override string Command => "npc"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (shell.Player is not { } playerSession) { @@ -20,7 +21,6 @@ public sealed class NPCCommand : IConsoleCommand return; } - var euiManager = IoCManager.Resolve(); - euiManager.OpenEui(new NPCEui(), playerSession); + _euiManager.OpenEui(new NPCEui(), playerSession); } } diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs index b73cf63069..7ceee20172 100644 --- a/Content.Server/Power/SetBatteryPercentCommand.cs +++ b/Content.Server/Power/SetBatteryPercentCommand.cs @@ -7,41 +7,40 @@ using Robust.Shared.Console; namespace Content.Server.Power { [AdminCommand(AdminFlags.Debug)] - public sealed class SetBatteryPercentCommand : IConsoleCommand + public sealed class SetBatteryPercentCommand : LocalizedEntityCommands { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly BatterySystem _batterySystem = default!; - public string Command => "setbatterypercent"; - public string Description => "Drains or recharges a battery by entity uid and percentage, i.e.: forall with Battery do setbatterypercent $ID 0"; - public string Help => $"{Command} "; + public override string Command => "setbatterypercent"; - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 2) { - shell.WriteLine($"Invalid amount of arguments.\n{Help}"); + shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific", + ("properAmount", 2), + ("currentAmount", args.Length))); return; } - if (!NetEntity.TryParse(args[0], out var netEnt) || !_entManager.TryGetEntity(netEnt, out var id)) + if (!NetEntity.TryParse(args[0], out var netEnt) || !EntityManager.TryGetEntity(netEnt, out var id)) { - shell.WriteLine($"{args[0]} is not a valid entity id."); + shell.WriteLine(Loc.GetString($"shell-invalid-entity-uid", ("uid", args[0]))); return; } if (!float.TryParse(args[1], out var percent)) { - shell.WriteLine($"{args[1]} is not a valid float (percentage)."); + shell.WriteLine(Loc.GetString($"cmd-setbatterypercent-not-valid-percent", ("arg", args[1]))); return; } - if (!_entManager.TryGetComponent(id, out var battery)) + if (!EntityManager.TryGetComponent(id, out var battery)) { - shell.WriteLine($"No battery found with id {id}."); + shell.WriteLine(Loc.GetString($"cmd-setbatterypercent-battery-not-found", ("id", id))); return; } - var system = IoCManager.Resolve().GetEntitySystem(); - system.SetCharge(id.Value, battery.MaxCharge * percent / 100, battery); + _batterySystem.SetCharge(id.Value, battery.MaxCharge * percent / 100, battery); // Don't acknowledge b/c people WILL forall this } } diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs index 4436090565..f2eac9be6c 100644 --- a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs +++ b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs @@ -89,19 +89,18 @@ public partial class RadiationSystem /// Toggle visibility of radiation rays coming from rad sources. /// [AdminCommand(AdminFlags.Admin)] -public sealed class RadiationViewCommand : IConsoleCommand +public sealed class RadiationViewCommand : LocalizedEntityCommands { - public string Command => "showradiation"; - public string Description => Loc.GetString("radiation-command-description"); - public string Help => Loc.GetString("radiation-command-help"); + [Dependency] private readonly RadiationSystem _radiation = default!; - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override string Command => "showradiation"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) { var session = shell.Player; if (session == null) return; - var entityManager = IoCManager.Resolve(); - entityManager.System().ToggleDebugView(session); + _radiation.ToggleDebugView(session); } } diff --git a/Content.Server/Roles/AddRoleCommand.cs b/Content.Server/Roles/AddRoleCommand.cs index e510d24ac0..6337657612 100644 --- a/Content.Server/Roles/AddRoleCommand.cs +++ b/Content.Server/Roles/AddRoleCommand.cs @@ -10,53 +10,50 @@ using Robust.Shared.Prototypes; namespace Content.Server.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class AddRoleCommand : IConsoleCommand + public sealed class AddRoleCommand : LocalizedEntityCommands { - [Dependency] private readonly EntityManager _entityManager = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly JobSystem _jobSystem = default!; - public string Command => "addrole"; + public override string Command => "addrole"; - public string Description => "Adds a role to a player's mind."; - - public string Help => "addrole "; - - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 2) { - shell.WriteLine("Expected exactly 2 arguments."); + shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific", + ("properAmount", 2), + ("currentAmount", args.Length))); return; } - var mgr = IoCManager.Resolve(); - if (!mgr.TryGetPlayerDataByUsername(args[0], out var data)) + if (!_playerManager.TryGetPlayerDataByUsername(args[0], out var data)) { - shell.WriteLine("Can't find that mind"); + shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found")); return; } var mind = data.ContentData()?.Mind; if (mind == null) { - shell.WriteLine("Can't find that mind"); + shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found")); return; } - var prototypeManager = IoCManager.Resolve(); - if (!prototypeManager.TryIndex(args[1], out var jobPrototype)) + if (!_prototypeManager.TryIndex(args[1], out var jobPrototype)) { - shell.WriteLine("Can't find that role"); + shell.WriteLine(Loc.GetString($"cmd-addrole-role-not-found")); return; } - var jobs = _entityManager.System(); - if (jobs.MindHasJobWithId(mind, jobPrototype.Name)) + if (_jobSystem.MindHasJobWithId(mind, jobPrototype.Name)) { - shell.WriteLine("Mind already has that role"); + shell.WriteLine(Loc.GetString($"cmd-addrole-mind-already-has-role")); return; } - jobs.MindAddJob(mind.Value, args[1]); + _jobSystem.MindAddJob(mind.Value, args[1]); } } } diff --git a/Content.Server/Roles/ListRolesCommand.cs b/Content.Server/Roles/ListRolesCommand.cs index 41f6704249..22c8491591 100644 --- a/Content.Server/Roles/ListRolesCommand.cs +++ b/Content.Server/Roles/ListRolesCommand.cs @@ -7,24 +7,21 @@ using Robust.Shared.Prototypes; namespace Content.Server.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class ListRolesCommand : IConsoleCommand + public sealed class ListRolesCommand : LocalizedCommands { - public string Command => "listroles"; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - public string Description => "Lists roles"; + public override string Command => "listroles"; - public string Help => "listroles"; - - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 0) { - shell.WriteLine("Expected no arguments."); + shell.WriteLine(Loc.GetString($"shell-need-exactly-zero-arguments")); return; } - var prototypeManager = IoCManager.Resolve(); - foreach(var job in prototypeManager.EnumeratePrototypes()) + foreach(var job in _prototypeManager.EnumeratePrototypes()) { shell.WriteLine(job.ID); } diff --git a/Content.Server/Roles/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs index c6e11cee22..2d18415067 100644 --- a/Content.Server/Roles/RemoveRoleCommand.cs +++ b/Content.Server/Roles/RemoveRoleCommand.cs @@ -9,28 +9,27 @@ using Robust.Shared.Console; namespace Content.Server.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class RemoveRoleCommand : IConsoleCommand + public sealed class RemoveRoleCommand : LocalizedEntityCommands { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly SharedJobSystem _jobs = default!; + [Dependency] private readonly SharedRoleSystem _roles = default!; - public string Command => "rmrole"; + public override string Command => "rmrole"; - public string Description => "Removes a role from a player's mind."; - - public string Help => "rmrole \nThat role type is the actual C# type name."; - - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 2) { - shell.WriteLine("Expected exactly 2 arguments."); + shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific", + ("properAmount", 2), + ("currentAmount", args.Length))); return; } - var mgr = IoCManager.Resolve(); - if (!mgr.TryGetPlayerDataByUsername(args[0], out var data)) + if (!_playerManager.TryGetPlayerDataByUsername(args[0], out var data)) { - shell.WriteLine("Can't find that mind"); + shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found")); return; } @@ -38,14 +37,12 @@ namespace Content.Server.Roles if (mind == null) { - shell.WriteLine("Can't find that mind"); + shell.WriteLine(Loc.GetString($"cmd-addrole-mind-not-found")); return; } - var roles = _entityManager.System(); - var jobs = _entityManager.System(); - if (jobs.MindHasJobWithId(mind, args[1])) - roles.MindRemoveRole(mind.Value); + if (_jobs.MindHasJobWithId(mind, args[1])) + _roles.MindRemoveRole(mind.Value); } } } diff --git a/Content.Server/Singularity/StartSingularityEngineCommand.cs b/Content.Server/Singularity/StartSingularityEngineCommand.cs index a373c0da5e..0eb8e5ff46 100644 --- a/Content.Server/Singularity/StartSingularityEngineCommand.cs +++ b/Content.Server/Singularity/StartSingularityEngineCommand.cs @@ -12,57 +12,53 @@ using Robust.Shared.Console; namespace Content.Server.Singularity { [AdminCommand(AdminFlags.Admin)] - public sealed class StartSingularityEngineCommand : IConsoleCommand + public sealed class StartSingularityEngineCommand : LocalizedEntityCommands { - public string Command => "startsingularityengine"; - public string Description => "Automatically turns on the particle accelerator and containment field emitters."; - public string Help => $"{Command}"; + [Dependency] private readonly EmitterSystem _emitterSystem = default!; + [Dependency] private readonly MultipartMachineSystem _multipartSystem = default!; + [Dependency] private readonly ParticleAcceleratorSystem _paSystem = default!; + [Dependency] private readonly RadiationCollectorSystem _radCollectorSystem = default!; - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override string Command => "startsingularityengine"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 0) { - shell.WriteLine($"Invalid amount of arguments: {args.Length}.\n{Help}"); + shell.WriteLine(Loc.GetString($"shell-need-exactly-zero-arguments")); return; } - var entityManager = IoCManager.Resolve(); - var entitySystemManager = IoCManager.Resolve(); - // Turn on emitters - var emitterQuery = entityManager.EntityQueryEnumerator(); - var emitterSystem = entitySystemManager.GetEntitySystem(); + var emitterQuery = EntityManager.EntityQueryEnumerator(); while (emitterQuery.MoveNext(out var uid, out var emitterComponent)) { //FIXME: This turns on ALL emitters, including APEs. It should only turn on the containment field emitters. - emitterSystem.SwitchOn(uid, emitterComponent); + _emitterSystem.SwitchOn(uid, emitterComponent); } // Turn on radiation collectors - var radiationCollectorQuery = entityManager.EntityQueryEnumerator(); - var radiationCollectorSystem = entitySystemManager.GetEntitySystem(); + var radiationCollectorQuery = EntityManager.EntityQueryEnumerator(); while (radiationCollectorQuery.MoveNext(out var uid, out var radiationCollectorComponent)) { - radiationCollectorSystem.SetCollectorEnabled(uid, enabled: true, user: null, radiationCollectorComponent); + _radCollectorSystem.SetCollectorEnabled(uid, enabled: true, user: null, radiationCollectorComponent); } // Setup PA - var multipartMachineManager = entitySystemManager.GetEntitySystem(); - var paSystem = entitySystemManager.GetEntitySystem(); - var paQuery = entityManager.EntityQueryEnumerator(); + var paQuery = EntityManager.EntityQueryEnumerator(); while (paQuery.MoveNext(out var paId, out var paControl)) { - if (!entityManager.TryGetComponent(paId, out var machine)) + if (!EntityManager.TryGetComponent(paId, out var machine)) continue; - if (!multipartMachineManager.Rescan((paId, machine))) + if (!_multipartSystem.Rescan((paId, machine))) continue; - paSystem.SetStrength(paId, ParticleAcceleratorPowerState.Level0, comp: paControl); - paSystem.SwitchOn(paId, comp: paControl); + _paSystem.SetStrength(paId, ParticleAcceleratorPowerState.Level0, comp: paControl); + _paSystem.SwitchOn(paId, comp: paControl); } - shell.WriteLine("Done!"); + shell.WriteLine(Loc.GetString($"shell-command-success")); } } } diff --git a/Resources/Locale/en-US/commands/eye-commands.ftl b/Resources/Locale/en-US/commands/eye-commands.ftl new file mode 100644 index 0000000000..512c56cb60 --- /dev/null +++ b/Resources/Locale/en-US/commands/eye-commands.ftl @@ -0,0 +1,10 @@ +parse-bool-fail = Unable to parse {$arg} as a bool +parse-float-fail = Unable to parse {$arg} as a float + +cmd-lockeyes-desc = Prevents eyes from being rotated any further. +cmd-lockeyes-help = Usage: lockeyes + +cmd-rotateeyes-desc = Rotates every player's current eye to the specified rotation +cmd-rotateeyes-help = rotateeyes +cmd-rotateeyes-command-count = Set {$count} eye rotations + diff --git a/Resources/Locale/en-US/commands/npc-command.ftl b/Resources/Locale/en-US/commands/npc-command.ftl new file mode 100644 index 0000000000..37117437dd --- /dev/null +++ b/Resources/Locale/en-US/commands/npc-command.ftl @@ -0,0 +1,2 @@ +cmd-npc-desc = Opens the debug window for NPCs. +cmd-npc-help = Usage: npc diff --git a/Resources/Locale/en-US/commands/radiation-command.ftl b/Resources/Locale/en-US/commands/radiation-command.ftl new file mode 100644 index 0000000000..852ddc5437 --- /dev/null +++ b/Resources/Locale/en-US/commands/radiation-command.ftl @@ -0,0 +1,2 @@ +cmd-showradiation-desc = Toggle visibility of radiation rays coming from rad sources +cmd-showradiation-help = Usage: showradiation diff --git a/Resources/Locale/en-US/commands/role-commands.ftl b/Resources/Locale/en-US/commands/role-commands.ftl new file mode 100644 index 0000000000..ff8a2533e3 --- /dev/null +++ b/Resources/Locale/en-US/commands/role-commands.ftl @@ -0,0 +1,12 @@ +cmd-addrole-desc = Adds a role to a player's mind. +cmd-addrole-help = Usage: addrole +cmd-addrole-mind-not-found = Can't find that mind. +cmd-addrole-role-not-found = Can't find that role. +cmd-addrole-mind-already-has-role = Mind already has that role. + +cmd-listroles-desc = List all available roles. +cmd-listroles-help = Usage: listroles + +cmd-rmrole-desc = Removes a role from a player's mind. +cmd-rmrole-help = Usage: rmrole + The role type is the actual C# type name. diff --git a/Resources/Locale/en-US/commands/set-battery-percent-command.ftl b/Resources/Locale/en-US/commands/set-battery-percent-command.ftl new file mode 100644 index 0000000000..d7323e4831 --- /dev/null +++ b/Resources/Locale/en-US/commands/set-battery-percent-command.ftl @@ -0,0 +1,4 @@ +cmd-setbatterypercent-desc = Drains or recharges a battery by entity uid and percentage, i.e.: forall with Battery do setbatterypercent $ID 0 +cmd-setbatterypercent-help = Usage: setbatterypercent +cmd-setbatterypercent-battery-not-found = No battery found with id {$id}. +cmd-setbatterypercent-not-valid-percent = {$arg} is not a valid float (percentage). diff --git a/Resources/Locale/en-US/commands/start-singularity-command.ftl b/Resources/Locale/en-US/commands/start-singularity-command.ftl new file mode 100644 index 0000000000..26c9c6a4fd --- /dev/null +++ b/Resources/Locale/en-US/commands/start-singularity-command.ftl @@ -0,0 +1,2 @@ +cmd-startsingularityengine-desc = Automatically turns on the particle accelerator and containment field emitters. +cmd-startsingularityengine-help = Usage: startsingularityengine diff --git a/Resources/Locale/en-US/movement/eye.ftl b/Resources/Locale/en-US/movement/eye.ftl deleted file mode 100644 index fd3f1117b6..0000000000 --- a/Resources/Locale/en-US/movement/eye.ftl +++ /dev/null @@ -1,10 +0,0 @@ -parse-bool-fail = Unable to parse {$arg} as a bool -parse-float-fail = Unable to parse {$arg} as a float - -lockeyes-command-description = Prevents eyes from being rotated any further -lockeyes-command-help = lockeyes - -rotateeyes-command-description = Rotates every player's current eye to the specified rotation -rotateeyes-command-help = rotateeyes -rotateeyes-command-count = Set {$count} eye rotations - diff --git a/Resources/Locale/en-US/radiation/radiation-command.ftl b/Resources/Locale/en-US/radiation/radiation-command.ftl deleted file mode 100644 index d41b2a5207..0000000000 --- a/Resources/Locale/en-US/radiation/radiation-command.ftl +++ /dev/null @@ -1,2 +0,0 @@ -radiation-command-description = Toggle visibility of radiation rays coming from rad sources -radiation-command-help = Usage: showradiation diff --git a/Resources/Locale/en-US/shell.ftl b/Resources/Locale/en-US/shell.ftl index 3f4aea5ed2..3661c45cb0 100644 --- a/Resources/Locale/en-US/shell.ftl +++ b/Resources/Locale/en-US/shell.ftl @@ -19,6 +19,7 @@ shell-wrong-arguments-number = Wrong number of arguments. shell-need-between-arguments = Need {$lower} to {$upper} arguments! shell-need-minimum-arguments = Need at least {$minimum} arguments! shell-need-minimum-one-argument = Need at least one argument! +shell-need-exactly-zero-arguments = This command takes zero arguments. shell-argument-uid = EntityUid