diff --git a/code/modules/mob/living/basic/space_fauna/robot_customer.dm b/code/modules/mob/living/basic/space_fauna/robot_customer.dm
index c880be1fdb9..7ffe1fadd6a 100644
--- a/code/modules/mob/living/basic/space_fauna/robot_customer.dm
+++ b/code/modules/mob/living/basic/space_fauna/robot_customer.dm
@@ -118,3 +118,8 @@
 		order = attending_venue.order_food_line(wanted_item)
 
 	. += span_notice("Their order was: \"[order].\"")
+
+/mob/living/basic/robot_customer/death()
+	new /obj/effect/gibspawner/robot(drop_location())
+
+	return ..()
diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm
index dc0414e8606..485c6ee8281 100644
--- a/code/modules/vehicles/mecha/mecha_wreckage.dm
+++ b/code/modules/vehicles/mecha/mecha_wreckage.dm
@@ -42,6 +42,11 @@
 	if(AI)
 		QDEL_NULL(AI)
 	QDEL_LIST(crowbar_salvage)
+	src.visible_message(span_danger("[src]'s superstructure folds in on itself, collapsing into a heap of unsalvageable scrap!"))
+	playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
+	for(var/mob/living/witness in range(2, src))
+		shake_camera(witness, 2, 1)
+	new /obj/effect/decal/cleanable/blood/gibs/robot_debris(get_turf(src))
 	return ..()
 
 /obj/structure/mecha_wreckage/examine(mob/user)