From c723d16298fcaa18966b6f66f9b01df51d221593 Mon Sep 17 00:00:00 2001 From: Milon Date: Wed, 20 Nov 2024 21:26:19 +0100 Subject: [PATCH 1/2] fix pain popups (#2248) whoopsie!! --- Content.Server/DeltaV/Pain/PainSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/DeltaV/Pain/PainSystem.cs b/Content.Server/DeltaV/Pain/PainSystem.cs index 52a8f172d0e..819c81d17d7 100644 --- a/Content.Server/DeltaV/Pain/PainSystem.cs +++ b/Content.Server/DeltaV/Pain/PainSystem.cs @@ -55,7 +55,7 @@ private void ShowPainPopup(Entity ent) return; var effect = _random.Pick(effects); - _popup.PopupEntity(Loc.GetString(effect), ent.Owner); + _popup.PopupEntity(Loc.GetString(effect), ent, ent); // Set next popup time var delay = _random.NextFloat(ent.Comp.MinimumPopupDelay, ent.Comp.MaximumPopupDelay); From 4d4b4039350d4cb7d2826cc265577615448f1d68 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:26:39 +0100 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 2743cbf369c..473ef03ef22 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: DarkenedSynergy - changes: - - message: Fixed logistics airlocks looking like engineering airlocks when opened. - type: Fix - id: 192 - time: '2023-12-31T16:23:10.0000000+00:00' - author: DangerRevolution and VMSolidus changes: - message: Rumours say that Syndicate Agents have cracked encoded communications! @@ -3747,3 +3741,10 @@ id: 691 time: '2024-11-20T01:10:00.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2234 +- author: MilonPL + changes: + - message: Fixed pain effect popups being visible to everyone. + type: Fix + id: 692 + time: '2024-11-20T20:26:20.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2248