Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

8
Content.Server/Animals/Systems/EggLayerSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Actions;
using Content.Server.Actions;
using Content.Server.Animals.Components;
using Content.Server.Nutrition.Components;
using Content.Server.Popups;
@@ -73,7 +73,7 @@ public sealed class EggLayerSystem : EntitySystem
{
if (hunger.CurrentHunger < component.HungerUsage)
{
_popup.PopupEntity(Loc.GetString("action-popup-lay-egg-too-hungry"), uid, Filter.Entities(uid));
_popup.PopupEntity(Loc.GetString("action-popup-lay-egg-too-hungry"), uid, uid);
return false;
}
@@ -87,8 +87,8 @@ public sealed class EggLayerSystem : EntitySystem
// Sound + popups
SoundSystem.Play(component.EggLaySound.GetSound(), Filter.Pvs(uid), uid, component.EggLaySound.Params);
_popup.PopupEntity(Loc.GetString("action-popup-lay-egg-user"), uid, Filter.Entities(uid));
_popup.PopupEntity(Loc.GetString("action-popup-lay-egg-others", ("entity", uid)), uid, Filter.PvsExcept(uid));
_popup.PopupEntity(Loc.GetString("action-popup-lay-egg-user"), uid, uid);
_popup.PopupEntity(Loc.GetString("action-popup-lay-egg-others", ("entity", uid)), uid, Filter.PvsExcept(uid), true);
return true;
}

6
Content.Server/Animals/Systems/UdderSystem.cs
View File

@@ -68,7 +68,7 @@ namespace Content.Server.Animals.Systems
if (udder.BeingMilked)
{
_popupSystem.PopupEntity(Loc.GetString("udder-system-already-milking"), uid, Filter.Entities(userUid));
_popupSystem.PopupEntity(Loc.GetString("udder-system-already-milking"), uid, userUid);
return;
}
@@ -101,7 +101,7 @@ namespace Content.Server.Animals.Systems
var quantity = solution.TotalVolume;
if(quantity == 0)
{
_popupSystem.PopupEntity(Loc.GetString("udder-system-dry"), uid, Filter.Entities(ev.UserUid));
_popupSystem.PopupEntity(Loc.GetString("udder-system-dry"), uid, ev.UserUid);
return;
}
@@ -112,7 +112,7 @@ namespace Content.Server.Animals.Systems
_solutionContainerSystem.TryAddSolution(ev.ContainerUid, targetSolution, split);
_popupSystem.PopupEntity(Loc.GetString("udder-system-success", ("amount", quantity), ("target", Identity.Entity(ev.ContainerUid, EntityManager))), uid,
Filter.Entities(ev.UserUid), PopupType.Medium);
ev.UserUid, PopupType.Medium);
}
private void OnMilkingFailed(EntityUid uid, UdderComponent component, MilkingFailEvent ev)