NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge stable into master (#38395)

Browse source
This commit is contained in:
slarticodefast 2025-06-17 17:25:30 +02:00 • committed by GitHub
commit 5a69b7e2fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Shared/Actions/SharedActionsSystem.cs
View file

@ -108,7 +108,7 @@ public abstract class SharedActionsSystem : EntitySystem
/// </summary>
public Entity<ActionComponent>? GetAction(Entity<ActionComponent?>? action, bool logError = true)
{
if (action is not {} ent || TerminatingOrDeleted(ent))
if (action is not {} ent || Deleted(ent))
return null;
if (!_actionQuery.Resolve(ent, ref ent.Comp, logError))