From e90fac14eb9d8ecd7267ea7d7381ad0f3abc8886 Mon Sep 17 00:00:00 2001
From: Winkarst-cpu <74284083+Winkarst-cpu@users.noreply.github.com>
Date: Wed, 20 Aug 2025 01:30:55 +0300
Subject: [PATCH] Fix: Untoggle removed actions (#39526)

* Fix

* Update Content.Shared/Actions/SharedActionsSystem.cs

Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>

---------

Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>
---
 Content.Shared/Actions/SharedActionsSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index c4581cfbff..c0a32e6038 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -832,7 +832,8 @@ public abstract class SharedActionsSystem : EntitySystem
         performer.Comp.Actions.Remove(ent.Owner);
         Dirty(performer, performer.Comp);
         ent.Comp.AttachedEntity = null;
-        DirtyField(ent, ent.Comp, nameof(ActionComponent.AttachedEntity));
+        ent.Comp.Toggled = false;
+        DirtyFields(ent, ent.Comp, null, nameof(ActionComponent.AttachedEntity), nameof(ActionComponent.Toggled));
         ActionRemoved((performer, performer.Comp), ent);
 
         if (ent.Comp.Temporary)
-- 
2.51.2