diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index 04fbdb6a3b..fa276adbfb 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -81,34 +81,29 @@
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??
+ var/mob/H = src
+ if(H.flying)
+ if(H.incapacitated(INCAPACITATION_ALL))
+ to_chat(src, "You can't fly in your current state.")
+ H.stop_flying() //Should already be done, but just in case.
+ 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.")
+ H.audible_message("[H] begins to flap \his wings, preparing to move upwards!")
+ if(do_after(H, fly_time) && H.flying)
+ to_chat(src, "You fly upwards.")
+ else
+ to_chat(src, "You stopped flying upwards.")
+ return 0
+ else
+ to_chat(src, "Gravity stops you from moving upward.")
+ return 0 //VOREStation Edit End.
+
else
to_chat(src, "Gravity stops you from moving upward.")
return 0
-<<<<<<< HEAD
- else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying??
- var/mob/H = src
- if(H.flying)
- if(H.incapacitated(INCAPACITATION_ALL))
- to_chat(src, "You can't fly in your current state.")
- H.stop_flying() //Should already be done, but just in case.
- 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.")
- H.audible_message("[H] begins to flap \his wings, preparing to move upwards!")
- if(do_after(H, fly_time) && H.flying)
- to_chat(src, "You fly upwards.")
- else
- to_chat(src, "You stopped flying upwards.")
- return 0
- else
- to_chat(src, "Gravity stops you from moving upward.")
- return 0 //VOREStation Edit End.
- else
- to_chat(src, "Gravity stops you from moving upward.")
- return 0
-=======
->>>>>>> 8dc9ba1... Ladders respect Move Up/Down paradigm (#7559)
for(var/atom/A in destination)
if(!A.CanPass(src, start, 1.5, 0))