From 5ffedd7c8d986797b6e39d48d9d8903b5dc0fa98 Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Sat, 20 Jul 2024 22:16:24 +0300 Subject: [PATCH] Few fixes to the sky diving. (#31) * eh * Update transit.dm --- code/game/turfs/space/transit.dm | 7 +++++-- code/modules/mob/living/carbon/xenomorph/xenomorph.dm | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 7c889a5ef23..787b5e8b7ab 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -39,7 +39,10 @@ return if(!isspaceturf(old_loc)) - var/turf/projected = get_ranged_target_turf(crosser.loc, dir, 10) + var/direction = dir + if(crosser.dir == REVERSE_DIR(dir)) // if mobs step in the reversed from transit turf direction, they will otherwise get smacked 2 times in a row. + direction = crosser.dir + var/turf/projected = get_ranged_target_turf(crosser.loc, direction, 10) INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, throw_at), projected, 50, 2, null, TRUE, targetted_throw = TRUE) addtimer(CALLBACK(src, PROC_REF(handle_crosser), crosser), 0.5 SECONDS) @@ -69,7 +72,7 @@ continue if(!istype(possible_turf) || is_blocked_turf(possible_turf) || isspaceturf(possible_turf)) - continue // couldnt find one in 10 loops, check another area + continue // couldn't find one in 10 loops, check another area // we found a good turf, lets drop em crosser.handle_airdrop(possible_turf) diff --git a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm index 5cc5ffd2856..40cdb6ce118 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm @@ -415,7 +415,7 @@ handle_weeds_on_movement() return ..() -/mob/living/carbon/xenomorph/Move(NewLoc, direct) +/mob/living/carbon/xenomorph/Move(NewLoc, direct, glide_size_override) . = ..() if(!.) return @@ -423,7 +423,7 @@ unset_interaction() /mob/living/carbon/xenomorph/CanAllowThrough(atom/movable/mover, turf/target) - if(mover.pass_flags & PASS_XENO) // RUTGMC ADDITION + if(mover.pass_flags & PASS_XENO) return TRUE if(mover.throwing && ismob(mover) && isxeno(mover.thrower)) //xenos can throw mobs past other xenos return TRUE