diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 4f472f864f..0187d0a9af 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -57,11 +57,9 @@
 	amount--
 
 /obj/effect/decal/cleanable/blood/proc/dry()
-	name = "dried [src]"
+	name = "dried [src.name]"
 	desc = "It's dark red and crusty. Someone is not doing their job."
-	var/icon/I = icon(icon,icon_state)
-	I.SetIntensity(0.7)
-	icon = I
+	color = "#999999"
 	amount = 0
 
 /obj/effect/decal/cleanable/blood/splatter
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 6fd7db5d10..b375755f54 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -79,7 +79,7 @@
 					if(stance_step in list(1,4,7)) //every 3 ticks
 						var/action = pick( list( "growls at [target_mob]", "stares angrily at [target_mob]", "prepares to attack [target_mob]", "closely watches [target_mob]" ) )
 						if(action)
-							emote(action)
+							custom_emote(1,action)
 			if(!found_mob)
 				stance_step--
 
@@ -90,7 +90,7 @@
 
 		if(HOSTILE_STANCE_ATTACKING)
 			if(stance_step >= 20)	//attacks for 20 ticks, then it gets tired and needs to rest
-				emote( "is worn out and needs to rest" )
+				custom_emote(1, "is worn out and needs to rest" )
 				stance = HOSTILE_STANCE_TIRED
 				stance_step = 0
 				walk(src, 0) //This stops the bear's walking
@@ -118,14 +118,16 @@
 /mob/living/simple_animal/hostile/bear/FindTarget()
 	. = ..()
 	if(.)
-		emote("stares alertly at [.]")
+		custom_emote(1,"stares alertly at [.]")
 		stance = HOSTILE_STANCE_ALERT
 
 /mob/living/simple_animal/hostile/bear/LoseTarget()
 	..(5)
 
 /mob/living/simple_animal/hostile/bear/AttackingTarget()
-	emote( pick( list("slashes at [target_mob]", "bites [target_mob]") ) )
+	if(!Adjacent(target_mob))
+		return
+	custom_emote(1, pick( list("slashes at [target_mob]", "bites [target_mob]") ) )
 
 	var/damage = rand(20,30)
 
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 353ca6156f..f1a5c15c4b 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -44,7 +44,7 @@
 /mob/living/simple_animal/hostile/carp/FindTarget()
 	. = ..()
 	if(.)
-		emote("nashes at [.]")
+		custom_emote(1,"nashes at [.]")
 
 /mob/living/simple_animal/hostile/carp/AttackingTarget()
 	. =..()
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 403c31b17f..2dcbe0d949 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -87,6 +87,8 @@
 		return 1
 
 /mob/living/simple_animal/hostile/proc/AttackingTarget()
+	if(!Adjacent(target_mob))
+		return
 	if(isliving(target_mob))
 		var/mob/living/L = target_mob
 		L.attack_animal(src)