From 5018df615e272083d28a423f597fb40a25af980c Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 8 Nov 2020 13:08:35 +0200 Subject: [PATCH] Update brain.dm --- code/modules/organs/internal/brain.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 2cfa206108d..30c539bbde3 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -99,15 +99,11 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) brainmob = new(src) brainmob.name = H.real_name brainmob.real_name = H.real_name -<<<<<<< HEAD - brainmob.dna = H.dna.Clone() - brainmob.timeofhostdeath = H.timeofdeath - brainmob.ooc_notes = H.ooc_notes //VOREStation Edit -======= + if(istype(H)) brainmob.dna = H.dna.Clone() brainmob.timeofhostdeath = H.timeofdeath ->>>>>>> 68b370b... Fresh Meat, Leatherworking (#7629) + brainmob.ooc_notes = H.ooc_notes //VOREStation Edit // Copy modifiers. for(var/datum/modifier/M in H.modifiers)