cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
BongaTheProto
2023-03-01 14:58:31 -05:00
parent a362a4feae 1547c36a5c
commit d0fa6c842e
9 changed files with 358 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_movement.dm
+2 -5
View File
@@ -12,13 +12,10 @@
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()
if(is_tilted)
transform = transform.Turn(-is_tilted)
is_tilted = 0
is_tilted = FALSE
/mob/living/proc/update_density()
density = !lying && !HAS_TRAIT(src, TRAIT_LIVING_NO_DENSITY)