Merge pull request #14057 from Kyep/fixes_13823_blob_mouse_splat

Fixes blob mouse splatting, refactors mice a bit

code/modules/assembly/mousetrap.dm

@@ -63,6 +63,7 @@
 	else if(ismouse(target))
 		var/mob/living/simple_animal/mouse/M = target
 		visible_message("<span class='danger'>SPLAT!</span>")
+		M.death()
 		M.splat()
 	playsound(loc, 'sound/effects/snap.ogg', 50, 1)
 	layer = MOB_LAYER - 0.2

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

@@ -123,6 +123,7 @@
 		for(var/mob/living/simple_animal/mouse/M in view(1, src))
 			if(!M.stat && Adjacent(M))
 				custom_emote(1, "splats \the [M]!")
+				M.death()
 				M.splat()
 				movement_target = null
 				stop_automated_movement = 0

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

@@ -80,15 +80,6 @@
 	icon_resting = "mouse_[mouse_color]_sleep"
 	desc = "It's a small [mouse_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
 
-/mob/living/simple_animal/mouse/proc/splat()
-	src.health = 0
-	src.stat = DEAD
-	src.icon_dead = "mouse_[mouse_color]_splat"
-	src.icon_state = "mouse_[mouse_color]_splat"
-	layer = MOB_LAYER
-	if(client)
-		client.time_died_as_mouse = world.time
-
 /mob/living/simple_animal/mouse/attack_hand(mob/living/carbon/human/M as mob)
 	if(M.a_intent == INTENT_HELP)
 		get_scooped(M)
@@ -110,6 +101,10 @@
 	desc = "It's toast."
 	death()
 
+/mob/living/simple_animal/mouse/proc/splat()
+	icon_dead = "mouse_[mouse_color]_splat"
+	icon_state = "mouse_[mouse_color]_splat"
+
 /mob/living/simple_animal/mouse/death(gibbed)
 	// Only execute the below if we successfully died
 	playsound(src, squeak_sound, 40, 1)