diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 69ea1051f0e..f4fb3ffef87 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -59,7 +59,7 @@ if(lattice) var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1) to_chat(src, "You grab \the [lattice] and start pulling yourself upward...") - destination.audible_message("You hear something climbing up \the [lattice].", runemessage = "clank clang") + src.audible_message("[src] begins climbing up \the [lattice].", runemessage = "clank clang") if(do_after(src, pull_up_time)) to_chat(src, "You pull yourself up.") else @@ -74,14 +74,14 @@ if(!destination?.Enter(src, old_dest)) to_chat(src, "There's something in the way up above in that direction, try another.") return 0 - destination.audible_message("You hear something climbing up \the [catwalk].", runemessage = "clank clang") + src.audible_message("[src] begins climbing up \the [lattice].", runemessage = "clank clang") if(do_after(src, pull_up_time)) to_chat(src, "You pull yourself up.") else to_chat(src, "You gave up on pulling yourself up.") return 0 - else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? + else if(isliving(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? var/mob/living/H = src if(H.flying) if(H.incapacitated(INCAPACITATION_ALL)) @@ -90,7 +90,6 @@ return 0 var/fly_time = max(7 SECONDS + (H.movement_delay() * 10), 1) //So it's not too useful for combat. Could make this variable somehow, but that's down the road. to_chat(src, "You begin to fly upwards...") - destination.audible_message("You hear the flapping of wings.", runemessage = "flap flap") H.audible_message("[H] begins to flap \his wings, preparing to move upwards!", runemessage = "flap flap") if(do_after(H, fly_time) && H.flying) to_chat(src, "You fly upwards.") @@ -111,6 +110,11 @@ return 0 if(!Move(destination)) return 0 + if(isliving(src)) + if(direction == UP) + src.audible_message("[src] moves up.") + else if(direction == DOWN) + src.audible_message("[src] moves down.") return 1 /mob/proc/can_overcome_gravity()