tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Banana cream pie loc improvements (#36829)

Browse Source 
* CAPITALIZE(THE($owner))

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

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

* Simplify filter
This commit is contained in:
Tayrtahn
2025-04-22 14:15:39 -04:00
committed by GitHub
parent ebf9f4a38e
commit b8a894bfd1
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
View File

@@ -94,17 +94,14 @@ namespace Content.Server.Nutrition.EntitySystems
protected override void CreamedEntity(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args) protected override void CreamedEntity(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args)
{ {
_popup.PopupEntity(Loc.GetString("cream-pied-component-on-hit-by-message", _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); uid, args.Target);
var otherPlayers = Filter.Empty().AddPlayersByPvs(uid); var otherPlayers = Filter.PvsExcept(uid);
if (TryComp<ActorComponent>(args.Target, out var actor))
{
otherPlayers.RemovePlayer(actor.PlayerSession);
}
_popup.PopupEntity(Loc.GetString("cream-pied-component-on-hit-by-message-others", _popup.PopupEntity(Loc.GetString("cream-pied-component-on-hit-by-message-others",
("owner", Identity.Entity(uid, EntityManager)), ("owner", Identity.Entity(uid, EntityManager)),
("thrower", Identity.Entity(args.Thrown, EntityManager))), ("thrown", Identity.Entity(args.Thrown, EntityManager))),
uid, otherPlayers, false); uid, otherPlayers, false);
} }

4
Resources/Locale/en-US/nutrition/components/cream-pied-component.ftl
View File

@@ -1,2 +1,2 @@
cream-pied-component-on-hit-by-message = You have 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 = {$owner} has been creamed by {$thrower}! cream-pied-component-on-hit-by-message-others = {CAPITALIZE(THE($owner))} has been creamed by {INDEFINITE($thrown)} {$thrown}!