diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index bc065745f5..5ac4bc4171 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -156,6 +156,19 @@ namespace Content.Server.Administration.Systems Impact = LogImpact.Extreme, ConfirmationPopup = true }); + + // Respawn + args.Verbs.Add(new Verb() + { + Text = Loc.GetString("admin-player-actions-respawn"), + Category = VerbCategory.Admin, + Act = () => + { + _console.ExecuteCommand(player, $"respawn {targetActor.PlayerSession.Name}"); + }, + ConfirmationPopup = true, + // No logimpact as the command does it internally. + }); } // Admin Logs @@ -211,21 +224,6 @@ namespace Content.Server.Administration.Systems Impact = LogImpact.Low }); - // Respawn - if (HasComp(args.Target)) - { - args.Verbs.Add(new Verb() - { - Text = Loc.GetString("admin-player-actions-respawn"), - Category = VerbCategory.Admin, - Act = () => - { - _console.ExecuteCommand(player, $"respawn {actor.PlayerSession.Name}"); - }, - ConfirmationPopup = true, - // No logimpact as the command does it internally. - }); - } } } diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 6b7763d14d..4e0beb10e7 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -1,4 +1,4 @@ -Name: Admin +Name: Admin AdminOnly: true Order: 1 Entries: @@ -66,3 +66,7 @@ Entries: - {message: 'AME and PA make a sound effect when they are being overloaded. Similar to being sent a fax.', type: Add} id: 10 time: '2023-11-07T15:03:00.0000000+00:00' +- author: nikthechampiongr + changes: + - {message: 'The respawn verb now respawns the targeted player instead of the admin', type: Fix} + time: '2023-11-22T16:39:00.0000000+00:00'