Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fucking-upstream

Browse Source
This commit is contained in:
Jabak
2024-08-24 13:13:56 +03:00
parent 3c0bf9751e dba9565865
commit b460eb54ba
2222 changed files with 247186 additions and 50848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,10 +135,10 @@ public sealed class HealthAnalyzerSystem : EntitySystem
private void OpenUserInterface(EntityUid user, EntityUid analyzer)
{
if (!TryComp<ActorComponent>(user, out var actor) || !_uiSystem.TryGetUi(analyzer, HealthAnalyzerUiKey.Key, out var ui))
if (!_uiSystem.HasUi(analyzer, HealthAnalyzerUiKey.Key))
return;
_uiSystem.OpenUi(ui, actor.PlayerSession);
_uiSystem.OpenUi(analyzer, HealthAnalyzerUiKey.Key, user);
}
/// <summary>
@@ -179,7 +179,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
/// <param name="scanMode">True makes the UI show ACTIVE, False makes the UI show INACTIVE</param>
public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode)
{
if (!_uiSystem.TryGetUi(healthAnalyzer, HealthAnalyzerUiKey.Key, out var ui))
if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key))
return;
if (!HasComp<DamageableComponent>(target))
@@ -201,9 +201,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
bleeding = bloodstream.BleedAmount > 0;
}
_uiSystem.SendUiMessage(ui, new HealthAnalyzerScannedUserMessage(
_uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(
GetNetEntity(target),
bodyTemperature,
bloodAmount,