Tweak: combat mode toggles combat indicator automatically

code/modules/mob/living/living_defense.dm

@@ -128,11 +128,11 @@
 	if(hud_used?.action_intent)
 		hud_used.action_intent.update_appearance()
 	//SKYRAT EDIT ADDITION BEGIN
-	if(!ishuman(src) && !ckey)
-		if(combat_mode)
-			set_combat_indicator(TRUE)
-		else
-			set_combat_indicator(FALSE)
+	//if(!ishuman(src) && !ckey)
+	if(combat_mode)
+		set_combat_indicator(TRUE)
+	else
+		set_combat_indicator(FALSE)
 	face_mouse = (client?.prefs?.read_preference(/datum/preference/toggle/face_cursor_combat_mode) && combat_mode) ? TRUE : FALSE
 	//SKYRAT EDIT ADDITION END
 

modular_ss220/modules/combat_indicator/combat_indicator.dm

@@ -0,0 +1,2 @@
+/mob/living/user_toggle_combat_indicator()
+	set_combat_mode(!combat_mode, FALSE) //Change combat mode instead

tgstation.dme

@@ -5542,13 +5542,13 @@
 #include "interface\interface.dm"
 #include "interface\menu.dm"
 #include "interface\stylesheet.dm"
+#include "interface\skin.dmf"
 #include "interface\fonts\fonts_datum.dm"
 #include "interface\fonts\grand_9k.dm"
 #include "interface\fonts\pixellari.dm"
 #include "interface\fonts\spess_font.dm"
 #include "interface\fonts\tiny_unicode.dm"
 #include "interface\fonts\vcr_osd_mono.dm"
-#include "interface\skin.dmf"
 #include "modular_skyrat\master_files\code\_globalvars\configuration.dm"
 #include "modular_skyrat\master_files\code\_globalvars\religion.dm"
 #include "modular_skyrat\master_files\code\_globalvars\lists\ambience.dm"
@@ -7279,6 +7279,7 @@
 #include "modular_ss220\master_files_skyrat\code\modules\client\preferences\emote_panel.dm"
 #include "modular_ss220\modules\auto_cryo\autocryo.dm"
 #include "modular_ss220\modules\auto_cryo\autocryo_config.dm"
+#include "modular_ss220\modules\combat_indicator\combat_indicator.dm"
 #include "modular_ss220\modules\cyrillic_key_fixes\code\client_procs.dm"
 #include "modular_ss220\modules\cyrillic_key_fixes\code\communication.dm"
 #include "modular_ss220\modules\cyrillic_key_fixes\code\keybindings.dm"