diff --git a/code/game/machinery/vendors/vendor_crits.dm b/code/game/machinery/vendors/vendor_crits.dm
index d8531ac724d..cbc21cb31c5 100644
--- a/code/game/machinery/vendors/vendor_crits.dm
+++ b/code/game/machinery/vendors/vendor_crits.dm
@@ -95,7 +95,13 @@
 	var/obj/item/organ/internal/brain/B = victim.get_int_organ_tag("brain")
 	if(H)
 		victim.visible_message("<span class='danger'>[H] gets crushed under [machine], and explodes in a shower of gore!</span>", "<span class='userdanger'>Oh f-</span>")
-		new /obj/effect/gibspawner/human(get_turf(victim))
+		var/gibspawner = /obj/effect/gibspawner/human
+		if(ismachineperson(victim))
+			gibspawner = /obj/effect/gibspawner/robot
+		else if(isalien(victim))
+			gibspawner = /obj/effect/gibspawner/xeno
+
+		new gibspawner(get_turf(victim))
 		H.drop_organs()
 		H.droplimb(TRUE)
 		H.disfigure()