Buildmode enhancement and removes simple_animal for real this time.

code/game/objects/items/weapons/RCD.dm

@@ -32,7 +32,7 @@
 	var/usable = 0
 	if(user.Adjacent(T) && user.get_active_hand() == src && !user.stat && !user.restrained())
 		usable = 1
-	if(!user.IsAdvancedToolUser() && istype(user, /mob/living/simple_animal))
+	if(!user.IsAdvancedToolUser() && istype(user, /mob/living/simple_mob))
 		var/mob/living/simple_mob/S = user
 		if(!S.IsHumanoidToolUser(src))
 			usable = 0

code/game/objects/items/weapons/policetape.dm

@@ -292,7 +292,7 @@ var/list/tape_roll_applications = list()
 		add_fingerprint(M)
 		if (!allowed(M))	//only select few learn art of not crumpling the tape
 			M << "<span class='warning'>You are not supposed to go past [src]...</span>"
-			if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_animal)))
+			if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob)))
 				return 0
 			crumple()
 	return ..(mover)

code/game/objects/items/weapons/stunbaton.dm

@@ -269,9 +269,8 @@
 
 /obj/item/weapon/melee/baton/shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
 	..(target, user, hit_zone)
-	if(istype(target, /mob/living/simple_animal) && status)
-		var/mob/living/simple_animal/SA = target
-		SA.taunt(user)
+	if(status && target.has_AI())
+		target.taunt(user)
 
 // Borg version, for the lost module.
 /obj/item/weapon/melee/baton/shocker/robot