From 4442d5e277031aaa969305da1f83906a162285b1 Mon Sep 17 00:00:00 2001 From: Pancake Date: Thu, 27 Feb 2025 16:05:34 -0800 Subject: [PATCH] Unheck Admin Smites (#35348) * Fix admin verb names Fixed admin verb names. * Add antag verb names * Adjust antag verb icons --- .../Systems/AdminVerbSystem.Antags.cs | 42 +++++++++++-------- .../Systems/AdminVerbSystem.Smites.cs | 14 +++---- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 28918e960e5a..b8a05c3e8f39 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -52,23 +52,25 @@ private void AddAntagVerbs(GetVerbsEvent args) var targetPlayer = targetActor.PlayerSession; + var traitorName = Loc.GetString("admin-verb-text-make-traitor"); Verb traitor = new() { - Text = Loc.GetString("admin-verb-text-make-traitor"), + Text = traitorName, Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Structures/Wallmounts/posters.rsi"), "poster5_contraband"), + Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/job_icons.rsi"), "Syndicate"), Act = () => { _antag.ForceMakeAntag(targetPlayer, DefaultTraitorRule); }, Impact = LogImpact.High, - Message = Loc.GetString("admin-verb-make-traitor"), + Message = string.Join(": ", traitorName, Loc.GetString("admin-verb-make-traitor")), }; args.Verbs.Add(traitor); + var initialInfectedName = Loc.GetString("admin-verb-text-make-initial-infected"); Verb initialInfected = new() { - Text = Loc.GetString("admin-verb-text-make-initial-infected"), + Text = initialInfectedName, Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "InitialInfected"), Act = () => @@ -76,42 +78,44 @@ private void AddAntagVerbs(GetVerbsEvent args) _antag.ForceMakeAntag(targetPlayer, DefaultInitialInfectedRule); }, Impact = LogImpact.High, - Message = Loc.GetString("admin-verb-make-initial-infected"), + Message = string.Join(": ", initialInfectedName, Loc.GetString("admin-verb-make-initial-infected")), }; args.Verbs.Add(initialInfected); + var zombieName = Loc.GetString("admin-verb-text-make-zombie"); Verb zombie = new() { - Text = Loc.GetString("admin-verb-text-make-zombie"), + Text = zombieName, Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/Actions/zombie-turn.png")), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "Zombie"), Act = () => { _zombie.ZombifyEntity(args.Target); }, Impact = LogImpact.High, - Message = Loc.GetString("admin-verb-make-zombie"), + Message = string.Join(": ", zombieName, Loc.GetString("admin-verb-make-zombie")), }; args.Verbs.Add(zombie); - + var nukeOpName = Loc.GetString("admin-verb-text-make-nuclear-operative"); Verb nukeOp = new() { - Text = Loc.GetString("admin-verb-text-make-nuclear-operative"), + Text = nukeOpName, Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new("/Textures/Structures/Wallmounts/signs.rsi"), "radiation"), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hardsuits/syndicate.rsi"), "icon"), Act = () => { _antag.ForceMakeAntag(targetPlayer, DefaultNukeOpRule); }, Impact = LogImpact.High, - Message = Loc.GetString("admin-verb-make-nuclear-operative"), + Message = string.Join(": ", nukeOpName, Loc.GetString("admin-verb-make-nuclear-operative")), }; args.Verbs.Add(nukeOp); + var pirateName = Loc.GetString("admin-verb-text-make-pirate"); Verb pirate = new() { - Text = Loc.GetString("admin-verb-text-make-pirate"), + Text = pirateName, Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hats/pirate.rsi"), "icon"), Act = () => @@ -120,13 +124,14 @@ private void AddAntagVerbs(GetVerbsEvent args) SetOutfitCommand.SetOutfit(args.Target, PirateGearId, EntityManager); }, Impact = LogImpact.High, - Message = Loc.GetString("admin-verb-make-pirate"), + Message = string.Join(": ", pirateName, Loc.GetString("admin-verb-make-pirate")), }; args.Verbs.Add(pirate); + var headRevName = Loc.GetString("admin-verb-text-make-head-rev"); Verb headRev = new() { - Text = Loc.GetString("admin-verb-text-make-head-rev"), + Text = headRevName, Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "HeadRevolutionary"), Act = () => @@ -134,13 +139,14 @@ private void AddAntagVerbs(GetVerbsEvent args) _antag.ForceMakeAntag(targetPlayer, DefaultRevsRule); }, Impact = LogImpact.High, - Message = Loc.GetString("admin-verb-make-head-rev"), + Message = string.Join(": ", headRevName, Loc.GetString("admin-verb-make-head-rev")), }; args.Verbs.Add(headRev); + var thiefName = Loc.GetString("admin-verb-text-make-thief"); Verb thief = new() { - Text = Loc.GetString("admin-verb-text-make-thief"), + Text = thiefName, Category = VerbCategory.Antag, Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"), "icon"), Act = () => @@ -148,7 +154,7 @@ private void AddAntagVerbs(GetVerbsEvent args) _antag.ForceMakeAntag(targetPlayer, DefaultThiefRule); }, Impact = LogImpact.High, - Message = Loc.GetString("admin-verb-make-thief"), + Message = string.Join(": ", thiefName, Loc.GetString("admin-verb-make-thief")), }; args.Verbs.Add(thief); } diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index ed46412a084f..fca27f20c5d5 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -149,7 +149,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) var flamesName = Loc.GetString("admin-smite-set-alight-name").ToLowerInvariant(); Verb flames = new() { - Text = "admin-smite-set-alight-name", + Text = flamesName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Fire/fire.png")), Act = () => @@ -481,7 +481,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) var breadName = Loc.GetString("admin-smite-become-bread-name").ToLowerInvariant(); // Will I get cancelled for breadName-ing you? Verb bread = new() { - Text = "admin-smite-kill-sign-name", + Text = breadName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Consumable/Food/Baked/bread.rsi"), "plain"), Act = () => @@ -496,7 +496,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) var mouseName = Loc.GetString("admin-smite-become-mouse-name").ToLowerInvariant(); Verb mouse = new() { - Text = "admin-smite-cluwne-name", + Text = mouseName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Animals/mouse.rsi"), "icon-0"), Act = () => @@ -650,7 +650,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) var instrumentationName = Loc.GetString("admin-smite-become-instrument-name").ToLowerInvariant(); Verb instrumentation = new() { - Text = "admin-smite-become-mouse-name", + Text = instrumentationName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "supersynth"), Act = () => @@ -721,7 +721,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) var headstandName = Loc.GetString("admin-smite-headstand-name").ToLowerInvariant(); Verb headstand = new() { - Text = "admin-smite-run-walk-swap-name", + Text = headstandName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/refresh.svg.192dpi.png")), Act = () => @@ -819,7 +819,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) var superSpeedName = Loc.GetString("admin-smite-super-speed-name").ToLowerInvariant(); Verb superSpeed = new() { - Text = "admin-smite-garbage-can-name", + Text = superSpeedName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/super_speed.png")), Act = () => @@ -852,7 +852,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) args.Verbs.Add(superBonkLite); var superBonkName = Loc.GetString("admin-smite-super-bonk-name").ToLowerInvariant(); - Verb superBonk= new() + Verb superBonk = new() { Text = superBonkName, Category = VerbCategory.Smite,