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

Fix vs edit conflict

Browse Source
This commit is contained in:
Aronai Sieyes
2018-11-01 00:01:27 -04:00
committed by GitHub
parent feabaafa6e
commit 425616a91b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
View File

@@ -42,21 +42,18 @@
var/effective_dose = dose
if(issmall(M)) effective_dose *= 2
<<<<<<< HEAD
var/is_vampire = 0 //VOREStation Edit START
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species.gets_food_nutrition == 0)
H.nutrition += removed
is_vampire = 1 //VOREStation Edit END
=======
if(alien == IS_SLIME) // Treat it like nutriment for the jello, but not equivalent.
M.heal_organ_damage(0.2 * removed * volume_mod, 0) // More 'effective' blood means more usable material.
M.nutrition += 20 * removed * volume_mod
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
M.adjustToxLoss(removed / 2) // Still has some water in the form of plasma.
return
>>>>>>> cd628f1... Merge pull request #5698 from Mechoid/Blood_For_The_Blood_Promethean
if(effective_dose > 5)
if(is_vampire == 0) //VOREStation Edit.