Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 6217e1e

Browse files
authored
Fixes the stabilized cerulean slimecross (#22448)
* Update _status_effects.dm * Update _status_effects.dm
1 parent 7837c90 commit 6217e1e

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

code/modules/research/xenobiology/crossbreeding/_status_effects.dm

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -730,25 +730,24 @@ datum/status_effect/stabilized/blue/on_remove()
730730
C.real_name = O.real_name
731731
O.dna.transfer_identity(C)
732732
C.updateappearance(mutcolor_update=1)
733-
RegisterSignal(owner, COMSIG_GLOB_MOB_DEATH, PROC_REF(dead))
733+
RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(dead))
734734
return ..()
735735

736736
/datum/status_effect/stabilized/cerulean/proc/dead()
737-
addtimer(CALLBACK(src, PROC_REF(transfer)), 4, TIMER_UNIQUE) //0.4 seconds delay to account for delayed dust/gib effects, shouldn't affect gameplay
737+
addtimer(CALLBACK(src, PROC_REF(transfer)), 4, TIMER_UNIQUE) //0.4 seconds delay to account for delayed dust/gib effects, shouldn't affect gameplay
738738

739739
/datum/status_effect/stabilized/cerulean/proc/transfer()
740-
UnregisterSignal(owner, COMSIG_GLOB_MOB_DEATH)
740+
UnregisterSignal(owner, COMSIG_LIVING_DEATH)
741741
if(!QDELETED(owner) && owner.stat == DEAD)
742742
if(clone && clone.stat != DEAD)
743743
owner.visible_message(span_warning("[owner] blazes with brilliant light, [linked_extract] whisking [owner.p_their()] soul away."),
744744
span_notice("You feel a warm glow from [linked_extract], and you open your eyes... elsewhere."))
745745
if(owner.mind)
746746
owner.mind.transfer_to(clone)
747747
clone = null
748-
qdel(linked_extract)
749-
if(!clone || clone.stat == DEAD)
748+
else if(!clone || clone.stat == DEAD)
750749
to_chat(owner, span_notice("[linked_extract] desperately tries to move your soul to a living body, but can't find one!"))
751-
qdel(linked_extract)
750+
qdel(linked_extract)
752751

753752
/datum/status_effect/stabilized/cerulean/on_remove()
754753
if(clone)

0 commit comments

Comments
 (0)