diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 718c912a573..64874762050 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -497,7 +497,7 @@
 	log_message("Attack by simple animal. Attacker - [user].",1)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
-	if(user.a_intent == INTENT_HELP || user.melee_damage_upper == 0)
+	if((user.a_intent == INTENT_HELP && user.ckey) || user.melee_damage_upper == 0)
 		user.custom_emote(1, "[user.friendly] [src].")
 	else
 		user.do_attack_animation(src)
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index e48a7068a97..572ff92c4fa 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -104,7 +104,7 @@
 		playsound(loc, 'sound/weapons/slash.ogg', 100, 1)
 
 /obj/attack_animal(mob/living/simple_animal/M)
-	if(M.a_intent == INTENT_HELP || (!M.melee_damage_upper && !M.obj_damage))
+	if((M.a_intent == INTENT_HELP && M.ckey) || (!M.melee_damage_upper && !M.obj_damage))
 		M.custom_emote(1, "[M.friendly] [src].")
 		return 0
 	else
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index cbc25deb926..92a9a6b7b47 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -292,7 +292,7 @@
 	return
 
 /mob/living/attack_animal(mob/living/simple_animal/M)
-	if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
+	if((M.a_intent == INTENT_HELP && M.ckey) || M.melee_damage_upper == 0)
 		M.custom_emote(1, "[M.friendly] [src].")
 		return 0
 	else
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 8a33737483f..eeaa920c83a 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -226,7 +226,7 @@
 // See software.dm for Topic()
 
 /mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M)
-	if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
+	if((M.a_intent == INTENT_HELP && M.ckey) || M.melee_damage_upper == 0)
 		M.custom_emote(1, "[M.friendly] [src].")
 	else
 		M.do_attack_animation(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 464f137665e..ad20789fa41 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -3,7 +3,6 @@
 	stop_automated_movement_when_pulled = 0
 	obj_damage = 40
 	environment_smash = 1 //Set to 1 to break closets,tables,racks, etc; 2 for walls; 3 for rwalls
-	a_intent = INTENT_HARM
 	var/atom/target
 	var/ranged = 0
 	var/rapid = 0
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 21bab5e2449..ed2e9154a10 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -204,7 +204,7 @@
 	return
 
 /obj/spacepod/attack_animal(mob/living/simple_animal/user)
-	if(user.a_intent == INTENT_HELP || user.melee_damage_upper == 0)
+	if((user.a_intent == INTENT_HELP && user.ckey) || user.melee_damage_upper == 0)
 		user.custom_emote(1, "[user.friendly] [src].")
 	else
 		var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)