diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 62ed84d34f6..da6f8f90c89 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -84,7 +84,7 @@ if(istype(src.beaker, /obj/item/weapon/reagent_containers/blood)) // speed up transfer on blood packs transfer_amount = 4 - attached.inject_blood(beaker,transfer_amount) + src.beaker.reagents.trans_to(src.attached, transfer_amount) update_icon() // Take blood diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index a2f18e8d813..ab7a55e1da8 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -37,11 +37,12 @@ /obj/structure/stool/MouseDrop(atom/over_object) if (istype(over_object, /mob/living/carbon/human)) var/mob/living/carbon/human/H = over_object - var/obj/item/weapon/stool/S = new/obj/item/weapon/stool() - S.origin = src - src.loc = S - H.put_in_hands(S) - H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!") + if (!H.restrained() && !H.stat && in_range(src, over_object)) + var/obj/item/weapon/stool/S = new/obj/item/weapon/stool() + S.origin = src + src.loc = S + H.put_in_hands(S) + H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!") /obj/item/weapon/stool name = "stool" diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 68cb8c4e2ab..2fb6d0c27fb 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -104,6 +104,10 @@ datum for (var/datum/reagent/current_reagent in src.reagent_list) if (!current_reagent) continue + if (current_reagent.id == "blood" && ishuman(target)) + var/mob/living/carbon/human/H = target + H.inject_blood(my_atom, amount) + continue var/current_reagent_transfer = current_reagent.volume * part if(preserve_data) trans_data = current_reagent.data