From 72fd16a41c8a711ec0b81a9d5cc6d98397314b77 Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Thu, 5 Jan 2012 17:39:33 -0800
Subject: [PATCH] Fixed an issue with the cure research machine and a few other
 virus related glitches.

---
 code/WorkInProgress/virus2/antibodies.dm | 2 +-
 code/WorkInProgress/virus2/curer.dm      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/WorkInProgress/virus2/antibodies.dm b/code/WorkInProgress/virus2/antibodies.dm
index 72953aa4ecc..7e813f294c7 100644
--- a/code/WorkInProgress/virus2/antibodies.dm
+++ b/code/WorkInProgress/virus2/antibodies.dm
@@ -9,7 +9,7 @@ datum/reagent/antibodies
 	reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
 		if(istype(M,/mob/living/carbon/human))
 			if(src.data && method == INGEST)
-				if(src.data["antibodies"] & M:virus2.antigen)
+				if(M:virus2) if(src.data["antibodies"] & M:virus2.antigen)
 					M:virus2.dead = 1
 		return
 
diff --git a/code/WorkInProgress/virus2/curer.dm b/code/WorkInProgress/virus2/curer.dm
index 71948a08043..1dc20e00caa 100644
--- a/code/WorkInProgress/virus2/curer.dm
+++ b/code/WorkInProgress/virus2/curer.dm
@@ -40,6 +40,8 @@
 			container = I
 			C.drop_item()
 			I.loc = src
+		state("The [src.name] Buzzes", "blue")
+		return
 	if(istype(I,/obj/item/weapon/virusdish))
 		if(virusing)
 			user << "<b>The pathogen materializer is still recharging.."
@@ -53,7 +55,8 @@
 		virusing = 1
 		spawn(1200) virusing = 0
 
-	state("The [src.name] Buzzes", "blue")
+		state("The [src.name] Buzzes", "blue")
+		return
 
 	//else
 	src.attack_hand(user)
@@ -132,6 +135,7 @@
 	var/obj/item/weapon/reagent_containers/glass/beaker/product = new(src.loc)
 
 	var/datum/reagent/blood/B = locate() in container.reagents.reagent_list
+	if(!B) return
 
 	var/list/data = list()
 	data["antibodies"] = B.data["antibodies"]