diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs index dc6879ce0e..dddcb0eb93 100644 --- a/Content.Client/DoAfter/DoAfterOverlay.cs +++ b/Content.Client/DoAfter/DoAfterOverlay.cs @@ -8,6 +8,7 @@ using Robust.Client.Player; using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Robust.Shared.Utility; +using Robust.Shared.Containers; namespace Content.Client.DoAfter; @@ -19,6 +20,7 @@ public sealed class DoAfterOverlay : Overlay private readonly SharedTransformSystem _transform; private readonly MetaDataSystem _meta; private readonly ProgressColorSystem _progressColor; + private readonly SharedContainerSystem _container; private readonly Texture _barTexture; @@ -40,6 +42,7 @@ public sealed class DoAfterOverlay : Overlay _player = player; _transform = _entManager.EntitySysManager.GetEntitySystem(); _meta = _entManager.EntitySysManager.GetEntitySystem(); + _container = _entManager.EntitySysManager.GetEntitySystem(); _progressColor = _entManager.System(); var sprite = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/progress_bar.rsi"), "icon"); _barTexture = _entManager.EntitySysManager.GetEntitySystem().Frame0(sprite); @@ -90,11 +93,13 @@ public sealed class DoAfterOverlay : Overlay var offset = 0f; + var isInContainer = _container.IsEntityOrParentInContainer(uid, meta, xform); + foreach (var doAfter in comp.DoAfters.Values) { // Hide some DoAfters from other players for stealthy actions (ie: thieving gloves) var alpha = 1f; - if (doAfter.Args.Hidden) + if (doAfter.Args.Hidden || isInContainer) { if (uid != localEnt) continue; diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 9fa870b7bc..0a58f27818 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -134,6 +134,7 @@ namespace Content.Client.Entry _prototypeManager.RegisterIgnore("wireLayout"); _prototypeManager.RegisterIgnore("alertLevels"); _prototypeManager.RegisterIgnore("nukeopsRole"); + _prototypeManager.RegisterIgnore("ghostRoleRaffleDecider"); //WD-EDIT _prototypeManager.RegisterIgnore("loadout"); diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml index 92e38e35e0..ffde5d69f7 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml @@ -5,7 +5,7 @@ Text="{Loc 'ghost-roles-window-request-role-button'}" StyleClasses="OpenRight" HorizontalAlignment="Left" - SetWidth="150"/> + SetWidth="300"/>