Files
+37 21b4095dfd [MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)
Upstream 04/17/2026

fixes https://github.com/Bubberstation/Bubberstation/issues/5549

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
Co-authored-by: rageguy505 <54517726+rageguy505@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Maxipat <108554989+Maxipat112@users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com>
Co-authored-by: loganuk <fakeemail123@aol.com>
Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com>
Co-authored-by: Neocloudy <88008002+Neocloudy@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: ElGitificador <168473461+ElGitificador@users.noreply.github.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Layzu666 <121319428+Layzu666@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: Josh <josh.adam.powell@gmail.com>
Co-authored-by: Josh Powell <josh.powell@softwire.com>
Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com>
Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
Co-authored-by: shayoki <96078776+shayoki@users.noreply.github.com>
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2026-05-16 00:56:00 +02:00

102 lines
3.4 KiB
Plaintext

/**
* ## temporary_body
*
* Used on mobs when they are meant to be a 'temporary body'
* Holds a reference to an old mind, to put them back in
* once the body this component is attached to, is being deleted.
*/
/datum/component/temporary_body
///The old mind we will be put back into when parent is being deleted.
var/datum/mind/old_mind
///The old body we will be put back into when parent is being deleted.
var/mob/old_body
/// Returns the mind if the PARENT dies by any means
var/return_on_death = FALSE
/// Returns the mind if the OLD_BODY is revived
var/return_on_revive = FALSE
/datum/component/temporary_body/Initialize(datum/mind/old_mind, return_on_death = FALSE, return_on_revive = FALSE)
if(!ismob(parent))
return COMPONENT_INCOMPATIBLE
if(isnull(old_mind))
stack_trace("Tried to create a temporary_body component without an old_mind!")
return COMPONENT_INCOMPATIBLE
src.old_mind = old_mind
src.old_body = old_mind.current
src.return_on_death = return_on_death
src.return_on_revive = return_on_revive
/datum/component/temporary_body/RegisterWithParent()
RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(return_mind))
if(return_on_death)
RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(return_mind))
RegisterSignal(old_mind, COMSIG_MIND_TRANSFERRED, PROC_REF(on_mind_transfer))
if(!isnull(old_body))
register_body_signals()
/datum/component/temporary_body/proc/register_body_signals()
ADD_TRAIT(old_body, TRAIT_MIND_TEMPORARILY_GONE, REF(src))
RegisterSignal(old_body, COMSIG_QDELETING, PROC_REF(on_body_destroy))
if(return_on_revive)
RegisterSignal(old_body, COMSIG_LIVING_REVIVE, PROC_REF(return_mind))
/datum/component/temporary_body/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_QDELETING)
UnregisterSignal(parent, COMSIG_LIVING_DEATH)
UnregisterSignal(old_mind, COMSIG_MIND_TRANSFERRED)
if(!isnull(old_body))
unregister_body_signals()
/datum/component/temporary_body/proc/unregister_body_signals()
REMOVE_TRAIT(old_body, TRAIT_MIND_TEMPORARILY_GONE, REF(src))
UnregisterSignal(old_body, COMSIG_QDELETING)
UnregisterSignal(old_body, COMSIG_LIVING_REVIVE)
/datum/component/temporary_body/Destroy()
. = ..()
old_mind = null
old_body = null
/// Swap the target of old_body if old_mind is transferred somewhere while we're away
/datum/component/temporary_body/proc/on_mind_transfer(...)
SIGNAL_HANDLER
if(!isnull(old_body))
unregister_body_signals()
old_body = old_mind.current
if(!isnull(old_body))
register_body_signals()
/**
* Sends the mind of the temporary body back into their previous host
* If the previous host is alive, we'll also force them into the body.
* Otherwise we'll let them hang out as a ghost still.
*/
/datum/component/temporary_body/proc/return_mind(...)
SIGNAL_HANDLER
var/mob/new_body = parent
var/mob/dead/observer/ghost = new_body.get_ghost() || new_body.ghostize()
if(QDELETED(ghost))
stack_trace("[src] belonging to [parent] was completely unable to find a ghost to put back into a body!")
qdel(src) // i guess this is useless now
return
ghost.mind = old_mind
if(old_body)
if(old_mind.current != old_body)
stack_trace("Temporary body returning mind to old body, but the mind's current body doesn't match the old body!")
old_mind.set_current(old_body)
if(old_body.stat != DEAD)
ghost.reenter_corpse()
qdel(src) // we're done here
/// Body reference handling
/datum/component/temporary_body/proc/on_body_destroy(...)
SIGNAL_HANDLER
old_body = null