diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs index 9816d0185a..9707a4ddbe 100644 --- a/Content.Shared/Timing/UseDelaySystem.cs +++ b/Content.Shared/Timing/UseDelaySystem.cs @@ -125,7 +125,9 @@ public sealed class UseDelaySystem : EntitySystem /// public UseDelayInfo GetLastEndingDelay(Entity ent) { - var last = ent.Comp.Delays[DefaultId]; + if (!ent.Comp.Delays.TryGetValue(DefaultId, out var last)) + return new UseDelayInfo(TimeSpan.Zero); + foreach (var entry in ent.Comp.Delays) { if (entry.Value.EndTime > last.EndTime)