Skip to content

Commit

Permalink
[MIRROR] Fixes? / Removes stagger shoving animation on corpses. [MDB …
Browse files Browse the repository at this point in the history
…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 <[email protected]>
Co-authored-by: Higgin <[email protected]>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
  • Loading branch information
4 people authored Dec 6, 2023
1 parent 26e389b commit 790eb65
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions code/datums/status_effects/debuffs/staggered.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
Expand Down

0 comments on commit 790eb65

Please sign in to comment.