From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Wed, 16 Oct 2024 22:24:31 +0000 (-0400) Subject: Fix omega cursed smite code. (#32844) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8cafd7261d04114bfaa3a3181a6737d6bcbba462;p=space-station-14.git Fix omega cursed smite code. (#32844) * le fixo smotes * CURSE OF BLINDNESS * Guh --- diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index e4554d7d83..d81699c82d 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -95,9 +95,10 @@ public sealed partial class AdminVerbSystem if (HasComp(args.Target) || HasComp(args.Target)) return; + var explodeName = Loc.GetString("admin-smite-explode-name").ToLowerInvariant(); Verb explode = new() { - Text = "admin-smite-explode-name", + Text = explodeName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/smite.svg.192dpi.png")), Act = () => @@ -111,13 +112,14 @@ public sealed partial class AdminVerbSystem _bodySystem.GibBody(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-explode-description") + Message = string.Join(": ", explodeName, Loc.GetString("admin-smite-explode-description")) // we do this so the description tells admins the Text to run it via console. }; args.Verbs.Add(explode); + var chessName = Loc.GetString("admin-smite-chess-dimension-name").ToLowerInvariant(); Verb chess = new() { - Text = "admin-smite-chess-dimension-name", + Text = chessName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Tabletop/chessboard.rsi"), "chessboard"), Act = () => @@ -137,12 +139,13 @@ public sealed partial class AdminVerbSystem xform.WorldRotation = Angle.Zero; }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-chess-dimension-description") + Message = string.Join(": ", chessName, Loc.GetString("admin-smite-chess-dimension-description")) }; args.Verbs.Add(chess); if (TryComp(args.Target, out var flammable)) { + var flamesName = Loc.GetString("admin-smite-set-alight-name").ToLowerInvariant(); Verb flames = new() { Text = "admin-smite-set-alight-name", @@ -160,14 +163,15 @@ public sealed partial class AdminVerbSystem Filter.PvsExcept(args.Target), true, PopupType.MediumCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-set-alight-description") + Message = string.Join(": ", flamesName, Loc.GetString("admin-smite-set-alight-description")) }; args.Verbs.Add(flames); } + var monkeyName = Loc.GetString("admin-smite-monkeyify-name").ToLowerInvariant(); Verb monkey = new() { - Text = "admin-smite-monkeyify-name", + Text = monkeyName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Animals/monkey.rsi"), "monkey"), Act = () => @@ -175,13 +179,14 @@ public sealed partial class AdminVerbSystem _polymorphSystem.PolymorphEntity(args.Target, "AdminMonkeySmite"); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-monkeyify-description") + Message = string.Join(": ", monkeyName, Loc.GetString("admin-smite-monkeyify-description")) }; args.Verbs.Add(monkey); + var disposalBinName = Loc.GetString("admin-smite-garbage-can-name").ToLowerInvariant(); Verb disposalBin = new() { - Text = "admin-smite-electrocute-name", + Text = disposalBinName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Structures/Piping/disposal.rsi"), "disposal"), Act = () => @@ -189,16 +194,17 @@ public sealed partial class AdminVerbSystem _polymorphSystem.PolymorphEntity(args.Target, "AdminDisposalsSmite"); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-garbage-can-description") + Message = string.Join(": ", disposalBinName, Loc.GetString("admin-smite-garbage-can-description")) }; args.Verbs.Add(disposalBin); if (TryComp(args.Target, out var damageable) && HasComp(args.Target)) { + var hardElectrocuteName = Loc.GetString("admin-smite-electrocute-name").ToLowerInvariant(); Verb hardElectrocute = new() { - Text = "admin-smite-creampie-name", + Text = hardElectrocuteName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Clothing/Hands/Gloves/Color/yellow.rsi"), "icon"), Act = () => @@ -234,16 +240,17 @@ public sealed partial class AdminVerbSystem TimeSpan.FromSeconds(30), refresh: true, ignoreInsulation: true); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-electrocute-description") + Message = string.Join(": ", hardElectrocuteName, Loc.GetString("admin-smite-electrocute-description")) }; args.Verbs.Add(hardElectrocute); } if (TryComp(args.Target, out var creamPied)) { + var creamPieName = Loc.GetString("admin-smite-creampie-name").ToLowerInvariant(); Verb creamPie = new() { - Text = "admin-smite-remove-blood-name", + Text = creamPieName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Consumable/Food/Baked/pie.rsi"), "plain-slice"), Act = () => @@ -251,16 +258,17 @@ public sealed partial class AdminVerbSystem _creamPieSystem.SetCreamPied(args.Target, creamPied, true); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-creampie-description") + Message = string.Join(": ", creamPieName, Loc.GetString("admin-smite-creampie-description")) }; args.Verbs.Add(creamPie); } if (TryComp(args.Target, out var bloodstream)) { + var bloodRemovalName = Loc.GetString("admin-smite-remove-blood-name").ToLowerInvariant(); Verb bloodRemoval = new() { - Text = "admin-smite-vomit-organs-name", + Text = bloodRemovalName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Fluids/tomato_splat.rsi"), "puddle-1"), Act = () => @@ -273,7 +281,7 @@ public sealed partial class AdminVerbSystem Filter.PvsExcept(args.Target), true, PopupType.MediumCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-remove-blood-description") + Message = string.Join(": ", bloodRemovalName, Loc.GetString("admin-smite-remove-blood-description")) }; args.Verbs.Add(bloodRemoval); } @@ -281,9 +289,10 @@ public sealed partial class AdminVerbSystem // bobby... if (TryComp(args.Target, out var body)) { + var vomitOrgansName = Loc.GetString("admin-smite-vomit-organs-name").ToLowerInvariant(); Verb vomitOrgans = new() { - Text = "admin-smite-remove-hands-name", + Text = vomitOrgansName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"), Act = () => @@ -305,13 +314,14 @@ public sealed partial class AdminVerbSystem Filter.PvsExcept(args.Target), true, PopupType.MediumCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-vomit-organs-description") + Message = string.Join(": ", vomitOrgansName, Loc.GetString("admin-smite-vomit-organs-description")) }; args.Verbs.Add(vomitOrgans); + var handsRemovalName = Loc.GetString("admin-smite-remove-hands-name").ToLowerInvariant(); Verb handsRemoval = new() { - Text = "admin-smite-remove-hand-name", + Text = handsRemovalName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/remove-hands.png")), Act = () => @@ -327,13 +337,14 @@ public sealed partial class AdminVerbSystem Filter.PvsExcept(args.Target), true, PopupType.Medium); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-remove-hands-description") + Message = string.Join(": ", handsRemovalName, Loc.GetString("admin-smite-remove-hands-description")) }; args.Verbs.Add(handsRemoval); + var handRemovalName = Loc.GetString("admin-smite-remove-hand-name").ToLowerInvariant(); Verb handRemoval = new() { - Text = "admin-smite-pinball-name", + Text = handRemovalName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/remove-hand.png")), Act = () => @@ -350,13 +361,14 @@ public sealed partial class AdminVerbSystem Filter.PvsExcept(args.Target), true, PopupType.Medium); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-remove-hand-description") + Message = string.Join(": ", handRemovalName, Loc.GetString("admin-smite-remove-hand-description")) }; args.Verbs.Add(handRemoval); + var stomachRemovalName = Loc.GetString("admin-smite-stomach-removal-name").ToLowerInvariant(); Verb stomachRemoval = new() { - Text = "admin-smite-yeet-name", + Text = stomachRemovalName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"), Act = () => @@ -370,13 +382,14 @@ public sealed partial class AdminVerbSystem args.Target, PopupType.LargeCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-stomach-removal-description"), + Message = string.Join(": ", stomachRemovalName, Loc.GetString("admin-smite-stomach-removal-description")) }; args.Verbs.Add(stomachRemoval); + var lungRemovalName = Loc.GetString("admin-smite-lung-removal-name").ToLowerInvariant(); Verb lungRemoval = new() { - Text = "admin-smite-become-bread-name", + Text = lungRemovalName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"), Act = () => @@ -390,16 +403,17 @@ public sealed partial class AdminVerbSystem args.Target, PopupType.LargeCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-lung-removal-description"), + Message = string.Join(": ", lungRemovalName, Loc.GetString("admin-smite-lung-removal-description")) }; args.Verbs.Add(lungRemoval); } if (TryComp(args.Target, out var physics)) { + var pinballName = Loc.GetString("admin-smite-pinball-name").ToLowerInvariant(); Verb pinball = new() { - Text = "admin-smite-ghostkick-name", + Text = pinballName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/toys.rsi"), "basketball"), Act = () => @@ -427,13 +441,14 @@ public sealed partial class AdminVerbSystem _physics.SetAngularDamping(args.Target, physics, 0f); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-pinball-description") + Message = string.Join(": ", pinballName, Loc.GetString("admin-smite-pinball-description")) }; args.Verbs.Add(pinball); + var yeetName = Loc.GetString("admin-smite-yeet-name").ToLowerInvariant(); Verb yeet = new() { - Text = "admin-smite-nyanify-name", + Text = yeetName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")), Act = () => @@ -457,11 +472,12 @@ public sealed partial class AdminVerbSystem _physics.SetAngularDamping(args.Target, physics, 0f); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-yeet-description") + Message = string.Join(": ", yeetName, Loc.GetString("admin-smite-yeet-description")) }; args.Verbs.Add(yeet); } + 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", @@ -472,10 +488,11 @@ public sealed partial class AdminVerbSystem _polymorphSystem.PolymorphEntity(args.Target, "AdminBreadSmite"); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-become-bread-description") + Message = string.Join(": ", breadName, Loc.GetString("admin-smite-become-bread-description")) }; args.Verbs.Add(bread); + var mouseName = Loc.GetString("admin-smite-become-mouse-name").ToLowerInvariant(); Verb mouse = new() { Text = "admin-smite-cluwne-name", @@ -486,15 +503,16 @@ public sealed partial class AdminVerbSystem _polymorphSystem.PolymorphEntity(args.Target, "AdminMouseSmite"); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-become-mouse-description") + Message = string.Join(": ", mouseName, Loc.GetString("admin-smite-become-mouse-description")) }; args.Verbs.Add(mouse); if (TryComp(args.Target, out var actorComponent)) { + var ghostKickName = Loc.GetString("admin-smite-ghostkick-name").ToLowerInvariant(); Verb ghostKick = new() { - Text = "admin-smite-anger-pointing-arrows-name", + Text = ghostKickName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/gavel.svg.192dpi.png")), Act = () => @@ -502,15 +520,18 @@ public sealed partial class AdminVerbSystem _ghostKickManager.DoDisconnect(actorComponent.PlayerSession.Channel, "Smitten."); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-ghostkick-description") + Message = string.Join(": ", ghostKickName, Loc.GetString("admin-smite-ghostkick-description")) + }; args.Verbs.Add(ghostKick); } - if (TryComp(args.Target, out var inventory)) { + if (TryComp(args.Target, out var inventory)) + { + var nyanifyName = Loc.GetString("admin-smite-nyanify-name").ToLowerInvariant(); Verb nyanify = new() { - Text = "admin-smite-dust-name", + Text = nyanifyName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Clothing/Head/Hats/catears.rsi"), "icon"), Act = () => @@ -521,13 +542,14 @@ public sealed partial class AdminVerbSystem _inventorySystem.TryEquip(args.Target, ears, "head", true, true, false, inventory); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-nyanify-description") + Message = string.Join(": ", nyanifyName, Loc.GetString("admin-smite-nyanify-description")) }; args.Verbs.Add(nyanify); + var killSignName = Loc.GetString("admin-smite-kill-sign-name").ToLowerInvariant(); Verb killSign = new() { - Text = "admin-smite-buffering-name", + Text = killSignName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Misc/killsign.rsi"), "icon"), Act = () => @@ -535,13 +557,14 @@ public sealed partial class AdminVerbSystem EnsureComp(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-kill-sign-description") + Message = string.Join(": ", killSignName, Loc.GetString("admin-smite-kill-sign-description")) }; args.Verbs.Add(killSign); + var cluwneName = Loc.GetString("admin-smite-cluwne-name").ToLowerInvariant(); Verb cluwne = new() { - Text = "admin-smite-become-instrument-name", + Text = cluwneName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Clothing/Mask/cluwne.rsi"), "icon"), @@ -551,13 +574,14 @@ public sealed partial class AdminVerbSystem EnsureComp(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-cluwne-description") + Message = string.Join(": ", cluwneName, Loc.GetString("admin-smite-cluwne-description")) }; args.Verbs.Add(cluwne); + var maidenName = Loc.GetString("admin-smite-maid-name").ToLowerInvariant(); Verb maiden = new() { - Text = "admin-smite-remove-gravity-name", + Text = maidenName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi"), "icon"), Act = () => @@ -570,14 +594,15 @@ public sealed partial class AdminVerbSystem }); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-maid-description") + Message = string.Join(": ", maidenName, Loc.GetString("admin-smite-maid-description")) }; args.Verbs.Add(maiden); } + var angerPointingArrowsName = Loc.GetString("admin-smite-anger-pointing-arrows-name").ToLowerInvariant(); Verb angerPointingArrows = new() { - Text = "admin-smite-reptilian-species-swap-name", + Text = angerPointingArrowsName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Interface/Misc/pointing.rsi"), "pointing"), Act = () => @@ -585,13 +610,14 @@ public sealed partial class AdminVerbSystem EnsureComp(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-anger-pointing-arrows-description") + Message = string.Join(": ", angerPointingArrowsName, Loc.GetString("admin-smite-anger-pointing-arrows-description")) }; args.Verbs.Add(angerPointingArrows); + var dustName = Loc.GetString("admin-smite-dust-name").ToLowerInvariant(); Verb dust = new() { - Text = "admin-smite-locker-stuff-name", + Text = dustName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Materials/materials.rsi"), "ash"), Act = () => @@ -601,13 +627,14 @@ public sealed partial class AdminVerbSystem _popupSystem.PopupEntity(Loc.GetString("admin-smite-turned-ash-other", ("name", args.Target)), args.Target, PopupType.LargeCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-dust-description"), + Message = string.Join(": ", dustName, Loc.GetString("admin-smite-dust-description")) }; args.Verbs.Add(dust); + var youtubeVideoSimulationName = Loc.GetString("admin-smite-buffering-name").ToLowerInvariant(); Verb youtubeVideoSimulation = new() { - Text = "admin-smite-headstand-name", + Text = youtubeVideoSimulationName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/Misc/buffering_smite_icon.png")), Act = () => @@ -615,10 +642,11 @@ public sealed partial class AdminVerbSystem EnsureComp(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-buffering-description"), + Message = string.Join(": ", youtubeVideoSimulationName, Loc.GetString("admin-smite-buffering-description")) }; args.Verbs.Add(youtubeVideoSimulation); + var instrumentationName = Loc.GetString("admin-smite-become-instrument-name").ToLowerInvariant(); Verb instrumentation = new() { Text = "admin-smite-become-mouse-name", @@ -629,13 +657,14 @@ public sealed partial class AdminVerbSystem _polymorphSystem.PolymorphEntity(args.Target, "AdminInstrumentSmite"); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-become-instrument-description"), + Message = string.Join(": ", instrumentationName, Loc.GetString("admin-smite-become-instrument-description")) }; args.Verbs.Add(instrumentation); + var noGravityName = Loc.GetString("admin-smite-remove-gravity-name").ToLowerInvariant(); Verb noGravity = new() { - Text = "admin-smite-maid-name", + Text = noGravityName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new("/Textures/Structures/Machines/gravity_generator.rsi"), "off"), Act = () => @@ -646,13 +675,14 @@ public sealed partial class AdminVerbSystem Dirty(args.Target, grav); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-remove-gravity-description"), + Message = string.Join(": ", noGravityName, Loc.GetString("admin-smite-remove-gravity-description")) }; args.Verbs.Add(noGravity); + var reptilianName = Loc.GetString("admin-smite-reptilian-species-swap-name").ToLowerInvariant(); Verb reptilian = new() { - Text = "admin-smite-zoom-in-name", + Text = reptilianName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/toys.rsi"), "plushie_lizard"), Act = () => @@ -660,13 +690,14 @@ public sealed partial class AdminVerbSystem _polymorphSystem.PolymorphEntity(args.Target, "AdminLizardSmite"); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-reptilian-species-swap-description"), + Message = string.Join(": ", reptilianName, Loc.GetString("admin-smite-reptilian-species-swap-description")) }; args.Verbs.Add(reptilian); + var lockerName = Loc.GetString("admin-smite-locker-stuff-name").ToLowerInvariant(); Verb locker = new() { - Text = "admin-smite-flip-eye-name", + Text = lockerName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new ("/Textures/Structures/Storage/closet.rsi"), "generic"), Act = () => @@ -682,10 +713,11 @@ public sealed partial class AdminVerbSystem _weldableSystem.SetWeldedState(locker, true); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-locker-stuff-description"), + Message = string.Join(": ", lockerName, Loc.GetString("admin-smite-locker-stuff-description")) }; args.Verbs.Add(locker); + var headstandName = Loc.GetString("admin-smite-headstand-name").ToLowerInvariant(); Verb headstand = new() { Text = "admin-smite-run-walk-swap-name", @@ -696,13 +728,14 @@ public sealed partial class AdminVerbSystem EnsureComp(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-headstand-description"), + Message = string.Join(": ", headstandName, Loc.GetString("admin-smite-headstand-description")) }; args.Verbs.Add(headstand); + var zoomInName = Loc.GetString("admin-smite-zoom-in-name").ToLowerInvariant(); Verb zoomIn = new() { - Text = "admin-smite-super-speed-name", + Text = zoomInName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/zoom.png")), Act = () => @@ -711,13 +744,14 @@ public sealed partial class AdminVerbSystem _eyeSystem.SetZoom(args.Target, eye.TargetZoom * 0.2f, ignoreLimits: true); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-zoom-in-description"), + Message = string.Join(": ", zoomInName, Loc.GetString("admin-smite-zoom-in-description")) }; args.Verbs.Add(zoomIn); + var flipEyeName = Loc.GetString("admin-smite-flip-eye-name").ToLowerInvariant(); Verb flipEye = new() { - Text = "admin-smite-stomach-removal-name", + Text = flipEyeName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/flip.png")), Act = () => @@ -726,13 +760,14 @@ public sealed partial class AdminVerbSystem _eyeSystem.SetZoom(args.Target, eye.TargetZoom * -1, ignoreLimits: true); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-flip-eye-description"), + Message = string.Join(": ", flipEyeName, Loc.GetString("admin-smite-flip-eye-description")) }; args.Verbs.Add(flipEye); + var runWalkSwapName = Loc.GetString("admin-smite-run-walk-swap-name").ToLowerInvariant(); Verb runWalkSwap = new() { - Text = "admin-smite-speak-backwards-name", + Text = runWalkSwapName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/run-walk-swap.png")), Act = () => @@ -746,13 +781,14 @@ public sealed partial class AdminVerbSystem args.Target, PopupType.LargeCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-run-walk-swap-description"), + Message = string.Join(": ", runWalkSwapName, Loc.GetString("admin-smite-run-walk-swap-description")) }; args.Verbs.Add(runWalkSwap); + var backwardsAccentName = Loc.GetString("admin-smite-speak-backwards-name").ToLowerInvariant(); Verb backwardsAccent = new() { - Text = "admin-smite-lung-removal-name", + Text = backwardsAccentName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/help-backwards.png")), Act = () => @@ -760,13 +796,14 @@ public sealed partial class AdminVerbSystem EnsureComp(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-speak-backwards-description"), + Message = string.Join(": ", backwardsAccentName, Loc.GetString("admin-smite-speak-backwards-description")) }; args.Verbs.Add(backwardsAccent); + var disarmProneName = Loc.GetString("admin-smite-disarm-prone-name").ToLowerInvariant(); Verb disarmProne = new() { - Text = "admin-smite-disarm-prone-name", + Text = disarmProneName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/Actions/disarm.png")), Act = () => @@ -774,10 +811,11 @@ public sealed partial class AdminVerbSystem EnsureComp(args.Target); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-disarm-prone-description"), + Message = string.Join(": ", disarmProneName, Loc.GetString("admin-smite-disarm-prone-description")) }; args.Verbs.Add(disarmProne); + var superSpeedName = Loc.GetString("admin-smite-super-speed-name").ToLowerInvariant(); Verb superSpeed = new() { Text = "admin-smite-garbage-can-name", @@ -792,41 +830,45 @@ public sealed partial class AdminVerbSystem args.Target, PopupType.LargeCaution); }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-super-speed-description"), + Message = string.Join(": ", superSpeedName, Loc.GetString("admin-smite-super-speed-description")) }; args.Verbs.Add(superSpeed); //Bonk + var superBonkLiteName = Loc.GetString("admin-smite-super-bonk-lite-name").ToLowerInvariant(); Verb superBonkLite = new() { - Text = "admin-smite-super-bonk-name", + Text = superBonkLiteName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new("Structures/Furniture/Tables/glass.rsi"), "full"), Act = () => { _superBonkSystem.StartSuperBonk(args.Target, stopWhenDead: true); }, - Message = Loc.GetString("admin-smite-super-bonk-lite-description"), Impact = LogImpact.Extreme, + Message = string.Join(": ", superBonkLiteName, Loc.GetString("admin-smite-super-bonk-lite-description")) }; args.Verbs.Add(superBonkLite); + + var superBonkName = Loc.GetString("admin-smite-super-bonk-name").ToLowerInvariant(); Verb superBonk= new() { - Text = "admin-smite-super-bonk-lite-name", + Text = superBonkName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new("Structures/Furniture/Tables/generic.rsi"), "full"), Act = () => { _superBonkSystem.StartSuperBonk(args.Target); }, - Message = Loc.GetString("admin-smite-super-bonk-description"), Impact = LogImpact.Extreme, + Message = string.Join(": ", superBonkName, Loc.GetString("admin-smite-super-bonk-description")) }; args.Verbs.Add(superBonk); + var superslipName = Loc.GetString("admin-smite-super-slip-name").ToLowerInvariant(); Verb superslip = new() { - Text = "admin-smite-super-slip-name", + Text = superslipName, Category = VerbCategory.Smite, Icon = new SpriteSpecifier.Rsi(new("Objects/Specific/Janitorial/soap.rsi"), "omega-4"), Act = () => @@ -846,7 +888,7 @@ public sealed partial class AdminVerbSystem } }, Impact = LogImpact.Extreme, - Message = Loc.GetString("admin-smite-super-slip-description") + Message = string.Join(": ", superslipName, Loc.GetString("admin-smite-super-slip-description")) }; args.Verbs.Add(superslip); } diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl index e77725765b..57d8660fae 100644 --- a/Resources/Locale/en-US/administration/smites.ftl +++ b/Resources/Locale/en-US/administration/smites.ftl @@ -20,42 +20,42 @@ admin-smite-explode-name = Explode admin-smite-chess-dimension-name = Chess Dimension admin-smite-set-alight-name = Set Alight admin-smite-monkeyify-name = Monkeyify -admin-smite-electrocute-name = Garbage Can -admin-smite-creampie-name = Electrocute -admin-smite-remove-blood-name = Creampie -admin-smite-vomit-organs-name = Remove blood -admin-smite-remove-hands-name = Vomit organs -admin-smite-remove-hand-name = Remove hands -admin-smite-pinball-name = Remove hand -admin-smite-yeet-name = Stomach Removal -admin-smite-become-bread-name = Lungs Removal -admin-smite-ghostkick-name = Pinball -admin-smite-nyanify-name = Yeet -admin-smite-kill-sign-name = Become Bread -admin-smite-cluwne-name = Become Mouse -admin-smite-anger-pointing-arrows-name = Ghostkick -admin-smite-dust-name = Nyanify -admin-smite-buffering-name = Kill sign -admin-smite-become-instrument-name = Cluwne -admin-smite-remove-gravity-name = Maid -admin-smite-reptilian-species-swap-name = Anger Pointing Arrows -admin-smite-locker-stuff-name = Dust -admin-smite-headstand-name = Buffering -admin-smite-become-mouse-name = Become Instrument -admin-smite-maid-name = Remove gravity -admin-smite-zoom-in-name = Reptilian Species Swap -admin-smite-flip-eye-name = Locker stuff -admin-smite-run-walk-swap-name = Headstand -admin-smite-super-speed-name = Zoom in -admin-smite-stomach-removal-name = Flip eye -admin-smite-speak-backwards-name = Run Walk Swap -admin-smite-lung-removal-name = Speak Backwards +admin-smite-garbage-can-name = Garbage Can +admin-smite-electrocute-name = Electrocute +admin-smite-remove-blood-name = Remove blood +admin-smite-remove-hands-name = Remove hands +admin-smite-remove-hand-name = Remove hand +admin-smite-pinball-name = Pinball +admin-smite-yeet-name = Yeet +admin-smite-become-bread-name = Become Bread +admin-smite-cluwne-name = Cluwne +admin-smite-anger-pointing-arrows-name = Anger Pointing Arrows +admin-smite-dust-name = Dust +admin-smite-buffering-name = Buffering +admin-smite-become-instrument-name = Become Instrument +admin-smite-remove-gravity-name = Remove Gravity +admin-smite-reptilian-species-swap-name = Become Reptilian +admin-smite-locker-stuff-name = Locker Stuff +admin-smite-headstand-name = Headstand +admin-smite-become-mouse-name = Become Mouse +admin-smite-maid-name = Cat Maid +admin-smite-zoom-in-name = Zoom In +admin-smite-flip-eye-name = Flip Eye +admin-smite-run-walk-swap-name = Run Walk Swap +admin-smite-super-speed-name = Run Up +admin-smite-stomach-removal-name = Stomach Removal +admin-smite-speak-backwards-name = Speak Backwards +admin-smite-lung-removal-name = Lungs Removal admin-smite-disarm-prone-name = Disarm Prone -admin-smite-garbage-can-name = Super speed -admin-smite-super-bonk-name = Super Bonk Lite -admin-smite-super-bonk-lite-name = Super Bonk +admin-smite-super-bonk-name = Super Bonk +admin-smite-super-bonk-lite-name = Super Bonk Lite admin-smite-terminate-name = Terminate admin-smite-super-slip-name = Super Slip +admin-smite-creampie-name = Cream +admin-smite-vomit-organs-name = Vomit Organs +admin-smite-ghostkick-name = Ghost Kick +admin-smite-nyanify-name = Cat Ears +admin-smite-kill-sign-name = Kill Sign ## Smite descriptions