Merge pull request #12725 from liache/Liache-Winged-Flight-Patch

Update station_special_abilities_vr.dm
This commit is contained in:
Casey
2022-04-17 17:13:56 -04:00
committed by CHOMPStation2
parent 414b01d8bc
commit 54dd44b7d8
2 changed files with 1 additions and 7 deletions

View File

@@ -814,7 +814,7 @@
/mob/living/proc/flying_toggle()
set name = "Toggle Flight"
set desc = "While flying over open spaces, you will use up some nutrition. If you run out nutrition, you will fall. Additionally, you can't fly if you are too heavy."
set desc = "While flying over open spaces, you will use up some nutrition. If you run out nutrition, you will fall."
set category = "Abilities"
var/mob/living/carbon/human/C = src
@@ -827,9 +827,6 @@
if(C.nutrition < 25 && !C.flying) //Don't have any food in you?" You can't fly.
to_chat(C, "<span class='notice'>You lack the nutrition to fly.</span>")
return
if(C.nutrition > 1000 && !C.flying)
to_chat(C, "<span class='notice'>You have eaten too much to fly! You need to lose some nutrition.</span>")
return
C.flying = !C.flying
update_floating()

View File

@@ -243,9 +243,6 @@
if(L.incapacitated(INCAPACITATION_ALL))
L.stop_flying()
//Just here to see if the person is KO'd, stunned, etc. If so, it'll move onto can_fall.
else if (L.nutrition > 1000) //Eat too much while flying? Get fat and fall.
to_chat(L, "<span class='danger'>You're too heavy! Your wings give out and you plummit to the ground!</span>")
L.stop_flying() //womp womp.
else if(L.nutrition < 300 && L.nutrition > 299.4) //290 would be risky, as metabolism could mess it up. Let's do 289.
to_chat(L, "<span class='danger'>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!</span>") //Ticks are, on average, 3 seconds. So this would most likely be 90 seconds, but lets just say 60.
L.adjust_nutrition(-0.5)