From cce239dd93b31735707e40713cae038f9d34deb3 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Thu, 10 Jul 2025 13:37:25 -0400 Subject: [PATCH] Fix localization error when trying to change hair on someone with a hat (#38907) --- Content.Server/MagicMirror/MagicMirrorSystem.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs index 37302999ed..0fd00fca24 100644 --- a/Content.Server/MagicMirror/MagicMirrorSystem.cs +++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs @@ -137,13 +137,13 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem if (component.Target is not { } target) return; - // Check if the target getting their hair altered has any clothes that hides their hair + // Check if the target getting their hair altered has any clothes that hides their hair if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value)) { _popup.PopupEntity( component.Target == message.Actor ? Loc.GetString("magic-mirror-blocked-by-hat-self") - : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))), message.Actor, message.Actor, PopupType.Medium); @@ -222,7 +222,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem _popup.PopupEntity( component.Target == message.Actor ? Loc.GetString("magic-mirror-blocked-by-hat-self") - : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))), message.Actor, message.Actor, PopupType.Medium); @@ -301,7 +301,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem _popup.PopupEntity( component.Target == message.Actor ? Loc.GetString("magic-mirror-blocked-by-hat-self") - : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))), message.Actor, message.Actor, PopupType.Medium);