Skip to content

Commit

Permalink
hotfix (#12913)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lumipharon authored May 7, 2023
1 parent 48507f4 commit ee90e40
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/game/turfs/liquid_turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@
if(!mob_leaver.get_filter(MOB_LIQUID_TURF_MASK))
return

var/turf/open/liquid/new_turf = carbon_leaver.loc
var/turf/open/liquid/new_turf = mob_leaver.loc
if(istype(new_turf))
if(length(new_turf.canSmoothWith))
if(!new_turf.has_catwalk && CHECK_MULTIPLE_BITFIELDS(new_turf.smoothing_junction, (SOUTH_JUNCTION|EAST_JUNCTION|WEST_JUNCTION)))
return
else if(!new_turf.has_catwalk)
return

var/icon/carbon_icon = icon(mob_leaver.icon)
animate(mob_leaver.get_filter(MOB_LIQUID_TURF_MASK), y = ((64 - carbon_icon.Height()) * 0.5) - MOB_LIQUID_TURF_MASK_HEIGHT, time = mob_leaver.cached_multiplicative_slowdown + mob_leaver.next_move_slowdown)
var/icon/mob_icon = icon(mob_leaver.icon)
animate(mob_leaver.get_filter(MOB_LIQUID_TURF_MASK), y = ((64 - mob_icon.Height()) * 0.5) - MOB_LIQUID_TURF_MASK_HEIGHT, time = mob_leaver.cached_multiplicative_slowdown + mob_leaver.next_move_slowdown)
animate(mob_leaver, pixel_y = mob_leaver.pixel_y - mob_liquid_depth, time = mob_leaver.cached_multiplicative_slowdown + mob_leaver.next_move_slowdown, flags = ANIMATION_PARALLEL)
addtimer(CALLBACK(mob_leaver, TYPE_PROC_REF(/atom, remove_filter), MOB_LIQUID_TURF_MASK), mob_leaver.cached_multiplicative_slowdown + mob_leaver.next_move_slowdown)

Expand Down

0 comments on commit ee90e40

Please sign in to comment.