Skip to content

Commit

Permalink
Unheck Admin Smites (#35348)
Browse files Browse the repository at this point in the history 
* Fix admin verb names

Fixed admin verb names.

* Add antag verb names

* Adjust antag verb icons
  • Loading branch information
@Pangogie
Pangogie authored Feb 28, 2025
1 parent d8838e3 commit 4442d5e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 25 deletions.
42 changes: 24 additions & 18 deletions Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,66 +52,70 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> 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<TraitorRuleComponent>(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 = () =>
{
_antag.ForceMakeAntag<ZombieRuleComponent>(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<NukeopsRuleComponent>(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 = () =>
Expand All @@ -120,35 +124,37 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> 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 = () =>
{
_antag.ForceMakeAntag<RevolutionaryRuleComponent>(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 = () =>
{
_antag.ForceMakeAntag<ThiefRuleComponent>(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);
}
Expand Down
14 changes: 7 additions & 7 deletions Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> 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 = () =>
Expand Down Expand Up @@ -481,7 +481,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> 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 = () =>
Expand All @@ -496,7 +496,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> 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 = () =>
Expand Down Expand Up @@ -650,7 +650,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> 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 = () =>
Expand Down Expand Up @@ -721,7 +721,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> 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 = () =>
Expand Down Expand Up @@ -819,7 +819,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> 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 = () =>
Expand Down Expand Up @@ -852,7 +852,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> 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,
Expand Down

0 comments on commit 4442d5e

Please sign in to comment.