From 9430f89756df961ee89941401ca33471a43e3b96 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 7 May 2017 23:06:10 -0700 Subject: [PATCH] Delete mind.dm.rej --- code/datums/mind.dm.rej | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 code/datums/mind.dm.rej diff --git a/code/datums/mind.dm.rej b/code/datums/mind.dm.rej deleted file mode 100644 index 24a52b5fcf..0000000000 --- a/code/datums/mind.dm.rej +++ /dev/null @@ -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