Skip to content

Commit

Permalink
Few fixes to the sky diving. (#31)
Browse files Browse the repository at this point in the history
* eh

* Update transit.dm
  • Loading branch information
Helg2 authored Jul 20, 2024
1 parent c8c87aa commit 5ffedd7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions code/game/turfs/space/transit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/xenomorph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -415,15 +415,15 @@
handle_weeds_on_movement()
return ..()

/mob/living/carbon/xenomorph/Move(NewLoc, direct)
/mob/living/carbon/xenomorph/Move(NewLoc, direct, glide_size_override)
. = ..()
if(!.)
return
if(interactee)// moving stops any kind of interaction
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
Expand Down

0 comments on commit 5ffedd7

Please sign in to comment.