From d62aa1425f4036e45922bb0cab33c70dbdf7c66f Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Sun, 11 Nov 2012 18:41:40 +0100
Subject: [PATCH] Fixed a few more bugs with genetic side effects.

---
 code/defines/obj/weapon.dm            | 2 +-
 code/modules/genetics/side_effects.dm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 00d1d18a09..8bf17c2e04 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1068,9 +1068,9 @@
 
 	New()
 		..()
+		info = ""
 		for(var/tp in typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect)
 			var/datum/genetics/side_effect/S = new tp
-			info = ""
 			info += "<B>Name:</B>\t [S.name]<BR>"
 			info += "<B>Symptom:</B>\t [S.symptom]<BR>"
 			info += "<B>Treatment:</B>\t [S.treatment]<BR>"
diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm
index 71f32aec44..b8a4a6b80e 100644
--- a/code/modules/genetics/side_effects.dm
+++ b/code/modules/genetics/side_effects.dm
@@ -61,6 +61,7 @@
 			H.monkeyize()
 
 proc/trigger_side_effect(mob/living/carbon/human/H)
+	if(!istype(H)) return
 	var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect)
 	var/datum/genetics/side_effect/S = new tp