tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for missing loc strings in handcuffs. (#1919)

Browse Source 
* loc strings, formatting fixes

* Fix indentation

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
nuke
2020-08-25 21:49:29 -04:00
committed by GitHub
parent dd3a697c12
commit 47d89bc280
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs
View File

@@ -224,7 +224,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
if (!isOwner && !ActionBlockerSystem.CanInteract(user))
{
user.PopupMessage(user, "You can't do that!");
user.PopupMessage(user, Loc.GetString("You can't do that!"));
return;
}
@@ -235,7 +235,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
_interactRange,
ignoredEnt: Owner))
{
user.PopupMessage(user, "You are too far away to remove the cuffs.");
user.PopupMessage(user, Loc.GetString("You are too far away to remove the cuffs."));
return;
}
@@ -249,7 +249,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
return;
}
user.PopupMessage(user, "You start removing the cuffs.");
user.PopupMessage(user, Loc.GetString("You start removing the cuffs."));
var audio = EntitySystem.Get<AudioSystem>();
audio.PlayFromEntity(isOwner ? cuff.StartBreakoutSound : cuff.StartUncuffSound, Owner);
@@ -305,7 +305,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
{
if (!isOwner)
{
_notifyManager.PopupMessage(user, user, Loc.GetString("You successfully remove the cuffs. {0} of {0:theName}'s hands remain cuffed.", CuffedHandCount, user));
_notifyManager.PopupMessage(user, user, Loc.GetString("You successfully remove the cuffs. {0} of {1:theName}'s hands remain cuffed.", CuffedHandCount, user));
_notifyManager.PopupMessage(user, Owner, Loc.GetString("{0:theName} removes your cuffs. {1} of your hands remain cuffed.", user, CuffedHandCount));
}
else

8
Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
View File

@@ -225,8 +225,8 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
if (result != DoAfterStatus.Cancelled)
{
_audioSystem.PlayFromEntity(EndCuffSound, Owner);
_notifyManager.PopupMessage(user, user, Loc.GetString("You successfully cuff {0}.", target.Name));
_notifyManager.PopupMessage(target, target, Loc.GetString("You have been cuffed by {0}!", user.Name));
_notifyManager.PopupMessage(user, user, Loc.GetString("You successfully cuff {0:theName}.", target));
_notifyManager.PopupMessage(target, target, Loc.GetString("You have been cuffed by {0:theName}!", user));
if (user.TryGetComponent<HandsComponent>(out var hands))
{
@@ -240,8 +240,8 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
}
else
{
user.PopupMessage(user, Loc.GetString("You were interrupted while cuffing {0}!", target.Name));
target.PopupMessage(target, Loc.GetString("You interrupt {0} while they are cuffing you!", user.Name));
user.PopupMessage(user, Loc.GetString("You were interrupted while cuffing {0:theName}!", target));
target.PopupMessage(target, Loc.GetString("You interrupt {0:theName} while they are cuffing you!", user));
}
}
}

2
Content.Shared/GameObjects/ContentNetIDs.cs
View File

@@ -68,7 +68,7 @@
public const uint BOLTACTION_BARREL = 1062;
public const uint PUMP_BARREL = 1063;
public const uint REVOLVER_BARREL = 1064;
public const uint CUFFED = 1065;
public const uint CUFFED = 1065;
public const uint HANDCUFFS = 1066;
// Net IDs for integration tests.