shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update blood.dm

Browse Source
This commit is contained in:
deathride58
2018-01-07 15:20:11 -05:00
committed by GitHub
parent 7956e3df27
commit dd5dc57043
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/blood.dm
View File

@@ -27,12 +27,8 @@
if(NOBLOOD in dna.species.species_traits)
bleed_rate = 0
return
<<<<<<< HEAD
if(bodytemperature >= 225 && !(has_disability(DISABILITY_NOCLONE))) //cryosleep or husked people do not pump the blood.
=======
if(bodytemperature >= TCRYO && !(has_disability(DISABILITY_NOCLONE))) //cryosleep or husked people do not pump the blood.
>>>>>>> 18892a0... Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp (#34134)
//Blood regeneration if there is some space
if(blood_volume < BLOOD_VOLUME_NORMAL && !(NOHUNGER in dna.species.species_traits))