cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 16:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Certain emotes (like twitching) no longer stop all ontoing animations (#91417)

Browse Source 
## About The Pull Request

Closes #91267 - all emotes can be ran as parallel animations, which
prevents them from stopping animations like floating.

## Changelog
🆑
fix: Certain emotes (like twitching) no longer stop all ontoing
animations
/🆑
This commit is contained in:
SmArtKar
2025-06-02 00:31:24 +02:00
committed by Roxy
parent 440a227be2
commit 5ba77212f6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/emote.dm
View File

@@ -430,7 +430,7 @@
/datum/emote/living/shiver/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
animate(user, pixel_w = 1, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE)
animate(user, pixel_w = 1, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
for(var/i in 1 to SHIVER_LOOP_DURATION / (0.2 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
animate(pixel_w = -2, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_CONTINUE)
animate(pixel_w = 2, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_CONTINUE)
@@ -536,7 +536,7 @@
/datum/emote/living/sway/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
animate(user, pixel_w = 2, time = 0.5 SECONDS, flags = ANIMATION_RELATIVE)
animate(user, pixel_w = 2, time = 0.5 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
for(var/i in 1 to 2)
animate(pixel_w = -6, time = 1.0 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_CONTINUE)
animate(pixel_w = 6, time = 1.0 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_CONTINUE)
@@ -556,7 +556,7 @@
/datum/emote/living/tremble/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
animate(user, pixel_w = 2, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE)
animate(user, pixel_w = 2, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
for(var/i in 1 to TREMBLE_LOOP_DURATION / (0.4 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
animate(pixel_w = -4, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_CONTINUE)
animate(pixel_w = 4, time = 0.2 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_CONTINUE)
@@ -571,7 +571,7 @@
/datum/emote/living/twitch/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
animate(user, pixel_w = 1, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE)
animate(user, pixel_w = 1, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
animate(pixel_w = -2, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE)
animate(time = 0.1 SECONDS)
animate(pixel_w = 2, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE)
@@ -585,7 +585,7 @@
/datum/emote/living/twitch_s/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
animate(user, pixel_w = -1, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE)
animate(user, pixel_w = -1, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
animate(pixel_w = 1, time = 0.1 SECONDS, flags = ANIMATION_RELATIVE)
/datum/emote/living/wave