From d47ed07f72a5b5cd00d6b40220589115d74f0133 Mon Sep 17 00:00:00 2001 From: alexkar598 <> Date: Wed, 23 Feb 2022 21:01:16 -0500 Subject: [PATCH 1/3] Fixes dab animation not working --- code/__HELPERS/matrices.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index c17428b4619a..4c38e4a05c40 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -52,7 +52,9 @@ if(hold_seconds > 0) sleep(hold_seconds) // time to hold the dab before going back if(!stay) // if stay param is true dab doesn't return - animate(src, transform = DAB_RETURN, time = speed * 1.5, loops ) // reverse dab to starting position , slower + animate(transform = DAB_RETURN, time = speed * 1.5, loops ) // reverse dab to starting position , slower + //doesn't have an object argument because this is "Stacking" with the animate call above + //3 billion% intentional //Dumps the matrix data in format a-f /matrix/proc/tolist() From 9539497b5233d4e45b385a9224879662872d9a52 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Fri, 25 Feb 2022 15:21:41 +0000 Subject: [PATCH 2/3] Update matrices.dm --- code/__HELPERS/matrices.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index 4c38e4a05c40..ab10970796d9 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -22,10 +22,8 @@ animate(src, transform = matrices[1], time = speed, loops , flags = ANIMATION_PARALLEL) else animate(src, transform = matrices[1], time = speed, loops) - for(var/i in 2 to segments) //2 because 1 is covered above - animate(transform = matrices[i], time = speed) + for(var/i in 2 to segments) //2 because 1 is covered above animate(transform = matrices[i], time = speed) //doesn't have an object argument because this is "Stacking" with the animate call above - //3 billion% intentional /atom/proc/DabAnimation(speed = 1, loops = 1, direction = 1 , hold_seconds = 0 , angle = 1 , stay = FALSE) // Hopek 2019 // By making this in atom/proc everything in the game can potentially dab. You have been warned. From 331f3001df926c6772424276cdb7fc5f28070a88 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Fri, 25 Feb 2022 22:14:21 -0500 Subject: [PATCH 3/3] Reverts jamie's commit to my pr --- code/__HELPERS/matrices.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index ab10970796d9..4c38e4a05c40 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -22,8 +22,10 @@ animate(src, transform = matrices[1], time = speed, loops , flags = ANIMATION_PARALLEL) else animate(src, transform = matrices[1], time = speed, loops) - for(var/i in 2 to segments) //2 because 1 is covered above animate(transform = matrices[i], time = speed) + for(var/i in 2 to segments) //2 because 1 is covered above + animate(transform = matrices[i], time = speed) //doesn't have an object argument because this is "Stacking" with the animate call above + //3 billion% intentional /atom/proc/DabAnimation(speed = 1, loops = 1, direction = 1 , hold_seconds = 0 , angle = 1 , stay = FALSE) // Hopek 2019 // By making this in atom/proc everything in the game can potentially dab. You have been warned.