tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another round of DoAfter fixes (#14295)

Browse Source
This commit is contained in:
keronshb
2023-02-28 19:51:42 -05:00
committed by GitHub
parent 20f54d2ace
commit e9dbcc4278
10 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
View File

@@ -77,12 +77,19 @@ namespace Content.Server.Kitchen.EntitySystems
if (TryComp<ButcherableComponent>(args.Args.Target.Value, out var butcherable))
butcherable.BeingButchered = false;
if (args.Handled || args.Cancelled)
if (args.Cancelled)
{
component.InUse = false;
return;
}
if (args.Handled)
return;
if (Spikeable(uid, args.Args.User, args.Args.Target.Value, component, butcherable))
Spike(uid, args.Args.User, args.Args.Target.Value, component);
component.InUse = false;
args.Handled = true;
}