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

Remove health analyzer component references (#15322)

Browse Source
This commit is contained in:
DrSmugleaf
2023-04-11 17:11:02 -07:00
committed by GitHub
parent 92eda47e14
commit f474171451
9 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
View File

@@ -1,8 +1,7 @@
using JetBrains.Annotations;
using Content.Shared.MedicalScanner;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using static Content.Shared.MedicalScanner.SharedHealthAnalyzerComponent;
namespace Content.Client.HealthAnalyzer.UI
{
[UsedImplicitly]

4
Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
View File

@@ -1,14 +1,14 @@
using System.Text;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.Disease.Components;
using Content.Shared.FixedPoint;
using Content.Shared.IdentityManagement;
using Content.Shared.MedicalScanner;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;
using System.Text;
using static Content.Shared.MedicalScanner.SharedHealthAnalyzerComponent;
namespace Content.Client.HealthAnalyzer.UI
{

8
Content.Server/Medical/Components/HealthAnalyzerComponent.cs
View File

@@ -1,4 +1,3 @@
using System.Threading;
using Content.Server.UserInterface;
using Content.Shared.Disease;
using Content.Shared.MedicalScanner;
@@ -12,8 +11,7 @@ namespace Content.Server.Medical.Components
/// After scanning, retrieves the target Uid to use with its related UI.
/// </summary>
[RegisterComponent]
[ComponentReference(typeof(SharedHealthAnalyzerComponent))]
public sealed class HealthAnalyzerComponent : SharedHealthAnalyzerComponent
public sealed class HealthAnalyzerComponent : Component
{
/// <summary>
/// How long it takes to scan someone.
@@ -27,13 +25,13 @@ namespace Content.Server.Medical.Components
/// Sound played on scanning begin
/// </summary>
[DataField("scanningBeginSound")]
public SoundSpecifier? ScanningBeginSound = null;
public SoundSpecifier? ScanningBeginSound;
/// <summary>
/// Sound played on scanning end
/// </summary>
[DataField("scanningEndSound")]
public SoundSpecifier? ScanningEndSound = null;
public SoundSpecifier? ScanningEndSound;
/// <summary>
/// The disease this will give people.

6
Content.Server/Medical/CryoPodSystem.cs
View File

@@ -165,8 +165,8 @@ public sealed partial class CryoPodSystem: SharedCryoPodSystem
{
_userInterfaceSystem.TrySendUiMessage(
uid,
SharedHealthAnalyzerComponent.HealthAnalyzerUiKey.Key,
new SharedHealthAnalyzerComponent.HealthAnalyzerScannedUserMessage(cryoPodComponent.BodyContainer.ContainedEntity));
HealthAnalyzerUiKey.Key,
new HealthAnalyzerScannedUserMessage(cryoPodComponent.BodyContainer.ContainedEntity));
}
private void OnInteractUsing(EntityUid uid, CryoPodComponent cryoPodComponent, InteractUsingEvent args)
@@ -205,7 +205,7 @@ public sealed partial class CryoPodSystem: SharedCryoPodSystem
else
{
RemComp<ActiveCryoPodComponent>(uid);
_uiSystem.TryCloseAll(uid, SharedHealthAnalyzerComponent.HealthAnalyzerUiKey.Key);
_uiSystem.TryCloseAll(uid, HealthAnalyzerUiKey.Key);
}
UpdateAppearance(uid, component);
}

3
Content.Server/Medical/HealthAnalyzerSystem.cs
View File

@@ -1,5 +1,5 @@
using Content.Server.Medical.Components;
using Content.Server.Disease;
using Content.Server.Medical.Components;
using Content.Server.Popups;
using Content.Shared.Damage;
using Content.Shared.DoAfter;
@@ -8,7 +8,6 @@ using Content.Shared.Interaction;
using Content.Shared.MedicalScanner;
using Content.Shared.Mobs.Components;
using Robust.Server.GameObjects;
using static Content.Shared.MedicalScanner.SharedHealthAnalyzerComponent;
namespace Content.Server.Medical
{

9
Content.Shared/MedicalScanner/HealthAnalyzerDoAfterEvent.cs Normal file
View File

@@ -0,0 +1,9 @@
using Content.Shared.DoAfter;
using Robust.Shared.Serialization;
namespace Content.Shared.MedicalScanner;
[Serializable, NetSerializable]
public sealed class HealthAnalyzerDoAfterEvent : SimpleDoAfterEvent
{
}

18
Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs Normal file
View File

@@ -0,0 +1,18 @@
using Robust.Shared.Serialization;
namespace Content.Shared.MedicalScanner;
/// <summary>
/// On interacting with an entity retrieves the entity UID for use with getting the current damage of the mob.
/// </summary>
[Serializable, NetSerializable]
public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
{
public readonly EntityUid? TargetEntity;
public HealthAnalyzerScannedUserMessage(EntityUid? targetEntity)
{
TargetEntity = targetEntity;
}
}

9
Content.Shared/MedicalScanner/HealthAnalyzerUiKey.cs Normal file
View File

@@ -0,0 +1,9 @@
using Robust.Shared.Serialization;
namespace Content.Shared.MedicalScanner;
[Serializable, NetSerializable]
public enum HealthAnalyzerUiKey : byte
{
Key
}

33
Content.Shared/MedicalScanner/SharedHealthAnalyzerComponent.cs
View File

@@ -1,33 +0,0 @@
using Content.Shared.DoAfter;
using Robust.Shared.Serialization;
namespace Content.Shared.MedicalScanner
{
public abstract class SharedHealthAnalyzerComponent : Component
{
/// <summary>
/// On interacting with an entity retrieves the entity UID for use with getting the current damage of the mob.
/// </summary>
[Serializable, NetSerializable]
public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
{
public readonly EntityUid? TargetEntity;
public HealthAnalyzerScannedUserMessage(EntityUid? targetEntity)
{
TargetEntity = targetEntity;
}
}
[Serializable, NetSerializable]
public enum HealthAnalyzerUiKey : byte
{
Key
}
}
[Serializable, NetSerializable]
public sealed class HealthAnalyzerDoAfterEvent : SimpleDoAfterEvent
{
}
}