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

Fix remove hands popup and remove single hand admin smite not being available (#19099)

Browse Source
This commit is contained in:
DrSmugleaf
2023-08-13 15:50:58 -07:00
committed by GitHub
parent 4538c2d9ae
commit 7ab11dd20b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
View File

@@ -5,7 +5,6 @@ using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.EntitySystems;
using Content.Server.Body.Components; using Content.Server.Body.Components;
using Content.Server.Body.Systems; using Content.Server.Body.Systems;
using Content.Server.Damage.Systems;
using Content.Server.Electrocution; using Content.Server.Electrocution;
using Content.Server.Explosion.EntitySystems; using Content.Server.Explosion.EntitySystems;
using Content.Server.GhostKick; using Content.Server.GhostKick;
@@ -25,7 +24,9 @@ using Content.Shared.Administration.Components;
using Content.Shared.Body.Components; using Content.Shared.Body.Components;
using Content.Shared.Body.Part; using Content.Shared.Body.Part;
using Content.Shared.Clothing.Components; using Content.Shared.Clothing.Components;
using Content.Shared.Cluwne;
using Content.Shared.Damage; using Content.Shared.Damage;
using Content.Shared.Damage.Systems;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Electrocution; using Content.Shared.Electrocution;
using Content.Shared.Interaction.Components; using Content.Shared.Interaction.Components;
@@ -49,8 +50,6 @@ using Robust.Shared.Player;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Timer = Robust.Shared.Timing.Timer; using Timer = Robust.Shared.Timing.Timer;
using Content.Shared.Cluwne;
using Content.Shared.Damage.Systems;
namespace Content.Server.Administration.Systems; namespace Content.Server.Administration.Systems;
@@ -322,7 +321,7 @@ public sealed partial class AdminVerbSystem
} }
_popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target, _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,
args.Target, PopupType.LargeCaution); args.Target, PopupType.LargeCaution);
_popupSystem.PopupCoordinates(Loc.GetString("admin-smite-remove-hands-others", ("name", args.Target)), baseXform.Coordinates, _popupSystem.PopupCoordinates(Loc.GetString("admin-smite-remove-hands-other", ("name", args.Target)), baseXform.Coordinates,
Filter.PvsExcept(args.Target), true, PopupType.Medium); Filter.PvsExcept(args.Target), true, PopupType.Medium);
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
@@ -332,7 +331,7 @@ public sealed partial class AdminVerbSystem
Verb handRemoval = new() Verb handRemoval = new()
{ {
Text = "Remove hands", Text = "Remove hand",
Category = VerbCategory.Smite, Category = VerbCategory.Smite,
Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/remove-hand.png")), Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/remove-hand.png")),
Act = () => Act = () =>
@@ -345,7 +344,7 @@ public sealed partial class AdminVerbSystem
} }
_popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target, _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,
args.Target, PopupType.LargeCaution); args.Target, PopupType.LargeCaution);
_popupSystem.PopupCoordinates(Loc.GetString("admin-smite-remove-hands-others", ("name", args.Target)), baseXform.Coordinates, _popupSystem.PopupCoordinates(Loc.GetString("admin-smite-remove-hands-other", ("name", args.Target)), baseXform.Coordinates,
Filter.PvsExcept(args.Target), true, PopupType.Medium); Filter.PvsExcept(args.Target), true, PopupType.Medium);
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,