Revert "Revert "Ed 09 06 2024 upstream (#230)" (#233)"

This reverts commit b89117f8e6.
This commit is contained in:
Ed
2024-06-11 15:19:52 +03:00
committed by GitHub
parent b89117f8e6
commit bb3c74d557
402 changed files with 21561 additions and 11300 deletions

View File

@@ -302,7 +302,7 @@ public abstract class SharedStorageSystem : EntitySystem
return;
// prevent spamming bag open / honkerton honk sound
silent |= TryComp<UseDelayComponent>(uid, out var useDelay) && UseDelay.IsDelayed((uid, useDelay));
silent |= TryComp<UseDelayComponent>(uid, out var useDelay) && UseDelay.IsDelayed((uid, useDelay), id: OpenUiUseDelayID);
if (!CanInteract(entity, (uid, storageComp), silent: silent))
return;
@@ -312,7 +312,7 @@ public abstract class SharedStorageSystem : EntitySystem
Audio.PlayPredicted(storageComp.StorageOpenSound, uid, entity);
if (useDelay != null)
UseDelay.TryResetDelay((uid, useDelay));
UseDelay.TryResetDelay((uid, useDelay), id: OpenUiUseDelayID);
}
_ui.OpenUi(uid, StorageComponent.StorageUiKey.Key, entity);