fix roundstart/rej cleanup

code/datums/mind.dm

@@ -63,8 +63,8 @@
 
 	var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
 
-	var/datum/language_holder
-
+	var/datum/language_holder/language_holder
+
 /datum/mind/New(var/key)
 	src.key = key
 	soulOwner = src
@@ -77,21 +77,22 @@
 		antag_datums = null
 	return ..()
 
-/datum/mind/proc/get_language_holder()
-	if(!language_holder)
-		var/datum/language_holder/L = current.get_language_holder(shadow=FALSE)
-		language_holder = L.copy(src)
-
-	return language_holder
-
+/datum/mind/proc/get_language_holder()
+	if(!language_holder)
+		var/datum/language_holder/L = current.get_language_holder(shadow=FALSE)
+		language_holder = L.copy(src)
+
+	return language_holder
+
 /datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0)
 	if(current)	// remove ourself from our old body's mind variable
 		current.mind = null
 		SStgui.on_transfer(current, new_character)
 
-	if(!language_holder)
-		language_holder = new_character.language_holder.copy(src)
-
+	if(!language_holder)
+		var/datum/language_holder/mob_holder = new_character.get_language_holder(shadow = FALSE)
+		language_holder = mob_holder.copy(src)
+
 	if(key)
 		if(new_character.key != key)					//if we're transfering into a body with a key associated which is not ours
 			new_character.ghostize(1)						//we'll need to ghostize so that key isn't mobless.
@@ -284,7 +285,7 @@
 	creator.faction |= current.faction
 
 	if(creator.mind.special_role)
-		message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.")
+		message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.")
 		to_chat(current, "<span class='userdanger'>Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalities change, so do yours. This will never change unless your creator's body is destroyed.</span>")
 
 /datum/mind/proc/show_memory(mob/recipient, window=1)

code/datums/mind.dm.rej

@@ -1,20 +0,0 @@
-diff a/code/datums/mind.dm b/code/datums/mind.dm	(rejected hunks)
-@@ -63,7 +63,7 @@
- 
- 	var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
- 
--	var/datum/language_holder
-+	var/datum/language_holder/language_holder
- 
- /datum/mind/New(var/key)
- 	src.key = key
-@@ -90,7 +90,8 @@
- 		SStgui.on_transfer(current, new_character)
- 
- 	if(!language_holder)
--		language_holder = new_character.language_holder.copy(src)
-+		var/datum/language_holder/mob_holder = new_character.get_language_holder(shadow = FALSE)
-+		language_holder = mob_holder.copy(src)
- 
- 	if(key)
- 		if(new_character.key != key)					//if we're transfering into a body with a key associated which is not ours