From 2ac3798eb740b98802898da7b49b750fbb3bf35a Mon Sep 17 00:00:00 2001
From: panurgomatic <panurgomatic@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 23 Oct 2010 00:08:17 +0000
Subject: [PATCH] - Fixed couple of bugs - Made vaccine bottles contain 3
 portions of vaccine.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@348 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/WorkInProgress/Chemistry-Machinery.dm | 2 +-
 code/WorkInProgress/Chemistry-Tools.dm     | 6 ++++--
 code/datums/diseases/cold.dm               | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/WorkInProgress/Chemistry-Machinery.dm b/code/WorkInProgress/Chemistry-Machinery.dm
index f4e87de441b..05775e5dd8c 100644
--- a/code/WorkInProgress/Chemistry-Machinery.dm
+++ b/code/WorkInProgress/Chemistry-Machinery.dm
@@ -281,7 +281,7 @@
 				var/name = input(usr,"Name:","Name the vaccine",D.name)
 				if(!name || name == " ") name = D.name
 				B.name = "[name] vaccine bottle"
-				B.reagents.add_reagent("vaccine",10,vaccine_type)
+				B.reagents.add_reagent("vaccine",15,vaccine_type)
 				del(D)
 				wait = 1
 				spawn(1200)
diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 0e37ec0be69..1529d09ad38 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -386,8 +386,10 @@
 		R.my_atom = src
 
 	afterattack(obj/target, mob/user , flag)
-		if(src.can_be_placed_into.Find(target.type))
-			return
+		for(var/type in src.can_be_placed_into)
+			if(istype(target, type))
+				return
+
 		if(ismob(target) && target.reagents && reagents.total_volume)
 			user << "\blue You splash the solution onto [target]."
 			for(var/mob/O in viewers(world.view, user))
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index 1a58ce20f19..4b458c9029c 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -47,6 +47,7 @@
 			if(prob(1))
 				affected_mob << "\red Mucous runs down the back of your throat."
 			if(prob(1) && prob(50))
-				var/datum/disease/Flu = new /datum/disease/flu
-				affected_mob.contract_disease(Flu,1)
-				del(Flu)
+				if(!affected_mob.resistances.Find(/datum/disease/flu))
+					var/datum/disease/Flu = new /datum/disease/flu
+					affected_mob.contract_disease(Flu,1)
+					del(Flu)