diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 001e74ca59..1d48349cb5 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -127,6 +127,7 @@ var/global/list/datum/dna/gene/dna_genes[0] new_dna.species=species new_dna.body_markings=body_markings.Copy() new_dna.base_species=base_species //VOREStation Edit + new_dna.custom_species=custom_species //VOREStaton Edit new_dna.species_traits=species_traits.Copy() //VOREStation Edit new_dna.blood_color=blood_color //VOREStation Edit for(var/b=1;b<=DNA_SE_LENGTH;b++) diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 094d3eb32a..0412ab1470 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -98,6 +98,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) brainmob.real_name = H.real_name brainmob.dna = H.dna.Clone() brainmob.timeofhostdeath = H.timeofdeath + brainmob.ooc_notes = H.ooc_notes //VOREStation Edit // Copy modifiers. for(var/datum/modifier/M in H.modifiers) @@ -178,6 +179,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) parent_organ = BP_TORSO clone_source = TRUE flags = OPENCONTAINER + var/list/owner_flavor_text = list() /obj/item/organ/internal/brain/slime/is_open_container() return 1 @@ -191,6 +193,11 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) H = owner color = rgb(min(H.r_skin + 40, 255), min(H.g_skin + 40, 255), min(H.b_skin + 40, 255)) +/obj/item/organ/internal/brain/slime/removed(var/mob/living/user) + if(istype(owner)) + owner_flavor_text = owner.flavor_texts.Copy() + ..() + /obj/item/organ/internal/brain/slime/proc/reviveBody() var/datum/dna2/record/R = new /datum/dna2/record() R.dna = brainmob.dna @@ -200,6 +207,8 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) R.types = DNA2_BUF_UI|DNA2_BUF_UE|DNA2_BUF_SE R.languages = brainmob.languages R.flavor = list() + if(islist(owner_flavor_text)) + R.flavor = owner_flavor_text.Copy() for(var/datum/modifier/mod in brainmob.modifiers) if(mod.flags & MODIFIER_GENETIC) R.genetic_modifiers.Add(mod.type) @@ -238,6 +247,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) if(!R.dna.real_name) //to prevent null names R.dna.real_name = "promethean ([rand(0,999)])" H.real_name = R.dna.real_name + H.ooc_notes = brainmob.ooc_notes // VOREStation Edit H.nutrition = 260 //Enough to try to regenerate ONCE. H.adjustBruteLoss(40)