cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-25 06:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into snax

Browse Source
This commit is contained in:
Koboboldic
2023-02-28 05:39:28 +05:00
parent 00bb5159d5 a1823e7ca8
commit f6198de83d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_movement.dm
+1 -4
View File
@@ -12,10 +12,7 @@
if(combat_flags & COMBAT_FLAG_ACTIVE_BLOCKING)
animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, flags = ANIMATION_END_NOW)
else if(moved)
if(is_shifted)
is_shifted = FALSE
pixel_x = get_standard_pixel_x_offset(lying)
pixel_y = get_standard_pixel_y_offset(lying)
unpixel_shift()
/mob/living/proc/update_density()
density = !lying && !HAS_TRAIT(src, TRAIT_LIVING_NO_DENSITY)
modular_sand/code/modules/pixel_shift/pixel_shift.dm
+7 -1
View File
@@ -91,9 +91,15 @@
if(pixel_x < -PASSABLE_SHIFT_THRESHOLD)
passthroughable |= NORTH | EAST | SOUTH
/mob/living/Login()
. = ..()
if(is_shifted)
client?.pixel_x = pixel_x - base_pixel_x
client?.pixel_y = pixel_y - base_pixel_y
/mob/living/CanAllowThrough(atom/movable/mover, turf/target)
// Make sure to not allow projectiles of any kind past where they normally wouldn't.
if(!istype(mover, /obj/item/projectile) && !mover.throwing && passthroughable & mover.dir)
if(!istype(mover, /obj/item/projectile) && !mover.throwing && passthroughable & get_dir(src, mover))
return TRUE
return ..()