From 90ff882149c5ce6872de5cd2b45708b6094183bf Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 22 Nov 2018 18:34:13 -0800 Subject: [PATCH] use Ansari snipped and SEND_SOUND macro --- code/modules/mob/dead/dead.dm | 28 +++---------------- .../living/simple_animal/friendly/mouse.dm | 2 +- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index dc7c88eb723..fb28f0eea37 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -1,25 +1,5 @@ /mob/dead/forceMove(atom/destination) - // Exactly the same as code/game/atoms_movable.dm#141 except doesn't call for(var/atom/movable/AM in destination) AM.Crossed(src) - // Overriden to prevent things like mice squeaking when ghosts walk on them. - var/turf/old_loc = loc - loc = destination - - if(old_loc) - old_loc.Exited(src, destination) - for(var/atom/movable/AM in old_loc) - AM.Uncrossed(src) - - if(destination) - destination.Entered(src) - - if(isturf(destination) && opacity) - var/turf/new_loc = destination - new_loc.reconsider_lights() - - if(isturf(old_loc) && opacity) - old_loc.reconsider_lights() - - for(var/datum/light_source/L in light_sources) - L.source_atom.update_light() - - return 1 + // Overriden from code/game/atoms_movable.dm#141 to prevent things like mice squeaking when ghosts walk on them. + var/oldloc = loc + loc = destination + Moved(oldloc, NONE, TRUE) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 7be537c4d35..5ebaf47afb2 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -93,7 +93,7 @@ if(stat == CONSCIOUS) var/mob/M = AM to_chat(M, "[bicon(src)] Squeek!") - M << 'sound/effects/mousesqueek.ogg' + SEND_SOUND(M, 'sound/effects/mousesqueek.ogg') ..() /mob/living/simple_animal/mouse/death(gibbed)