From 400ed3045537c2c847a307c8efd125e66e6f9181 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Sat, 13 Feb 2016 15:20:21 -0500
Subject: [PATCH] issue with identity transfer

---
 code/datums/spells/inflict_handler.dm              | 9 ---------
 code/game/gamemodes/changeling/powers/panacea.dm   | 2 +-
 code/modules/mob/living/carbon/brain/brain_item.dm | 2 +-
 code/modules/mob/living/carbon/human/death.dm      | 5 +++--
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/code/datums/spells/inflict_handler.dm b/code/datums/spells/inflict_handler.dm
index a9aa44c2771..435909e3abe 100644
--- a/code/datums/spells/inflict_handler.dm
+++ b/code/datums/spells/inflict_handler.dm
@@ -25,15 +25,6 @@
 		switch(destroys)
 			if("gib")
 				target.gib()
-			if("gib_brain")
-				if(ishuman(target))
-					var/mob/living/carbon/C = target
-					var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)//do we has brains?
-					if(B)
-						B.loc = get_turf(C)
-						B.transfer_identity(C)
-						C.internal_organs -= B
-				target.gib()
 			if("disintegrate")
 				target.dust()
 
diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm
index c3ee9edcae1..c2d12e6a9a8 100644
--- a/code/game/gamemodes/changeling/powers/panacea.dm
+++ b/code/game/gamemodes/changeling/powers/panacea.dm
@@ -17,7 +17,7 @@
 		if(iscarbon(user))
 			var/mob/living/carbon/human/C = user
 			C.vomit()
-		egg.loc = get_turf(user)
+		egg.forceMove(get_turf(user))
 
 	user.reagents.add_reagent("mutadone", 10)
 	user.reagents.add_reagent("potass_iodide", 10)
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 40f7f9a871a..7b8a7069c4c 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -59,7 +59,7 @@
 
 /obj/item/organ/internal/brain/remove(var/mob/living/user,var/special)
 
-	if(!owner) return ..() // Probably a redundant removal; just bail
+	//if(!owner) return ..() // Probably a redundant removal; just bail
 
 	var/obj/item/organ/internal/brain/B = src
 	if(istype(B) && istype(owner) && is_primary_organ())
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 31aee75dc41..4363681cacb 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -16,8 +16,9 @@
 	for(var/obj/item/organ/internal/I in internal_organs)
 		if(istype(loc,/turf))
 			I.remove(src)
-			spawn()
-				I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
+			I.forceMove(get_turf(src))
+			//spawn()
+			I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
 
 	for(var/obj/item/organ/external/E in src.organs)
 		if(istype(E, /obj/item/organ/external/chest))