From 7a4eef12b8127a9f5a60d81173eaa29effec5f1f Mon Sep 17 00:00:00 2001 From: AnturK Date: Thu, 11 Jan 2018 22:27:56 +0100 Subject: [PATCH 1/2] Fixes mind transfers (#34329) * Fixes mind transfers * Don't really see how this is better but sure. --- code/datums/mind.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index b3545813ac..4e46aeca65 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -108,9 +108,10 @@ var/datum/atom_hud/antag/hud_to_transfer = antag_hud//we need this because leave_hud() will clear this list var/mob/living/old_current = current + if(current) + current.transfer_observers_to(new_character) //transfer anyone observing the old character to the new one current = new_character //associate ourself with our new body - new_character.mind = src //and associate our new body with ourself - old_current.transfer_observers_to(current) //transfer anyone observing the old character to the new one + new_character.mind = src //and associate our new body with ourself for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body var/datum/antagonist/A = a A.on_body_transfer(old_current, current)