From 669d3323329f2b6ae039ee21a19978ee872c7489 Mon Sep 17 00:00:00 2001
From: Errant <35878406+dmnct@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:28:33 +0000
Subject: [PATCH] Communicate self-uncuff damage to player a bit more clearly
 (#17835)

---
 Content.Shared/Cuffs/SharedCuffableSystem.cs                   | 2 ++
 Resources/Locale/en-US/cuffs/components/cuffable-component.ftl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 059f4b1742..39385bf795 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -26,6 +26,7 @@ using Content.Shared.Pulling.Events;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Stunnable;
 using Content.Shared.Verbs;
+using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
@@ -591,6 +592,7 @@ namespace Content.Shared.Cuffs
 
                 if (target == user)
                 {
+                    RaiseNetworkEvent(new DamageEffectEvent(Color.Red, new List<EntityUid>() { user }));
                     _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-self"), user, user);
                 }
                 else
diff --git a/Resources/Locale/en-US/cuffs/components/cuffable-component.ftl b/Resources/Locale/en-US/cuffs/components/cuffable-component.ftl
index 2ac1f98502..52c416ce9d 100644
--- a/Resources/Locale/en-US/cuffs/components/cuffable-component.ftl
+++ b/Resources/Locale/en-US/cuffs/components/cuffable-component.ftl
@@ -1,7 +1,7 @@
 cuffable-component-cannot-interact-message = You can't do that!
 cuffable-component-cannot-remove-cuffs-too-far-message = You are too far away to remove the cuffs.
 
-cuffable-component-start-uncuffing-self = You start uncuffing yourself.
+cuffable-component-start-uncuffing-self = You start to painfully wriggle out of your cuffs.
 cuffable-component-start-uncuffing-observer = {$user} starts uncuffing {$target}!
 cuffable-component-start-uncuffing-target-message = You start uncuffing {$targetName}.
 cuffable-component-start-uncuffing-by-other-message = {$otherName} starts uncuffing you!