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

Fix localization error when trying to change hair on someone with a hat (#38907)

Browse Source
This commit is contained in:
Tayrtahn
2025-07-10 13:37:25 -04:00
committed by GitHub
parent 0d9659e810
commit cce239dd93
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/MagicMirror/MagicMirrorSystem.cs
View File

@@ -137,13 +137,13 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
if (component.Target is not { } target) if (component.Target is not { } target)
return; 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)) if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value))
{ {
_popup.PopupEntity( _popup.PopupEntity(
component.Target == message.Actor component.Target == message.Actor
? Loc.GetString("magic-mirror-blocked-by-hat-self") ? 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,
message.Actor, message.Actor,
PopupType.Medium); PopupType.Medium);
@@ -222,7 +222,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
_popup.PopupEntity( _popup.PopupEntity(
component.Target == message.Actor component.Target == message.Actor
? Loc.GetString("magic-mirror-blocked-by-hat-self") ? 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,
message.Actor, message.Actor,
PopupType.Medium); PopupType.Medium);
@@ -301,7 +301,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
_popup.PopupEntity( _popup.PopupEntity(
component.Target == message.Actor component.Target == message.Actor
? Loc.GetString("magic-mirror-blocked-by-hat-self") ? 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,
message.Actor, message.Actor,
PopupType.Medium); PopupType.Medium);