diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index d4650aa1bbb..718c912a573 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -497,8 +497,8 @@
 	log_message("Attack by simple animal. Attacker - [user].",1)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
-	if(user.melee_damage_upper == 0)
-		user.custom_emote(1, "[user.friendly] [src]")
+	if(user.a_intent == INTENT_HELP || user.melee_damage_upper == 0)
+		user.custom_emote(1, "[user.friendly] [src].")
 	else
 		user.do_attack_animation(src)
 		if(!prob(deflect_chance))
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index d31338dfe06..e48a7068a97 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -104,8 +104,8 @@
 		playsound(loc, 'sound/weapons/slash.ogg', 100, 1)
 
 /obj/attack_animal(mob/living/simple_animal/M)
-	if(!M.melee_damage_upper && !M.obj_damage)
-		M.custom_emote(1, "[M.friendly] [src]")
+	if(M.a_intent == INTENT_HELP || (!M.melee_damage_upper && !M.obj_damage))
+		M.custom_emote(1, "[M.friendly] [src].")
 		return 0
 	else
 		var/play_soundeffect = 1
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index bc4eeb804b9..cbc25deb926 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -292,8 +292,8 @@
 	return
 
 /mob/living/attack_animal(mob/living/simple_animal/M)
-	if(M.melee_damage_upper == 0)
-		M.custom_emote(1, "[M.friendly] [src]")
+	if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
+		M.custom_emote(1, "[M.friendly] [src].")
 		return 0
 	else
 		if(M.attack_sound)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 210aeadb7ee..8a33737483f 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -225,9 +225,9 @@
 
 // See software.dm for Topic()
 
-/mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M as mob)
-	if(M.melee_damage_upper == 0)
-		M.custom_emote(1, "[M.friendly] [src]")
+/mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M)
+	if(M.a_intent == INTENT_HELP || M.melee_damage_upper == 0)
+		M.custom_emote(1, "[M.friendly] [src].")
 	else
 		M.do_attack_animation(src)
 		if(M.attack_sound)
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 7f5bcda9614..21bab5e2449 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -203,9 +203,9 @@
 	deal_damage(30)
 	return
 
-/obj/spacepod/attack_animal(mob/living/simple_animal/user as mob)
-	if(user.melee_damage_upper == 0)
-		user.custom_emote(1, "[user.friendly] [src]")
+/obj/spacepod/attack_animal(mob/living/simple_animal/user)
+	if(user.a_intent == INTENT_HELP || user.melee_damage_upper == 0)
+		user.custom_emote(1, "[user.friendly] [src].")
 	else
 		var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
 		deal_damage(damage)