Fix MagicMirror UI (#42544)

diff --git a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
index ec247da1acba208b175d468247357538d88a2d32..4344926e8546f16211336218db615503a7526185 100644 (file)
--- a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs
@@ -20,6 +20,9 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface
         base.Open();
 
         _window = this.CreateWindow<MagicMirrorWindow>();
+
+        _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+
         _window.MarkingsPicker.SetModel(_markingsModel);
 
         _markingsModel.MarkingsChanged += (_, _) =>

diff --git a/Content.Client/MagicMirror/MagicMirrorWindow.xaml b/Content.Client/MagicMirror/MagicMirrorWindow.xaml
index a09b6745085a0d14b5289fda502b5c9309195d17..3de0aecef373a795fb01a9f699e5cc3eba50e6ec 100644 (file)
--- a/Content.Client/MagicMirror/MagicMirrorWindow.xaml
+++ b/Content.Client/MagicMirror/MagicMirrorWindow.xaml
@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:humanoid="clr-namespace:Content.Client.Humanoid"
-               Title="{Loc 'magic-mirror-window-title'}"
                MinSize="700 500">
    <humanoid:MarkingPicker Name="MarkingsPicker" Access="Public" HorizontalExpand="True" VerticalExpand="True" />
 </DefaultWindow>

diff --git a/Content.Shared/MagicMirror/MagicMirrorSystem.cs b/Content.Shared/MagicMirror/MagicMirrorSystem.cs
index 65a4d11079ecb6c3b3aa760ddaea5a156250fe60..ca7609c97d9efc0891dd8351d138af67016a6f80 100644 (file)
--- a/Content.Shared/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Shared/MagicMirror/MagicMirrorSystem.cs
@@ -142,6 +142,9 @@ public sealed class MagicMirrorSystem : EntitySystem
         if (!args.CanReach || args.Target == null)
             return;
 
+        if (!HasComp<VisualBodyComponent>(args.Target.Value))
+            return;
+
         UpdateInterface(mirror, args.Target.Value);
         _userInterface.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User);
     }

diff --git a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl
index 1b22fbf828238f174e4bad2e36585ffd20a8a4a8..ec2289cb900a99bbf7fcd15fd361e578ecf6ab8c 100644 (file)
--- a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl
+++ b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl
@@ -1,6 +1,5 @@
 magic-mirror-component-activate-user-has-no-hair = You can't have any hair!
 
-magic-mirror-window-title = Magic Mirror
 magic-mirror-add-slot-self = You're giving yourself some hair.
 magic-mirror-remove-slot-self = You're removing some of your hair.
 magic-mirror-change-slot-self = You're changing your hairstyle.