More fixes

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -20,7 +20,7 @@
 	icon_living = "spiderbot-chassis"
 	icon_dead = "spiderbot-smashed"
 	wander = 0
-
+	universal_speak = 1
 	health = 10
 	maxHealth = 10
 

code/modules/mob/mob.dm

@@ -932,7 +932,7 @@ mob/verb/yank_out_object()
 	if(usr in respawnable_list)
 		var/list/creatures = list("Mouse")
 		for(var/mob/living/simple_animal/S in living_mob_list)
-			if(safe_animal(S.type))
+			if(safe_animal_respawn(S.type))
 				if(!S.key)
 					creatures += S
 		var/picked = input("Please select a creature to respawn as", "Respawn as Mindless Creature")  as null|anything in creatures

code/modules/mob/transform_procs.dm

@@ -380,3 +380,33 @@
 		return 1 // ZOMG PONIES WHEEE
 	//Not in here? Must be untested!
 	return 0
+
+
+/mob/proc/safe_animal_respawn(var/MP)
+//Bad mobs! - Remember to add a comment explaining what's wrong with the mob
+	if(!MP)
+		return 0	//Sanity, this should never happen.
+
+//Good mobs!
+	if(ispath(MP, /mob/living/simple_animal/cat))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/corgi))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/crab))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/chicken))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/cow))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/parrot))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/pony))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/hostile/carp))
+		return 1
+	if(ispath(MP, /mob/living/simple_animal/hostile/bear))
+		return 1
+
+
+	//Not in here? Must be untested!
+	return 0