From bc5634d6ba360b3465d5e2393d64a397ece22c22 Mon Sep 17 00:00:00 2001
From: nikothedude <59709059+nikothedude@users.noreply.github.com>
Date: Sat, 11 Dec 2021 21:14:19 -0500
Subject: [PATCH] [NON-MODULAR] Lets sentient non-human typepath mobs (and
 borgs) switch combat modes without changing CI status, FINALLY. (#9920)

* fixes the thing

* ckey is implied
---
 code/modules/mob/living/living_defense.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 4a68b293fd5..d52027bd65a 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -87,7 +87,7 @@
 				G.toggle_safety(src, "off")
 			else
 				G.toggle_safety(src, "on")
-	if(!ishuman(src))
+	if(!ishuman(src) && !ckey)
 		if(combat_mode)
 			set_combat_indicator(TRUE)
 		else