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

6
Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
View File

@@ -94,7 +94,7 @@ public sealed class EntityStorageSystem : EntitySystem
if (component.Contents.Contains(args.User))
{
var msg = Loc.GetString("entity-storage-component-already-contains-user-message");
_popupSystem.PopupEntity(msg, args.User, Filter.Entities(args.User));
_popupSystem.PopupEntity(msg, args.User, args.User);
args.Cancel();
}
}
@@ -274,7 +274,7 @@ public sealed class EntityStorageSystem : EntitySystem
if (component.IsWeldedShut)
{
if (!silent && !component.Contents.Contains(user))
_popupSystem.PopupEntity(Loc.GetString("entity-storage-component-welded-shut-message"), target, Filter.Pvs(target));
_popupSystem.PopupEntity(Loc.GetString("entity-storage-component-welded-shut-message"), target);
return false;
}
@@ -286,7 +286,7 @@ public sealed class EntityStorageSystem : EntitySystem
if (!_interactionSystem.InRangeUnobstructed(target, newCoords, 0, collisionMask: component.EnteringOffsetCollisionFlags))
{
if (!silent)
_popupSystem.PopupEntity(Loc.GetString("entity-storage-component-cannot-open-no-space"), target, Filter.Pvs(target));
_popupSystem.PopupEntity(Loc.GetString("entity-storage-component-cannot-open-no-space"), target);
return false;
}
}

8
Content.Server/Storage/EntitySystems/SecretStashSystem.cs
View File

@@ -70,7 +70,7 @@ namespace Content.Server.Storage.EntitySystems
if (container.ContainedEntity != null)
{
var msg = Loc.GetString("comp-secret-stash-action-hide-container-not-empty");
_popupSystem.PopupEntity(msg, uid, Filter.Entities(userUid));
_popupSystem.PopupEntity(msg, uid, userUid);
return false;
}
@@ -80,7 +80,7 @@ namespace Content.Server.Storage.EntitySystems
{
var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big",
("item", itemName), ("stash", component.SecretPartName));
_popupSystem.PopupEntity(msg, uid, Filter.Entities(userUid));
_popupSystem.PopupEntity(msg, uid, userUid);
return false;
}
@@ -93,7 +93,7 @@ namespace Content.Server.Storage.EntitySystems
// all done, show success message
var successMsg = Loc.GetString("comp-secret-stash-action-hide-success",
("item", itemName), ("this", component.SecretPartName));
_popupSystem.PopupEntity(successMsg, uid, Filter.Entities(userUid));
_popupSystem.PopupEntity(successMsg, uid, userUid);
return true;
}
@@ -122,7 +122,7 @@ namespace Content.Server.Storage.EntitySystems
// show success message
var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something",
("stash", component.SecretPartName));
_popupSystem.PopupEntity(successMsg, uid, Filter.Entities(userUid));
_popupSystem.PopupEntity(successMsg, uid, userUid);
return true;
}

2
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -721,7 +721,7 @@ namespace Content.Server.Storage.EntitySystems
{
if (!storageComp.ShowPopup) return;
_popupSystem.PopupEntity(Loc.GetString(message), player, Filter.Entities(player));
_popupSystem.PopupEntity(Loc.GetString(message), player, player);
}
/// <summary>