From 790eb653a7630572fe3addfc0e5e92a0626ed87a Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:16:12 +0300 Subject: [PATCH] [MIRROR] Fixes? / Removes stagger shoving animation on corpses. [MDB IGNORE] (#25463) (#989) * Fixes? / Removes stagger shoving animation on corpses. (#79985) ## About The Pull Request Appears to have been intended, but I'm guessing its scale and time were not. ## Why It's Good For The Game Shoving dead bodies was causing them to spasm for longer than described and frankly made it obnoxious both judging whether or not you were dealing with a dead body and clicking on them after doing it (which should probably be redundant with a dead body.) ## Changelog :cl: del: Stagger animation no longer fires longer than it should on dead bodies or on dead bodies period. /:cl: --------- * Fixes? / Removes stagger shoving animation on corpses. --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: Higgin Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com> --- code/datums/status_effects/debuffs/staggered.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/datums/status_effects/debuffs/staggered.dm b/code/datums/status_effects/debuffs/staggered.dm index 5723bc16013..0ffde66b1f1 100644 --- a/code/datums/status_effects/debuffs/staggered.dm +++ b/code/datums/status_effects/debuffs/staggered.dm @@ -9,10 +9,8 @@ return ..() /datum/status_effect/staggered/on_apply() - - //a very mild animation, but you can't stagger the dead. + //you can't stagger the dead. if(owner.stat == DEAD) - owner.do_stagger_animation(duration / 10) return FALSE RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(clear_staggered)) @@ -32,7 +30,11 @@ qdel(src) /datum/status_effect/staggered/tick(seconds_between_ticks) - owner.do_stagger_animation() + //you can't stagger the dead - in case somehow you die mid-stagger + if(owner.stat == DEAD || HAS_TRAIT(owner, TRAIT_FAKEDEATH)) + return + else + owner.do_stagger_animation() /// Helper proc that causes the mob to do a stagger animation. /// Doesn't change significantly, just meant to represent swaying back and forth