cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-08-10 21:50:42 +02:00
parent 9a7169cc0d 9dfb1ccd48
commit 81871a960e
212 changed files with 6916 additions and 3606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/organs/blood.dm
View File

@@ -360,7 +360,7 @@ proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
drop.drips |= drips
// If there's no data to copy, call it quits here.
if(!source)
if(!istype(source))
return B
// Update appearance.

10
code/modules/organs/internal/brain.dm
View File

@@ -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)