From 3d540a0d034d5558224ba2d4dbdb99093a7dcf65 Mon Sep 17 00:00:00 2001
From: phil235 <marin.phil@gmail.com>
Date: Thu, 20 Nov 2014 20:36:43 +0100
Subject: [PATCH] Fixes missing cure_text's, fixes virus being uncurable, fixes
 advance virus changing upon injection. Fixes virus staying at stage 1.

---
 code/datums/diseases/_MobProcs.dm | 2 +-
 code/datums/diseases/_disease.dm  | 7 +++----
 code/datums/diseases/anxiety.dm   | 1 +
 code/datums/diseases/beesease.dm  | 1 +
 code/datums/diseases/brainrot.dm  | 1 +
 code/datums/diseases/flu.dm       | 1 +
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
index e342a65d324..05b1fb2f52a 100644
--- a/code/datums/diseases/_MobProcs.dm
+++ b/code/datums/diseases/_MobProcs.dm
@@ -32,7 +32,7 @@
 
 
 /mob/proc/AddDisease(var/datum/disease/D)
-	var/datum/disease/DD = new D.type()
+	var/datum/disease/DD = new D.type(1, D, 0)
 	viruses += DD
 	DD.affected_mob = src
 	DD.holder = src
diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
index f9a6a6ef648..4baa4b20969 100644
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -76,10 +76,10 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 
 	if(!cure)
 		if(prob(stage_prob))
-			stage = min(stage++,max_stages)
+			stage = min(stage + 1,max_stages)
 	else
 		if(prob(cure_chance))
-			stage = max(stage--, 1)
+			stage = max(stage - 1, 1)
 
 	if(disease_flags & CURABLE)
 		if(cure && prob(cure_chance))
@@ -91,9 +91,8 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
 		return 0
 
 	. = 1
-
 	for(var/C_id in cures)
-		if(!affected_mob.reagents.has_reagent(C_id in cures))
+		if(!affected_mob.reagents.has_reagent(C_id))
 			.--
 			break //One missing cure is enough to fail
 
diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm
index a108fcb711a..3de7edf76cc 100644
--- a/code/datums/diseases/anxiety.dm
+++ b/code/datums/diseases/anxiety.dm
@@ -4,6 +4,7 @@
 	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
+	cure_text = "Ethanol"
 	cures = list("ethanol")
 	agent = "Excess Lepidopticides"
 	viable_mobtypes = list(/mob/living/carbon/human,/mob/living/carbon/monkey)
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index 54ae195ffec..7defa90d7bd 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -4,6 +4,7 @@
 	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
+	cure_text = "Sugar"
 	cures = list("sugar")
 	agent = "Apidae Infection"
 	viable_mobtypes = list(/mob/living/carbon/human,/mob/living/carbon/monkey)
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 00bb90d36c8..f5c0b4d5d33 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -3,6 +3,7 @@
 	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
+	cure_text = "Alkysine"
 	cures = list("alkysine")
 	agent = "Cryptococcus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 0a5bead61ea..1df55bbb9d7 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -2,6 +2,7 @@
 	name = "The Flu"
 	max_stages = 3
 	spread_text = "Airborne"
+	cure_text = "Spaceacillin"
 	cures = list("spaceacillin")
 	cure_chance = 10
 	agent = "H13N1 flu virion"