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-05-08-2024-upstream

Browse Source 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml
This commit is contained in:
Ed
2024-08-05 15:28:42 +03:00
parent 1f4b7f68bf f7d8b4e7d4
commit dd580c68c9
883 changed files with 29778 additions and 25586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -1438,7 +1438,7 @@ public abstract class SharedStorageSystem : EntitySystem
private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, StackCountChangedEvent args)
{
if (_containerSystem.TryGetContainingContainer(uid, out var container, component) &&
if (_containerSystem.TryGetContainingContainer((uid, null, component), out var container) &&
container.ID == StorageComponent.ContainerId)
{
UpdateAppearance(container.Owner);