From: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Date: Wed, 25 Jun 2025 09:54:57 +0000 (+0200)
Subject: allow combat mode toggling when unable to interact (#38573)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f96705f5fcf2781a27f5c8b273326dc0eb02bb57;p=space-station-14.git

allow combat mode toggling when unable to interact (#38573)

allow combat mode toggling when cuffed or crit
---

diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index d7971c706f..40a576b453 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -221,7 +221,7 @@
     event: !type:ToggleClothingEvent
 
 - type: entity
-  parent: BaseAction
+  parent: BaseMentalAction
   id: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode