Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Меньше попапов в чат (#143)

Browse Source 
* add: less popups in chat

* fix: less brackets
This commit is contained in:
ThereDrD0
2024-02-29 13:36:13 +03:00
committed by GitHub
parent 97b0cb1acb
commit be32d673cb
21 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Botany/Systems/PlantHolderSystem.cs
View File

@@ -198,8 +198,6 @@ public sealed class PlantHolderSystem : EntitySystem
{
_popup.PopupCursor(Loc.GetString("plant-holder-component-remove-weeds-message",
("name", Comp<MetaDataComponent>(uid).EntityName)), args.User, PopupType.Medium);
_popup.PopupEntity(Loc.GetString("plant-holder-component-remove-weeds-others-message",
("otherName", Comp<MetaDataComponent>(args.User).EntityName)), uid, Filter.PvsExcept(args.User), true);
component.WeedLevel = 0;
UpdateSprite(uid, component);
}
@@ -217,8 +215,6 @@ public sealed class PlantHolderSystem : EntitySystem
{
_popup.PopupCursor(Loc.GetString("plant-holder-component-remove-plant-message",
("name", Comp<MetaDataComponent>(uid).EntityName)), args.User, PopupType.Medium);
_popup.PopupEntity(Loc.GetString("plant-holder-component-remove-plant-others-message",
("name", Comp<MetaDataComponent>(args.User).EntityName)), uid, Filter.PvsExcept(args.User), true);
RemovePlant(uid, component);
}
else

8
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -308,15 +308,9 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
private void OnThrowCollide(EntityUid uid, SharedDisposalUnitComponent component, ThrowHitByEvent args)
{
var canInsert = CanInsert(uid, component, args.Thrown);
var randDouble = _robustRandom.NextDouble();
if (!canInsert || randDouble > 0.75)
{
_audioSystem.PlayPvs(component.MissSound, uid);
_popupSystem.PopupEntity(Loc.GetString("disposal-unit-thrown-missed"), uid);
if (!canInsert) // WD edit
return;
}
var inserted = _containerSystem.Insert(args.Thrown, component.Container);

2
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -390,7 +390,7 @@ public sealed class DrinkSystem : EntitySystem
Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User,
args.User);
_popup.PopupEntity($"{userName} делает глоток используя {used}", args.User, Filter.PvsExcept(args.User), true);
_popup.PopupEntity($"{userName} делает глоток из {used}", args.User, Filter.PvsExcept(args.User), true);
}
// log successful voluntary drinking

11
Content.Server/VendingMachines/VendingMachineSystem.cs
View File

@@ -323,7 +323,7 @@ namespace Content.Server.VendingMachines
if (_accessReader.IsAllowed(sender, uid, accessReader) || HasComp<EmaggedComponent>(uid))
return true;
Popup.PopupEntity(Loc.GetString("vending-machine-component-try-eject-access-denied"), uid);
Popup.PopupClient(Loc.GetString("vending-machine-component-try-eject-access-denied"), uid, sender);
Deny(uid, vendComponent);
return false;
}
@@ -351,14 +351,19 @@ namespace Content.Server.VendingMachines
if (entry == null)
{
Popup.PopupEntity(Loc.GetString("vending-machine-component-try-eject-invalid-item"), uid);
if (sender.HasValue)
Popup.PopupClient(Loc.GetString("vending-machine-component-try-eject-invalid-item"), uid, sender.Value);
Deny(uid, vendComponent);
return;
}
if (entry.Amount <= 0)
{
Popup.PopupEntity(Loc.GetString("vending-machine-component-try-eject-out-of-stock"), uid);
if (sender.HasValue)
Popup.PopupClient(Loc.GetString("vending-machine-component-try-eject-out-of-stock"), uid, sender.Value);
Deny(uid, vendComponent);
return;
}

5
Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs
View File

@@ -35,7 +35,8 @@ public sealed class NodeScannerSystem : EntitySystem
&& !_useDelay.TryResetDelay((uid, useDelay), true))
return;
_popupSystem.PopupEntity(Loc.GetString("node-scan-popup",
("id", $"{artifact.CurrentNodeId}")), target);
// WD edit
_popupSystem.PopupClient(Loc.GetString("node-scan-popup",
("id", $"{artifact.CurrentNodeId}")), target, args.User);
}
}