Prometheans can process blood without exploding.

This commit is contained in:
Neerti
2018-10-30 18:40:35 -04:00
committed by VirgoBot
parent 1ce67ab74d
commit feabaafa6e
2 changed files with 51 additions and 0 deletions
@@ -42,12 +42,21 @@
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.
@@ -68,6 +77,9 @@
var/mob/living/carbon/human/H = M
if(H.isSynthetic())
return
if(alien == IS_SLIME)
affect_ingest(M, alien, removed)
return
if(data && data["virus2"])
var/list/vlist = data["virus2"]
if(vlist.len)
@@ -79,6 +91,9 @@
M.antibodies |= data["antibodies"]
/datum/reagent/blood/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_SLIME) //They don't have blood, so it seems weird that they would instantly 'process' the chemical like another species does.
affect_ingest(M, alien, removed)
return
M.inject_blood(src, volume * volume_mod)
remove_self(volume)
+36
View File
@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Mechoid
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Prometheans are no longer murdered by blood, and instead process it like a weak nutrient. Will slow the regeneration of toxins due to water content."