From f6bf89656b18d7633f35a3ba8834e8cd2ae63568 Mon Sep 17 00:00:00 2001
From: paprka <ddkfjskdjf@gayshit.com>
Date: Wed, 4 Feb 2015 12:21:05 -0800
Subject: [PATCH] fixes syringes with monkeys, virus transfers, and iv drip
 feedback

---
 code/game/machinery/iv_drip.dm                 |  3 +++
 code/modules/mob/living/carbon/human/blood.dm  | 18 +++++++++++-------
 .../reagents/reagent_containers/syringes.dm    | 13 +++++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 774f095ec3e..c7f6c54dae6 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -51,6 +51,9 @@
 /obj/machinery/iv_drip/MouseDrop(over_object, src_location, over_location)
 	..()
 
+	if(!ishuman(over_object))
+		usr << "<span class='warning'>The drip beeps: Warning, human patients only!</span>"
+
 	if(attached)
 		visible_message("[src.attached] is detached from \the [src]")
 		src.attached = null
diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm
index 06bfcf41c23..5b007374945 100644
--- a/code/modules/mob/living/carbon/human/blood.dm
+++ b/code/modules/mob/living/carbon/human/blood.dm
@@ -186,19 +186,18 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 	. = ..()
 	vessel.remove_reagent("blood",amount) // Removes blood if human
 
-//Transfers blood from container ot vessels
+//Transfers blood from container to vessels
 /mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, var/amount)
 
 	var/datum/reagent/blood/injected = get_blood(container.reagents)
 
-	if(NOBLOOD in dna.species.specflags)
-		reagents.add_reagent("blood", amount, injected.data)
-		reagents.update_total()
-		return
-
 	if(!injected)
 		return
 
+	for(var/datum/disease/D in injected.data["viruses"])
+		var/datum/disease/new_virus = D.Copy(1)
+		injected.data["viruses"] += new_virus
+
 	var/list/chems = list()
 	chems = params2list(injected.data["trace_chem"])
 	for(var/C in chems)
@@ -207,11 +206,16 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 	container.reagents.remove_reagent("blood", amount)
 
-//Transfers blood from container ot vessels, respecting blood types compatability.
+//Transfers blood from container to vessels, respecting blood types compatability.
 /mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, var/amount)
 
 	var/datum/reagent/blood/injected = get_blood(container.reagents)
 
+	if(NOBLOOD in dna.species.specflags)
+		reagents.add_reagent("blood", amount, injected.data)
+		reagents.update_total()
+		return
+
 	var/datum/reagent/blood/our = get_blood(vessel)
 
 	if (!injected || !our)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 7c92956dc4b..a97f1f44a08 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -157,16 +157,17 @@
 
 				reagents.reaction(target, INGEST)
 			spawn(5)
-				target.add_fingerprint(user)
-				var/datum/reagent/blood/B = locate() in src.reagents.reagent_list
-				var/trans
+				var/datum/reagent/blood/B
+				for(var/datum/reagent/blood/d in src.reagents.reagent_list)
+					B = d
+					break
 				if(B && istype(target,/mob/living/carbon))
 					var/mob/living/carbon/C = target
 					C.inject_blood(src,5)
 				else
-					trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
-				user << "<span class='notice'>You inject [trans] unit\s of the solution. [src] now contains [reagents.total_volume] unit\s.</span>"
-				if(reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
+					src.reagents.trans_to(target, amount_per_transfer_from_this)
+				user << "<span class='notice'>You inject 5 units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>"
+				if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT)
 					mode = SYRINGE_DRAW
 					update_icon()