From df87fb9393e1968acb6af4cd2f5515cd6a1bb09d Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Tue, 7 Jun 2022 20:59:12 -0500
Subject: [PATCH] Fixes jitteriness stacking up to insane amounts while dead
 (#67567)

* Jitter effect doesn't apply to dead people

* in apply, instead of create
---
 code/datums/status_effects/debuffs/jitteriness.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/datums/status_effects/debuffs/jitteriness.dm b/code/datums/status_effects/debuffs/jitteriness.dm
index d97748b43fc..dea467e68c3 100644
--- a/code/datums/status_effects/debuffs/jitteriness.dm
+++ b/code/datums/status_effects/debuffs/jitteriness.dm
@@ -8,6 +8,12 @@
 	return ..()
 
 /datum/status_effect/jitter/on_apply()
+	// If we're being applied to a dead person, don't make the status effect.
+	// Just do a bit of jitter animation and be done.
+	if(owner.stat == DEAD)
+		owner.do_jitter_animation(duration / 10)
+		return FALSE
+
 	RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), .proc/remove_jitter)
 	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, id, /datum/mood_event/jittery)
 	return TRUE