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

PopupSystem public methods rejig (#12830)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-19 10:41:47 +13:00
committed by GitHub
parent e459452333
commit 881a2b2ece
164 changed files with 721 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
View File

@@ -137,7 +137,7 @@ namespace Content.Server.Medical
/// The mob check seems a bit redundant but (1) they could conceivably have lost it since when the doafter started and (2) I need it for .IsDead()
if (!HasComp<RespiratorComponent>(target) || !TryComp<MobStateComponent>(target, out var mobState) || mobState.IsDead())
{
_popupSystem.PopupEntity(Loc.GetString("stethoscope-dead"), target, Filter.Entities(user));
_popupSystem.PopupEntity(Loc.GetString("stethoscope-dead"), target, user);
return;
}
@@ -149,7 +149,7 @@ namespace Content.Server.Medical
var message = GetDamageMessage(value);
_popupSystem.PopupEntity(Loc.GetString(message), target, Filter.Entities(user));
_popupSystem.PopupEntity(Loc.GetString(message), target, user);
}
private string GetDamageMessage(FixedPoint2 totalOxyloss)