juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
This commit is contained in:
Ed
2024-07-12 12:53:42 +03:00
parent e87994ae40 b5e49c9c07
commit 0931c9e7d1
327 changed files with 13173 additions and 13957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Lock/LockSystem.cs
View File

@@ -396,7 +396,7 @@ public sealed class LockSystem : EntitySystem
{
args.Cancel();
if (lockComp.Locked)
_sharedPopupSystem.PopupEntity(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
_sharedPopupSystem.PopupClient(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
}
}