Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jabak
2024-07-17 23:20:24 +03:00
20 changed files with 17362 additions and 9744 deletions

View File

@@ -1,4 +1,6 @@
using Content.Server.Humanoid;
using System.Collections.Generic;
using System.Linq;
using Content.Server.Humanoid;
using Content.Server.IdentityManagement;
using Content.Shared._White.Wizard.Mirror;
using Content.Shared.Humanoid;
@@ -7,7 +9,9 @@ using Content.Shared.Interaction;
using Content.Shared.Physics;
using Content.Shared.Preferences;
using Content.Shared.UserInterface;
using FastAccessors;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Player;
namespace Content.Server._White.Wizard.Mirror;
@@ -129,6 +133,8 @@ public sealed class WizardMirrorSystem : EntitySystem
.Appearance.WithFacialHairColor(facialHair.MarkingColors[0]));
}
profile = profile.WithCharacterAppearance(profile.Appearance.WithMarkings(humanoid.MarkingSet.GetForwardEnumerator().ToList()));
var state = new WizardMirrorUiState(profile);
component.Target = targetUid;