From 7db8337ec736e711bc9f097ca3e5cbe948930d86 Mon Sep 17 00:00:00 2001 From: Nich Date: Wed, 27 Jun 2018 16:08:27 +0200 Subject: [PATCH] Fixes moth space move (#38736) --- code/modules/mob/living/carbon/human/human_movement.dm | 6 +++--- .../modules/mob/living/carbon/human/species_types/humans.dm | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 871b64bbc0f..5bfbb76e467 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -67,6 +67,6 @@ S.step_action() /mob/living/carbon/human/Process_Spacemove(movement_dir = 0) //Temporary laziness thing. Will change to handles by species reee. - if(..()) - return 1 - return dna.species.space_move(src) + if(dna.species.space_move(src)) + return TRUE + return ..() diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 5b26989ea81..2751b8b7a75 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -23,11 +23,6 @@ H.endTailWag() . = ..() -/datum/species/human/space_move(mob/living/carbon/human/H) - var/obj/item/flightpack/F = H.get_flightpack() - if(istype(F) && (F.flight) && F.allow_thrust(0.01, src)) - return TRUE - /datum/species/human/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) if(H.dna.features["ears"] == "Cat") mutantears = /obj/item/organ/ears/cat