From e4f73bc176a8661bc38f2ef89bea204347774cef Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 8 Jul 2022 23:21:50 +0200
Subject: [PATCH] [MIRROR] ethereals no longer revive after being changeling
 drained [MDB IGNORE] (#14805)

* ethereals no longer revive after being changeling drained (#68184)

* ethereals no longer revive after being changeling drained

* Drain() on absorb proc is applied after mob death. This means the signal will run first and our code won't matter, so let's run it on crystallize instead!

* ethereals no longer revive after being changeling drained

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
---
 code/modules/surgery/organs/heart.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index ef8d1d92b1d..2ee4bbec7c1 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -366,7 +366,7 @@
 	if(!COOLDOWN_FINISHED(src, crystalize_cooldown) || ethereal.stat != DEAD)
 		return //Should probably not happen, but lets be safe.
 
-	if(ismob(location) || isitem(location)) //Stops crystallization if they are eaten by a dragon, turned into a legion, consumed by his grace, etc.
+	if(ismob(location) || isitem(location) || HAS_TRAIT_FROM(src, TRAIT_HUSK, CHANGELING_DRAIN)) //Stops crystallization if they are eaten by a dragon, turned into a legion, consumed by his grace, etc.
 		to_chat(ethereal, span_warning("You were unable to finish your crystallization, for obvious reasons."))
 		stop_crystalization_process(ethereal, FALSE)
 		return