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

Fixes ethereal revival not giving traumas (#73484)

Browse Source 
## About The Pull Request

All that needed to be done was `revive` be moved to the end of the
chain, as it was responsible for `null`ing the ethereal heart references
/ causing the runtimes.

While I was here, I fixed a few other issues - like, using
`visible_messages` to start the process was not a good idea, as often
you are blind from unconsciousness when that message happens.

## Why It's Good For The Game

Fixes #71630

Downsides are good

## Changelog

🆑 Melbert
fix: Ethereal revival causing traumas again.
/🆑
This commit is contained in:
MrMelbert
2023-02-18 10:47:22 -08:00
committed by GitHub
parent 5a069975c3
commit 023943ff9e
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/heart.dm
+16 -10
View File
@@ -357,10 +357,9 @@
if(HAS_TRAIT(victim, TRAIT_CANNOT_CRYSTALIZE))
return // no reviving during mafia, or other inconvenient times.
victim.visible_message(
span_notice("Crystals start forming around [victim]."),
span_nicegreen("Crystals start forming around your dead body."),
)
to_chat(victim, span_nicegreen("Crystals start forming around your dead body."))
victim.visible_message(span_notice("Crystals start forming around [victim]."), ignored_mobs = victim)
ADD_TRAIT(victim, TRAIT_CORPSELOCKED, SPECIES_TRAIT)
crystalize_timer_id = addtimer(CALLBACK(src, PROC_REF(crystalize), victim), CRYSTALIZE_PRE_WAIT_TIME, TIMER_STOPPABLE)
@@ -492,7 +491,7 @@
ethereal_heart.owner.forceMove(get_turf(src))
REMOVE_TRAIT(ethereal_heart.owner, TRAIT_CORPSELOCKED, SPECIES_TRAIT)
deltimer(crystal_heal_timer)
visible_message(span_notice("The crystals shatters, causing [ethereal_heart.owner] to fall out"))
visible_message(span_notice("The crystals shatters, causing [ethereal_heart.owner] to fall out."))
return ..()
/obj/structure/ethereal_crystal/update_overlays()
@@ -503,13 +502,20 @@
. += shine
/obj/structure/ethereal_crystal/proc/heal_ethereal()
ethereal_heart.owner.revive(HEAL_ALL)
to_chat(ethereal_heart.owner, span_notice("You burst out of the crystal with vigour... </span><span class='userdanger'>But at a cost."))
var/datum/brain_trauma/picked_trauma
if(prob(10)) //10% chance for a severe trauma
picked_trauma = pick(subtypesof(/datum/brain_trauma/severe))
else
picked_trauma = pick(subtypesof(/datum/brain_trauma/mild))
ethereal_heart.owner.gain_trauma(picked_trauma, TRAUMA_RESILIENCE_ABSOLUTE)
playsound(get_turf(ethereal_heart.owner), 'sound/effects/ethereal_revive.ogg', 100)
qdel(src)
// revive will regenerate organs, so our heart refence is going to be null'd. Unreliable
var/mob/living/carbon/regenerating = ethereal_heart.owner
playsound(get_turf(regenerating), 'sound/effects/ethereal_revive.ogg', 100)
to_chat(regenerating, span_notice("You burst out of the crystal with vigour... </span><span class='userdanger'>But at a cost."))
regenerating.gain_trauma(picked_trauma, TRAUMA_RESILIENCE_ABSOLUTE)
regenerating.revive(HEAL_ALL)
// revive calls fully heal -> deletes the crystal.
// this qdeleted check is just for sanity.
if(!QDELETED(src))
qdel(src)