From dda55a02bc22554cba03778fe681844d18d5c343 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 24 Jan 2013 17:14:36 +0400 Subject: [PATCH] Blood now goes to vessels again. --- code/modules/reagents/Chemistry-Holder.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 92edcab68ab..74f63060c0c 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -102,11 +102,19 @@ datum var/part = amount / src.total_volume var/trans_data = null for (var/datum/reagent/current_reagent in src.reagent_list) + if (!current_reagent) + continue var/current_reagent_transfer = current_reagent.volume * part if(preserve_data) trans_data = current_reagent.data - R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data) - src.remove_reagent(current_reagent.id, current_reagent_transfer) + if(current_reagent.id == "blood" && ishuman(target)) // can never be sure + var/mob/living/carbon/human/H = target + H.vessel.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data) + src.remove_reagent(current_reagent.id, current_reagent_transfer) + H.vessel.update_total() + else + R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data) + src.remove_reagent(current_reagent.id, current_reagent_transfer) src.update_total() R.update_total()