Skip to content

Commit

Permalink
Filter fix (#16252)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lumipharon authored Jul 4, 2024
1 parent 9dce8d3 commit e16fbc8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/game/atoms/atom_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ GLOBAL_LIST_EMPTY(submerge_filter_timer_list)
add_filter(AM_SUBMERGE_MASK, 1, alpha_mask_filter(0, height_to_use - AM_SUBMERGE_MASK_HEIGHT, icon(submerge_icon, submerge_icon_state), null, MASK_INVERSE))
ADD_TRAIT(src, TRAIT_SUBMERGED, SUBMERGED_TRAIT)

transition_filter(AM_SUBMERGE_MASK, duration, list(y = height_to_use - (AM_SUBMERGE_MASK_HEIGHT - new_height)))
transition_filter(AM_SUBMERGE_MASK, list(y = height_to_use - (AM_SUBMERGE_MASK_HEIGHT - new_height)), duration)
animate(src, pixel_y = depth_diff, time = duration, flags = ANIMATION_PARALLEL|ANIMATION_RELATIVE)

///overrides the turf's normal footstep sound
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/view_variables/filterrific.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
target.change_filter_priority(params["name"], new_priority)
. = TRUE
if("transition_filter_value")
target.transition_filter(params["name"], 4, params["new_data"])
target.transition_filter(params["name"], params["new_data"], 4)
. = TRUE
if("modify_filter_value")
var/list/old_filter_data = target.filter_data[params["name"]]
Expand All @@ -69,7 +69,7 @@
if("modify_color_value")
var/new_color = input(usr, "Pick new filter color", "Filteriffic Colors!") as color|null
if(new_color)
target.transition_filter(params["name"], 4, list("color" = new_color))
target.transition_filter(params["name"], list("color" = new_color), 4)
. = TRUE
if("modify_icon_value")
var/icon/new_icon = input("Pick icon:", "Icon") as null|icon
Expand Down

0 comments on commit e16fbc8

Please sign in to comment.