From 8fe211bf882e6ddc7a6a7fe7a8b07add6a1f823a Mon Sep 17 00:00:00 2001 From: Exp Date: Fri, 21 Aug 2020 11:00:27 +0200 Subject: [PATCH] Make Table Vaulting use "theName" macro (#1832) --- .../GameObjects/Components/Movement/ClimbableComponent.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs b/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs index 413c8a169c..a6bb5ed2fb 100644 --- a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs @@ -174,8 +174,8 @@ namespace Content.Server.GameObjects.Components.Movement // we may potentially need additional logic since we're forcing a player onto a climbable // there's also the cases where the user might collide with the person they are forcing onto the climbable that i haven't accounted for - PopupMessageOtherClientsInRange(user, Loc.GetString("{0} forces {1} onto {2:theName}!", user.Name, entityToMove.Name, Owner), 15); - _notifyManager.PopupMessage(user, user, Loc.GetString("You force {0} onto {1:theName}!", entityToMove.Name, Owner)); + PopupMessageOtherClientsInRange(user, Loc.GetString("{0:theName} forces {1:theName} onto {2:theName}!", user, entityToMove, Owner), 15); + _notifyManager.PopupMessage(user, user, Loc.GetString("You force {0:theName} onto {1:theName}!", entityToMove, Owner)); } } @@ -210,7 +210,7 @@ namespace Content.Server.GameObjects.Components.Movement climbMode.TryMoveTo(user.Transform.WorldPosition, endPoint); - PopupMessageOtherClientsInRange(user, Loc.GetString("{0} jumps onto {1:theName}!", user.Name, Owner), 15); + PopupMessageOtherClientsInRange(user, Loc.GetString("{0:theName} jumps onto {1:theName}!", user, Owner), 15); _notifyManager.PopupMessage(user, user, Loc.GetString("You jump onto {0:theName}!", Owner)); } }