cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] ethereals no longer revive after being changeling drained [MDB IGNORE] (#14805)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2022-07-08 17:21:50 -04:00
committed by GitHub
co-authored by Fikou
parent 4b893a0b2a
commit e4f73bc176
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/heart.dm
+1 -1
View File
@@ -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