Merge branch 'master' into glassware

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -107,8 +107,29 @@
 	else
 		return ..()
 
+/obj/item/reagent_containers/blood/attack(mob/M, mob/user, def_zone)
+	if(user.a_intent == INTENT_HELP && reagents.total_volume > 0)
+		if (user != M)
+			to_chat(user, "<span class='notice'>You force [M] to drink from the [src]</span>")
+			user.visible_message("<span class='userdanger'>[user] forces [M] to drink from the [src].</span>")
+			if(!do_mob(user, M, 50))
+				return
+		else
+			if(!do_mob(user, M, 10))
+				return
+			to_chat(user, "<span class='notice'>You take a sip from the [src].</span>")
+			user.visible_message("<span class='notice'>[user] puts the [src] up to their mouth.</span>")
+		if(reagents.total_volume <= 0) // Safety: In case you spam clicked the blood bag on yourself, and it is now empty (below will divide by zero)
+			return
+		var/gulp_size = 5
+		var/fraction = min(gulp_size / reagents.total_volume, 1)
+		reagents.reaction(M, INGEST, fraction) 	//checkLiked(fraction, M) // Blood isn't food, sorry.
+		reagents.trans_to(M, gulp_size)
+		playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+	..()
+
 /obj/item/reagent_containers/blood/bluespace
 	name = "bluespace blood pack"
 	desc = "Contains blood used for transfusion, this one has been made with bluespace technology to hold much more blood. Must be attached to an IV drip."
 	icon_state = "bsbloodpack"
-	volume = 600 //its a blood bath!
+	volume = 600 //its a blood bath!

code/modules/reagents/reagent_containers/hypospray.dm

@@ -338,8 +338,10 @@
 	return FALSE
 
 /obj/item/hypospray/mkii/AltClick(mob/user)
+	. = ..()
 	if(vial)
 		vial.attack_self(user)
+		return TRUE
 
 // Gunna allow this for now, still really don't approve - Pooj
 /obj/item/hypospray/mkii/emag_act(mob/user)

code/modules/reagents/reagent_containers/rags.dm

@@ -104,6 +104,7 @@
 				msg += "'s liquids into \the [target]"
 				reagents.trans_to(target, reagents.total_volume)
 			to_chat(user, "<span class='notice'>[msg].</span>")
+		return TRUE
 
 
 /obj/item/reagent_containers/rag/towel