Merge pull request #81 from ss14Starlight/pacify-smite

Pacify smite
ss14Starlight · Nov 22, 2024 · a8745ef · a8745ef
2 parents 5fc1b05 + 0f183a5
commit a8745ef
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -41,6 +41,7 @@
 using Content.Shared.Tabletop.Components;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Verbs;
+using Content.Shared.CombatMode.Pacification;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
@@ -891,5 +892,20 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
             Message = string.Join(": ", superslipName, Loc.GetString("admin-smite-super-slip-description"))
         };
         args.Verbs.Add(superslip);
+
+        var pacifyName = Loc.GetString("admin-smite-pacify-name").ToLowerInvariant();
+        Verb pacify = new()
+        {
+            Text = pacifyName,
+            Category = VerbCategory.Smite,
+            Icon = new SpriteSpecifier.Rsi(new ("/Textures/Interface/Alerts/pacified.rsi"), "icon"),
+            Act = () =>
+            {
+                EnsureComp<PacifiedComponent>(args.Target);
+            },
+            Impact = LogImpact.Extreme,
+            Message = string.Join(": ", pacifyName, Loc.GetString("admin-smite-pacify-description"))
+        };
+        args.Verbs.Add(pacify);
     }
 }
diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl
@@ -56,6 +56,7 @@ 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
+admin-smite-pacify-name = Pacify
 
 ## Smite descriptions
 
@@ -99,6 +100,7 @@ admin-smite-super-bonk-description = Slams them on every single table on the Sta
 admin-smite-super-bonk-lite-description= Slams them on every single table on the Station and beyond. Stops when the target is dead.
 admin-smite-terminate-description = Creates a Terminator ghost role with the sole objective of killing them.
 admin-smite-super-slip-description = Slips them really, really hard.
+admin-smite-pacify-description = Makes the target a pacifist.
 
 ## Tricks descriptions
 

diff --git a/Resources/Textures/Interface/Alerts/pacified.rsi/icon.png b/Resources/Textures/Interface/Alerts/pacified.rsi/icon.png
diff --git a/Resources/Textures/Interface/Alerts/pacified.rsi/meta.json b/Resources/Textures/Interface/Alerts/pacified.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "@Vordenburg",
+    "copyright": "Paradise Station",
     "size": {
         "x": 32,
         "y": 32