From 8dda6c96d5c20b814ca2dee3cf99eee06caa5f3d Mon Sep 17 00:00:00 2001 From: TiviPlus <57223640+TiviPlus@users.noreply.github.com> Date: Fri, 25 Nov 2022 20:27:15 +0100 Subject: [PATCH] Fixes a transofrm animation todo (#71496) makes it pass appearance Co-authored-by: TiviPlus <572233640+TiviPlus@users.noreply.com> --- code/__HELPERS/icons.dm | 8 ++++---- code/modules/admin/smites/bread.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 9365681a84d..cb1caec7a90 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1358,7 +1358,7 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) * time - Animation duration * transform_overlay - Appearance/atom/image of effect that moves along the animation - should be horizonatally centered */ -/atom/movable/proc/transformation_animation(result_appearance,time = 3 SECONDS,transform_overlay) +/atom/movable/proc/transformation_animation(result_appearance, time = 3 SECONDS, transform_appearance) var/list/transformation_objects = GLOB.transformation_animation_objects[src] || list() //Disappearing part var/top_part_filter = filter(type="alpha",icon=icon('icons/effects/alphacolors.dmi',"white"),y=0) @@ -1373,10 +1373,10 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) appearing_part.filters = filter(type="alpha",icon=icon('icons/effects/alphacolors.dmi',"white"),y=0,flags=MASK_INVERSE) animate(appearing_part.filters[1],y=-32,time=time) transformation_objects += appearing_part - //Transform effect thing - todo make appearance passed in - if(transform_overlay) + //Transform effect thing + if(transform_appearance) var/obj/transform_effect = new - transform_effect.appearance = transform_overlay + transform_effect.appearance = transform_appearance transform_effect.vis_flags = VIS_INHERIT_ID transform_effect.pixel_y = 16 transform_effect.alpha = 255 diff --git a/code/modules/admin/smites/bread.dm b/code/modules/admin/smites/bread.dm index f66214d37b4..22ed8836df3 100644 --- a/code/modules/admin/smites/bread.dm +++ b/code/modules/admin/smites/bread.dm @@ -8,7 +8,7 @@ . = ..() var/mutable_appearance/bread_appearance = mutable_appearance('icons/obj/food/burgerbread.dmi', "bread") var/mutable_appearance/transform_scanline = mutable_appearance('icons/effects/effects.dmi', "transform_effect") - target.transformation_animation(bread_appearance,time = BREADIFY_TIME, transform_overlay=transform_scanline) + target.transformation_animation(bread_appearance, BREADIFY_TIME, transform_scanline.appearance) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(breadify), target), BREADIFY_TIME) #undef BREADIFY_TIME