From b8a894bfd18ccee9b811a90c0abfc700a4fca22c Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 22 Apr 2025 14:15:39 -0400
Subject: [PATCH] Banana cream pie loc improvements (#36829)

* CAPITALIZE(THE($owner))

* Rename "thrower" to "thrown"; use THE($thrown)

* "the banana cream pie" -> "a banana cream pie"

* Simplify filter
---
 .../Nutrition/EntitySystems/CreamPieSystem.cs         | 11 ++++-------
 .../nutrition/components/cream-pied-component.ftl     |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index 108280f088..200554faa3 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -94,17 +94,14 @@ namespace Content.Server.Nutrition.EntitySystems
         protected override void CreamedEntity(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args)
         {
             _popup.PopupEntity(Loc.GetString("cream-pied-component-on-hit-by-message",
-                                            ("thrower", Identity.Entity(args.Thrown, EntityManager))),
+                                            ("thrown", Identity.Entity(args.Thrown, EntityManager))),
                                             uid, args.Target);
 
-            var otherPlayers = Filter.Empty().AddPlayersByPvs(uid);
-            if (TryComp<ActorComponent>(args.Target, out var actor))
-            {
-                otherPlayers.RemovePlayer(actor.PlayerSession);
-            }
+            var otherPlayers = Filter.PvsExcept(uid);
+
             _popup.PopupEntity(Loc.GetString("cream-pied-component-on-hit-by-message-others",
                                             ("owner", Identity.Entity(uid, EntityManager)),
-                                            ("thrower", Identity.Entity(args.Thrown, EntityManager))),
+                                            ("thrown", Identity.Entity(args.Thrown, EntityManager))),
                                             uid, otherPlayers, false);
         }
 
diff --git a/Resources/Locale/en-US/nutrition/components/cream-pied-component.ftl b/Resources/Locale/en-US/nutrition/components/cream-pied-component.ftl
index a75f163adb..5df241440f 100644
--- a/Resources/Locale/en-US/nutrition/components/cream-pied-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/cream-pied-component.ftl
@@ -1,2 +1,2 @@
-cream-pied-component-on-hit-by-message =  You have been creamed by {$thrower}!
-cream-pied-component-on-hit-by-message-others = {$owner} has been creamed by {$thrower}!
+cream-pied-component-on-hit-by-message =  You have been creamed by {INDEFINITE($thrown)} {$thrown}!
+cream-pied-component-on-hit-by-message-others = {CAPITALIZE(THE($owner))} has been creamed by {INDEFINITE($thrown)} {$thrown}!