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

adds both blood level and body temp to analyzers and cryo (#16778)

Browse Source 
* Ports temperature scanning from mining station 14

* Added blood level to analyzer

* adds body temp and blood level to health analyzers and cryo

* Blood and temperature will show N/A if not available
This commit is contained in:
Whisper
2023-07-18 17:13:26 -04:00
committed by GitHub
parent 4a3831c7b1
commit 301fbffcfd
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,13 @@ namespace Content.Client.HealthAnalyzer.UI
text.Append($"{Loc.GetString("health-analyzer-window-entity-health-text", ("entityName", entityName))}\n");
text.Append(String.Format("Temperature: {0}\n", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - 273f:F1} °C"));
text.Append(String.Format("Blood Level: {0}\n", float.IsNaN(msg.BloodLevel) ? "N/A" : $"{msg.BloodLevel * 100:F1} %"));
// Damage
text.Append($"\n{Loc.GetString("health-analyzer-window-entity-damage-total-text", ("amount", damageable.TotalDamage))}\n");

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

@@ -31,6 +31,7 @@ using Content.Shared.Tools;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
using Robust.Shared.Timing;
using Content.Server.Temperature.Components;
namespace Content.Server.Medical;
@@ -177,10 +178,14 @@ public sealed partial class CryoPodSystem: SharedCryoPodSystem
private void OnActivateUI(EntityUid uid, CryoPodComponent cryoPodComponent, AfterActivatableUIOpenEvent args)
{
TryComp<TemperatureComponent>(cryoPodComponent.BodyContainer.ContainedEntity, out var temp);
TryComp<BloodstreamComponent>(cryoPodComponent.BodyContainer.ContainedEntity, out var bloodstream);
_userInterfaceSystem.TrySendUiMessage(
uid,
HealthAnalyzerUiKey.Key,
new HealthAnalyzerScannedUserMessage(cryoPodComponent.BodyContainer.ContainedEntity));
new HealthAnalyzerScannedUserMessage(cryoPodComponent.BodyContainer.ContainedEntity,
temp != null ? temp.CurrentTemperature : 0, bloodstream != null ? bloodstream.BloodSolution.FillFraction : 0));
}
private void OnInteractUsing(EntityUid uid, CryoPodComponent cryoPodComponent, InteractUsingEvent args)

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

@@ -6,6 +6,8 @@ using Content.Shared.Interaction;
using Content.Shared.MedicalScanner;
using Content.Shared.Mobs.Components;
using Robust.Server.GameObjects;
using Content.Server.Temperature.Components;
using Content.Server.Body.Components;
namespace Content.Server.Medical
{
@@ -68,8 +70,13 @@ namespace Content.Server.Medical
if (!HasComp<DamageableComponent>(target))
return;
TryComp<TemperatureComponent>(target, out var temp);
TryComp<BloodstreamComponent>(target, out var bloodstream);
OpenUserInterface(user, healthAnalyzer);
_uiSystem.SendUiMessage(healthAnalyzer.UserInterface, new HealthAnalyzerScannedUserMessage(target));
_uiSystem.SendUiMessage(healthAnalyzer.UserInterface, new HealthAnalyzerScannedUserMessage(target, temp != null ? temp.CurrentTemperature : float.NaN,
bloodstream != null ? bloodstream.BloodSolution.FillFraction : float.NaN));
}
}
}

8
Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
View File

@@ -1,4 +1,4 @@
using Robust.Shared.Serialization;
using Robust.Shared.Serialization;
namespace Content.Shared.MedicalScanner;
@@ -9,10 +9,14 @@ namespace Content.Shared.MedicalScanner;
public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
{
public readonly EntityUid? TargetEntity;
public float Temperature;
public float BloodLevel;
public HealthAnalyzerScannedUserMessage(EntityUid? targetEntity)
public HealthAnalyzerScannedUserMessage(EntityUid? targetEntity, float temperature, float bloodLevel)
{
TargetEntity = targetEntity;
Temperature = temperature;
BloodLevel = bloodLevel;
}
}