diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 35e80e53d18..190b215c3b0 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -63,7 +63,7 @@ else if(ismouse(target)) var/mob/living/simple_animal/mouse/M = target visible_message("SPLAT!") - M.splat() + M.death() playsound(loc, 'sound/effects/snap.ogg', 50, 1) layer = MOB_LAYER - 0.2 armed = FALSE diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 24818d07652..2768aaf4ec3 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -123,7 +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.splat() + M.death() movement_target = null stop_automated_movement = 0 break diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 152e2494132..56a4bccc9dd 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/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) diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 549304a43f3..f4651b1b827 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ