Merge pull request #4769 from Citadel-Station-13/upstream-merge-34329

[MIRROR] Fixes mind transfers
This commit is contained in:
deathride58
2018-01-12 00:40:56 +00:00
committed by GitHub
+3 -2
View File
@@ -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)