- Changed the contract_disease proc clothing checks with respect to permeability_coefficient.

- Spaceacillin no longer heals all viruses.
- Some diseases must be cured with two or more chemicals simultaneously.
- Tweaked magnitis disease (now affects cyborgs).
- Added wizarditis disease.
- Tweaked some item properties.
- Added leather gloves for the Botanists.
- Some suits cannot be placed into backpack.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@321 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Machinery.dm

@@ -332,6 +332,10 @@
 				src.temphtml = "The replicator is not ready yet."
 			src.updateUsrDialog()
 			return
+		else if (href_list["empty_beaker"])
+			beaker.reagents.clear_reagents()
+			src.updateUsrDialog()
+			return
 		else if (href_list["eject"])
 			beaker:loc = src.loc
 			beaker = null
@@ -397,7 +401,7 @@
 						dat += "nothing<BR>"
 				else
 					dat += "nothing<BR>"
-			dat += "<BR><A href='?src=\ref[src];eject=1'>Eject beaker</A><BR>"
+			dat += "<BR><A href='?src=\ref[src];eject=1'>Eject beaker</A>[((R.total_volume&&R.reagent_list.len) ? "-- <A href='?src=\ref[src];empty_beaker=1'>Empty beaker</A>":"")]<BR>"
 			dat += "<A href='?src=\ref[user];mach_close=pandemic'>Close</A>"
 
 		user << browse("<TITLE>PanD.E.M.I.C 2200</TITLE><BR>[dat]", "window=pandemic;size=575x400")

code/WorkInProgress/Chemistry-Reagents.dm

@@ -592,7 +592,7 @@ datum
 			id = "iron"
 			description = "Pure iron is a metal."
 			reagent_state = SOLID
-
+/*
 			on_mob_life(var/mob/M)
 				if(!M) M = holder.my_atom
 				if((M.virus) && (prob(8) && (M.virus.name=="Magnitis")))
@@ -604,6 +604,7 @@ datum
 						M.virus = null
 				holder.remove_reagent(src.id, 0.2)
 				return
+*/
 
 		aluminium
 			name = "Aluminium"
@@ -952,15 +953,7 @@ datum
 			description = "An all-purpose antiviral agent."
 			reagent_state = LIQUID
 
-			on_mob_life(var/mob/M)
-				if(!M) M = holder.my_atom
-				if((M.virus) && (prob(8) && (M.virus.name!="Magnitis")))
-					if(M.virus.spread == "Airborne")
-						M.virus.spread = "Remissive"
-					M.virus.stage--
-					if(M.virus.stage <= 0)
-						M.resistances += M.virus.type
-						M.virus = null
+			on_mob_life(var/mob/M)//no more mr. panacea
 				holder.remove_reagent(src.id, 0.2)
 				return
 
@@ -1255,7 +1248,6 @@ datum
 			description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
 			reagent_state = LIQUID
 			on_mob_life(var/mob/M)
-				..()
 				M.dizziness = max(0,M.dizziness-5)
 				M:drowsyness = max(0,M:drowsyness-3)
 				M:sleeping = 0

code/WorkInProgress/Chemistry-Tools.dm

@@ -1218,7 +1218,7 @@
 		R.add_reagent("blood", 20, data)
 
 /obj/item/weapon/reagent_containers/glass/bottle/magnitis
-	name = "GBS culture bottle"
+	name = "Magnitis culture bottle"
 	desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
 	icon = 'chemical.dmi'
 	icon_state = "bottle3"
@@ -1233,6 +1233,23 @@
 		R.add_reagent("blood", 20, data)
 
 
+/obj/item/weapon/reagent_containers/glass/bottle/wizarditis
+	name = "Wizarditis culture bottle"
+	desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
+	icon = 'chemical.dmi'
+	icon_state = "bottle3"
+	amount_per_transfer_from_this = 5
+
+	New()
+		var/datum/reagents/R = new/datum/reagents(20)
+		reagents = R
+		R.my_atom = src
+		var/datum/disease/F = new /datum/disease/wizarditis
+		var/list/data = list("virus"= F)
+		R.add_reagent("blood", 20, data)
+
+
+
 /obj/item/weapon/reagent_containers/glass/beaker
 	name = "beaker"
 	desc = "A beaker. Can hold up to 30 units."