Merge remote-tracking branch 'origin/newbranch' into newbranch

DeltaV-Station · Nov 20, 2024 · e287049 · e287049
2 parents 0164605 + 4d4b403
commit e287049
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Content.Server/DeltaV/Pain/PainSystem.cs b/Content.Server/DeltaV/Pain/PainSystem.cs
@@ -55,7 +55,7 @@ private void ShowPainPopup(Entity<PainComponent> 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);

diff --git 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