Cultist Memory (#10622)

code/datums/mind.dm

@@ -54,9 +54,7 @@
 	var/has_been_rev = 0//Tracks if this mind has been a rev or not
 
 	var/datum/faction/faction 			//associated faction
-	var/datum/changeling/changeling		//changeling holder
-
-	var/datum/vampire/vampire //vampire holder
+	var/list/antag_datums = list()
 
 	var/rev_cooldown = 0
 
@@ -88,6 +86,8 @@
 /datum/mind/proc/transfer_to(mob/living/new_character)
 	if(!istype(new_character))
 		world.log <<  "## DEBUG: transfer_to(): Some idiot has tried to transfer_to( a non mob/living mob. Please inform Carn"
+	var/datum/changeling/changeling = antag_datums[MODE_CHANGELING]
+	var/datum/vampire/vampire = antag_datums[MODE_VAMPIRE]
 	if(current)					//remove ourself from our old body's mind variable
 		if(changeling)
 			current.remove_changeling_powers()
@@ -485,8 +485,8 @@
 	role_alt_title =  null
 	assigned_job =    null
 	//faction =       null //Uncommenting this causes a compile error due to 'undefined type', fucked if I know.
-	changeling =      null
-	vampire =         null
+	for(var/thing in antag_datums)
+		QDEL_NULL(thing)
 	initial_account = null
 	objectives =      list()
 	special_verbs =   list()