diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs index 24f12a79158..f09bb1f08ab 100644 --- a/Content.Client/Buckle/BuckleSystem.cs +++ b/Content.Client/Buckle/BuckleSystem.cs @@ -29,7 +29,7 @@ private void OnBuckleHandleState(EntityUid uid, BuckleComponent component, ref C component.LastEntityBuckledTo = EnsureEntity(state.LastEntityBuckledTo, uid); component.DontCollide = state.DontCollide; - ActionBlockerSystem.UpdateCanMove(uid); + ActionBlocker.UpdateCanMove(uid); if (!TryComp(uid, out var ownerSprite)) return; @@ -65,8 +65,8 @@ private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref Ap if (!TryComp(uid, out var rotVisuals)) return; - if (!AppearanceSystem.TryGetData(uid, StrapVisuals.RotationAngle, out var angle, args.Component) || - !AppearanceSystem.TryGetData(uid, BuckleVisuals.Buckled, out var buckled, args.Component) || + if (!Appearance.TryGetData(uid, StrapVisuals.RotationAngle, out var angle, args.Component) || + !Appearance.TryGetData(uid, BuckleVisuals.Buckled, out var buckled, args.Component) || !buckled || args.Sprite == null) { diff --git a/Content.Client/CharacterInfo/CharacterInfoSystem.cs b/Content.Client/CharacterInfo/CharacterInfoSystem.cs index cd96085d314..93bd86d140b 100644 --- a/Content.Client/CharacterInfo/CharacterInfoSystem.cs +++ b/Content.Client/CharacterInfo/CharacterInfoSystem.cs @@ -59,7 +59,7 @@ public List GetCharacterInfoControls(EntityUid uid) public readonly record struct CharacterData( EntityUid Entity, string Job, - Dictionary> Objectives, + Dictionary> Objectives, string? Briefing, string EntityName ); diff --git a/Content.Client/ContextMenu/UI/EntityMenuElement.cs b/Content.Client/ContextMenu/UI/EntityMenuElement.cs index cdd171a6e7d..8a8070aeccd 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs @@ -1,6 +1,7 @@ using System.Linq; using Content.Client.Administration.Managers; using Content.Client.Administration.Systems; +using Content.Client.UserInterface; using Content.Shared.Administration; using Content.Shared.IdentityManagement; using Robust.Client.GameObjects; @@ -8,7 +9,7 @@ namespace Content.Client.ContextMenu.UI { - public sealed partial class EntityMenuElement : ContextMenuElement + public sealed partial class EntityMenuElement : ContextMenuElement, IEntityControl { [Dependency] private readonly IClientAdminManager _adminManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!; @@ -117,5 +118,7 @@ public void UpdateEntity(EntityUid? entity = null) Text = GetEntityDescription(entity.Value); } } + + EntityUid? IEntityControl.UiEntity => Entity; } } diff --git a/Content.Client/Decals/UI/DecalPlacerWindow.xaml b/Content.Client/Decals/UI/DecalPlacerWindow.xaml index 19c63a44bcf..5750ff19f82 100644 --- a/Content.Client/Decals/UI/DecalPlacerWindow.xaml +++ b/Content.Client/Decals/UI/DecalPlacerWindow.xaml @@ -14,6 +14,7 @@