diff --git a/Content.Client/Body/Systems/BodySystem.cs b/Content.Client/Body/Systems/BodySystem.cs index 10dc057a8fd..d26721ba247 100644 --- a/Content.Client/Body/Systems/BodySystem.cs +++ b/Content.Client/Body/Systems/BodySystem.cs @@ -1,15 +1,18 @@ using Content.Shared.Body.Systems; -using Content.Shared.Body.Part; +// Shitmed Change Start +using Content.Shared._Shitmed.Body.Part; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; using Robust.Client.GameObjects; using Robust.Shared.Utility; using Content.Shared.Body.Components; +// Shitmed Change End namespace Content.Client.Body.Systems; public sealed class BodySystem : SharedBodySystem { + // Shitmed Change Start [Dependency] private readonly MarkingManager _markingManager = default!; private void ApplyMarkingToPart(MarkingPrototype markingPrototype, @@ -69,4 +72,5 @@ protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceC { return; } + // Shitmed Change End } diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs index 7ea3b69de57..c2fd9b1b749 100644 --- a/Content.Client/Hands/Systems/HandsSystem.cs +++ b/Content.Client/Hands/Systems/HandsSystem.cs @@ -3,7 +3,8 @@ using Content.Client.Examine; using Content.Client.Strip; using Content.Client.Verbs.UI; -using Content.Shared.Body.Part; +using Content.Shared._Shitmed.Body.Events; // Shitmed Change +using Content.Shared.Body.Part; // Shitmed Change using Content.Shared.Hands; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; @@ -49,8 +50,8 @@ public override void Initialize() SubscribeLocalEvent(OnHandsShutdown); SubscribeLocalEvent(HandleComponentState); SubscribeLocalEvent(OnVisualsChanged); - SubscribeLocalEvent(HandleBodyPartRemoved); - SubscribeLocalEvent(HandleBodyPartDisabled); + SubscribeLocalEvent(HandleBodyPartRemoved); // Shitmed Change + SubscribeLocalEvent(HandleBodyPartDisabled); // Shitmed Change OnHandSetActive += OnHandActivated; } @@ -244,6 +245,7 @@ public void UIHandAltActivateItem(string handName) #region visuals + // Shitmed Change Start private void HideLayers(EntityUid uid, HandsComponent component, Entity part, SpriteComponent? sprite = null) { if (part.Comp.PartType != BodyPartType.Hand || !Resolve(uid, ref sprite, logMissing: false)) @@ -270,6 +272,7 @@ private void HideLayers(EntityUid uid, HandsComponent component, Entity HideLayers(uid, component, args.Part); + // Shitmed Change End protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands, EntInsertedIntoContainerMessage args) { base.HandleEntityInserted(uid, hands, args); diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs index 39bb52d72c0..3261a109e73 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs @@ -1,7 +1,7 @@ using Content.Shared.MedicalScanner; -using Content.Shared.Targeting; +using Content.Shared._Shitmed.Targeting; // Shitmed Change using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.HealthAnalyzer.UI { @@ -18,15 +18,13 @@ public HealthAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne protected override void Open() { base.Open(); - _window = new HealthAnalyzerWindow - { - Title = EntMan.GetComponent(Owner).EntityName, - }; - _window.OnClose += Close; - _window.OnBodyPartSelected += SendBodyPartMessage; - _window.OpenCentered(); + + _window = this.CreateWindow(); + _window.OnBodyPartSelected += SendBodyPartMessage; // Shitmed Change + _window.Title = EntMan.GetComponent(Owner).EntityName; } + protected override void ReceiveMessage(BoundUserInterfaceMessage message) { if (_window == null) @@ -38,8 +36,8 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message) _window.Populate(cast); } + // Shitmed Change Start private void SendBodyPartMessage(TargetBodyPart? part, EntityUid target) => SendMessage(new HealthAnalyzerPartMessage(EntMan.GetNetEntity(target), part ?? null)); - protected override void Dispose(bool disposing) { base.Dispose(disposing); @@ -47,12 +45,11 @@ protected override void Dispose(bool disposing) return; if (_window != null) - { - _window.OnClose -= Close; _window.OnBodyPartSelected -= SendBodyPartMessage; - } _window?.Dispose(); } + + // Shitmed Change End } } diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml index 0a0b5ac89e7..8fc0d7fa4da 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml @@ -2,7 +2,7 @@ xmlns="https://spacestation14.io" xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" MaxHeight="525" - MinWidth="350"> + MinWidth="350"> +