Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Communicate self-uncuff damage to player a bit more clearly (#17835)

Browse Source
This commit is contained in:
Errant
2023-07-07 09:28:33 +00:00
committed by GitHub
parent 99e447bb74
commit 669d332332
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Cuffs/SharedCuffableSystem.cs
View File

@@ -26,6 +26,7 @@ using Content.Shared.Pulling.Events;
using Content.Shared.Rejuvenate; using Content.Shared.Rejuvenate;
using Content.Shared.Stunnable; using Content.Shared.Stunnable;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Melee.Events;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Network; using Robust.Shared.Network;
@@ -591,6 +592,7 @@ namespace Content.Shared.Cuffs
if (target == user) if (target == user)
{ {
RaiseNetworkEvent(new DamageEffectEvent(Color.Red, new List<EntityUid>() { user }));
_popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-self"), user, user); _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-self"), user, user);
} }
else else

2
Resources/Locale/en-US/cuffs/components/cuffable-component.ftl
View File

@@ -1,7 +1,7 @@
cuffable-component-cannot-interact-message = You can't do that! 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-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-observer = {$user} starts uncuffing {$target}!
cuffable-component-start-uncuffing-target-message = You start uncuffing {$targetName}. cuffable-component-start-uncuffing-target-message = You start uncuffing {$targetName}.
cuffable-component-start-uncuffing-by-other-message = {$otherName} starts uncuffing you! cuffable-component-start-uncuffing-by-other-message = {$otherName} starts uncuffing you!