diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 6c25e551737..945175111f3 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -104,6 +104,9 @@ if(incapacitated()) return 0 + if(wings_flying) //VOREStation Edit. Allows movement up/down with wings. + return 1 //VOREStation Edit + if(Process_Spacemove()) return 1 @@ -162,8 +165,8 @@ if(ishuman(src)) //VOREStation Edit Start. Code to see if they have wings. var/mob/living/carbon/human/H = src if(H.wings_flying == 1) //Some other checks are done in the wings_toggle proc - if(H.nutrition > 10) - H.nutrition -= 10 //You use up 10 nutrition per second of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it. + if(H.nutrition > 2) + H.nutrition -= 2 //You use up 2 nutrition per TILE and tick of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it. if(H.incapacitated(INCAPACITATION_ALL)) H.stop_flying() //Just here to see if the person is KO'd, stunned, etc. If so, it'll move onto can_fall. @@ -171,13 +174,13 @@ to_chat(H, "You're too heavy! Your wings give out and you plummit to the ground!") H.stop_flying() //womp womp. else if(H.nutrition < 300 && H.nutrition > 289) //290 would be risky, as metabolism could mess it up. Let's do 289. - to_chat(H, "You are starting to get fatigued... You probably have a good minute left in the air, if that. You should get to the ground soon!") //Ticks are, on average, 3 seconds. So this would most likely be 90 seconds, but lets just say 60. + to_chat(H, "You are starting to get fatigued... You probably have a good minute left in the air, if that. Even less if you continue to fly around! You should get to the ground soon!") //Ticks are, on average, 3 seconds. So this would most likely be 90 seconds, but lets just say 60. H.nutrition -= 10 return else if(H.nutrition < 100 && H.nutrition > 89) to_chat(H, "You're seriously fatigued! You need to get to the ground immediately and eat before you fall!") return - else if(H.nutrition < 20) //Should have listened to the warnings! + else if(H.nutrition < 2) //Should have listened to the warnings! to_chat(H, "You lack the strength to keep yourself up in the air...") H.stop_flying() else