Merge pull request #2673 from TheDZD/fixes

Assorted Fixes

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -174,16 +174,11 @@
 /mob/living/simple_animal/hostile/statue/say()
 	return 0
 
-//Turn to dust when gibbed
-/mob/living/simple_animal/hostile/statue/gib(var/animation = 0)
-	dust(animation)
-
-/mob/living/simple_animal/hostile/statue/death()
-	living_mob_list -= src
-	dead_mob_list += src
-	if(key)
-		respawnable_list += src
-	gib()
+/mob/living/simple_animal/hostile/statue/death(gibbed)
+	if(!gibbed) //The looping ends here.
+		dust()
+		return
+	return ..()
 
 //Stop attacking clientless mobs
 

code/modules/mob/living/simple_animal/vox.dm

@@ -22,15 +22,14 @@
 	var/amp = null
 	var/quills = 3
 
-/mob/living/simple_animal/vox/armalis/death()
-
-	living_mob_list -= src
-	dead_mob_list += src
-	stat = DEAD
-	visible_message("\red <B>[src] shudders violently and explodes!</B>","\red <B>You feel your body rupture!</B>")
-	explosion(get_turf(loc), -1, -1, 3, 5)
-	src.gib()
-	return
+/mob/living/simple_animal/vox/armalis/death(gibbed)
+	if(!gibbed)
+		stat = DEAD
+		visible_message("<span class='danger'>[src] shudders violently and explodes!</B>","\red <B>You feel your body rupture!</span>")
+		explosion(get_turf(loc), -1, -1, 3, 5)
+		gib()
+		return
+	return ..()
 
 /mob/living/simple_animal/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
 	if(O.force)