From 3692962e68ec26779601fb459aef88e930bcb62a Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Fri, 2 Oct 2020 22:51:07 +0200 Subject: [PATCH] Makes IGNORESLOWDOWN not ignore speedups --- .../living/carbon/human/species/_species.dm | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 69518e96cf7..22a106a4b3e 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -221,20 +221,18 @@ /datum/species/proc/movement_delay(mob/living/carbon/human/H) . = 0 //We start at 0. - var/flight = 0 //Check for flight and flying items - var/ignoreslow = 0 - var/gravity = 0 + var/ignoreslow = FALSE - if(H.flying) - flight = 1 if((H.status_flags & IGNORESLOWDOWN) || (RUN in H.mutations)) - ignoreslow = 1 + ignoreslow = TRUE - if(has_gravity(H)) - gravity = 1 + if(ignoreslow) + if(speed_mod < 0) // Apply the speed_mod if it's negative. Meaning it's a speedup + . = speed_mod + else if(has_gravity(H)) + var/flight = H.flying //Check for flight and flying items - if(!ignoreslow && gravity) if(speed_mod) . = speed_mod @@ -270,8 +268,9 @@ if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR - if(H.status_flags & GOTTAGOFAST) - . -= 1 + if(H.status_flags & GOTTAGOFAST) + . -= 1 + return . /datum/species/proc/on_species_gain(mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.