Merge pull request #6816 from joonoro/master

Fixes syringe bug from #6372

code/modules/reagents/reagent_containers/syringes.dm

@@ -14,6 +14,7 @@
 	possible_transfer_amounts = null	//list(5, 10, 15)
 	volume = 15
 	var/mode = SYRINGE_DRAW
+	var/busy = 0		// needed for delayed drawing of blood
 	g_amt = 20
 	m_amt = 10
 
@@ -43,6 +44,8 @@
 	return
 
 /obj/item/weapon/reagent_containers/syringe/afterattack(obj/target, mob/user , proximity)
+	if(busy)
+		return
 	if(!proximity) return
 	if(!target.reagents) return
 
@@ -81,8 +84,11 @@
 					if(target != user)
 						target.visible_message("<span class='danger'>[user] is trying to take a blood sample from [target]!</span>", \
 										"<span class='userdanger'>[user] is trying to take a blood sample from [target]!</span>")
+						busy = 1
 						if(!do_mob(user, target))
+							busy = 0
 							return
+					busy = 0
 					B.holder = src
 					B.volume = amount
 					//set reagent data