Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Few fixes to the sky diving. #31

Merged
merged 2 commits into from
Jul 20, 2024
Merged

Few fixes to the sky diving. #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82ae6f5
eh
Helg2 Jul 20, 2024
500094c
Update transit.dm
Helg2 Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions code/game/turfs/space/transit.dm
View file
Open in desktop
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 Expand Up @@ -99,6 +102,7 @@
ex_act(2000) //Destroy it
cell_explosion(target, 300, 100)
flame_radius(6, target)
dump_mobs()
Helg2 marked this conversation as resolved.
Show resolved Hide resolved

/obj/structure/closet/handle_airdrop(turf/target_turf) // good idea but no
if(!opened)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/xenomorph.dm
View file
Open in desktop
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
Loading