From 58c3d6ebe38bde90758d4b78d8f4c4ef1c866922 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Mon, 9 Jan 2012 01:24:42 -0500 Subject: [PATCH] cleaned up brain transfer --- code/game/objects/items/weapons/surgery_tools.dm | 6 ++++++ code/modules/mob/organ/organ_external.dm | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 2a2c0fc618a..4fa9c44cdf8 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -517,6 +517,12 @@ CIRCULAR SAW if(user.zone_sel.selecting == "head" || istype(M, /mob/living/carbon/metroid)) var/mob/living/carbon/human/H = M + + if(istype(H) && H.organs["head"]) + var/datum/organ/external/affecting = H.organs["head"] + if(affecting.destroyed) + return ..() + if(istype(H) && ( \ (H.head && H.head.flags & HEADCOVERSEYES) || \ (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \ diff --git a/code/modules/mob/organ/organ_external.dm b/code/modules/mob/organ/organ_external.dm index e70528e08f8..974ed3b3955 100644 --- a/code/modules/mob/organ/organ_external.dm +++ b/code/modules/mob/organ/organ_external.dm @@ -114,7 +114,8 @@ obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H) brainmob.name = H.real_name brainmob.real_name = H.real_name brainmob.dna = H.dna - brainmob.container = src + if(H.mind) + H.mind.transfer_to(brainmob) obj/item/weapon/organ/head/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/scalpel))