diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 3c7bf733a6..842ed71e90 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -104,15 +104,17 @@ return ..() /obj/item/reagent_containers/blood/attack(mob/living/carbon/C, mob/user, def_zone) - if(!iscarbon(C) || !user.a_intent == INTENT_HELP || reagents.total_volume < 0) + if(!iscarbon(C) || !user.a_intent != INTENT_HELP || reagents.total_volume < 0) ..() if(C.is_mouth_covered()) + if(user != C) + to_chat(user, "You can't drink force [C] to drink from [src] while their mouth is covered.") + return to_chat(user, "You can't drink from the [src] while your mouth is covered.") return if(!user.CheckActionCooldown()) - to_chat(user, "You can't drink from the [src] so fast!") return if(user != C) user.visible_message("[user] forces [C] to drink from the [src].", \ @@ -136,8 +138,8 @@ var/gulp_size = 3 var/fraction = min(gulp_size / reagents.total_volume, 1) reagents.reaction(C, INGEST, fraction) //checkLiked(fraction, M) // Blood isn't food, sorry. + reagents.remove_any(5) //Inneficency, so hey, IVs are usefull. reagents.trans_to(C, gulp_size) - reagents.remove_reagent(src, 5) //Inneficency, so hey, IVs are usefull. playsound(C.loc,'sound/items/drink.ogg', rand(10, 50), TRUE)