From 472d7ec6f2a35cbbf282d8bcc658226e9dd9c577 Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Thu, 12 Oct 2023 10:40:17 -0400
Subject: [PATCH] Fixes an issue with fake death (#22791)

* bam

* comment
---
 code/modules/mob/living/carbon/carbon_death.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/carbon_death.dm b/code/modules/mob/living/carbon/carbon_death.dm
index 037e5aa1b8c..62a2908e2b8 100644
--- a/code/modules/mob/living/carbon/carbon_death.dm
+++ b/code/modules/mob/living/carbon/carbon_death.dm
@@ -4,7 +4,8 @@
 	if(!.)
 		return FALSE
 
-	if(!gibbed)
+	if(!gibbed && !HAS_TRAIT(src, TRAIT_FAKEDEATH))
+		// We dont want people who have fake death to have the status effect applied a second time when they actually die
 		apply_status_effect(STATUS_EFFECT_REVIVABLE)
 
 	if(reagents)