From c01c9d78aba4cad366ad66a8445e7d4f88cb9943 Mon Sep 17 00:00:00 2001
From: liache <76535603+liache@users.noreply.github.com>
Date: Sun, 17 Apr 2022 16:57:17 -0400
Subject: [PATCH] Further Overweight Flying Fixes
This removes a stop-flying call if you're too heavy that I missed before, and also updates the text to remove reference to too much weight in the description.
---
.../human/species/station/station_special_abilities_vr.dm | 2 +-
code/modules/multiz/movement.dm | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index 469e39f941..00f2a08ad4 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -813,7 +813,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
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index f4fb3ffef8..b2a15865d8 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -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, "You're too heavy! Your wings give out and you plummit to the ground!")
- 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, "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.
L.adjust_nutrition(-0.5)