From 6752bc066e7dc7ce65a4ebb64838fd1f70bb04c7 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 19 Oct 2010 17:19:38 +0000
Subject: [PATCH] Fixed brainrot. Started work on beesease.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@324 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/disease.dm           |   2 +-
 code/datums/diseases/beesease.dm |  31 +++++++++++++++++++++++++++++++
 code/datums/diseases/brainrot.dm |  13 +++++++------
 code/game/gamemodes/events.dm    |   2 +-
 code/modules/mob/living/say.dm   |   9 +++++++++
 goonstation.dme                  |   1 +
 icons/obj/projectiles.dmi        | Bin 2349 -> 2912 bytes
 7 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 code/datums/diseases/beesease.dm

diff --git a/code/datums/disease.dm b/code/datums/disease.dm
index 2f1ad7496fa..ca8f4078f16 100644
--- a/code/datums/disease.dm
+++ b/code/datums/disease.dm
@@ -28,7 +28,7 @@
 
 	if(stage > max_stages)
 		stage = max_stages
-	if(prob(stage_prob) && stage != max_stages)
+	if(prob(stage_prob) && stage != max_stages && !cure_present) //now the disease shouldn't get back up to stage 4 in no time
 		stage++
 	if(stage != 1 && (prob(1) || (cure_present && prob(cure_chance))))
 		stage--
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
new file mode 100644
index 00000000000..be75835ca5c
--- /dev/null
+++ b/code/datums/diseases/beesease.dm
@@ -0,0 +1,31 @@
+/*
+/datum/disease/beesease
+	name = "Beesease"
+	max_stages = 5
+	spread = "Contact" //ie shot bees
+	cure = "???"
+	cure_id = "???"
+	agent = "Bees"
+	affected_species = list("Human","Monkey")
+	curable = 0
+
+/datum/disease/beesease/stage_act()
+	..()
+	switch(stage)
+		if(1)
+			if(prob(2))
+				affected_mob << "\red You feel like something is moving inside of you"
+		if(2) //also changes say, see the say.dm
+			if(prob(2))
+				affected_mob << "\red You feel like something is moving inside of you"
+			if(prob(2))
+				affected_mob << "\red BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		if(3)
+		//Should give the bee spit verb
+		if(4)
+		//Plus bees now spit randomly
+		if(5)
+		//Plus if you die, you explode into bees
+	return
+*/
+//Started working on it, but am too lazy to finish it today -- Urist
\ No newline at end of file
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 73e393b3868..0195c48e7c2 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -9,7 +9,7 @@
 	curable = 0
 	cure_chance = 10
 
-/datum/disease/brainrot/stage_act()
+/datum/disease/brainrot/stage_act() //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist
 	..()
 	switch(stage)
 		if(2)
@@ -28,25 +28,26 @@
 			if(prob(2))
 				affected_mob.emote("drool")
 			if(prob(10))
-				affected_mob.brainloss += 2
+				if(affected_mob.brainloss<=98) //shouldn't retard you to death now
+					affected_mob.brainloss += 2
 				affected_mob.updatehealth()
 				if(prob(2))
 					affected_mob << "\red Your try to remember something important...but can't."
-			if(prob(10))
+/*			if(prob(10))
 				affected_mob.toxloss +=3
 				affected_mob.updatehealth()
 				if(prob(2))
-					affected_mob << "\red Your head hurts."
+					affected_mob << "\red Your head hurts." */
 		if(4)
 			if(prob(2))
 				affected_mob.emote("stare")
 			if(prob(2))
 				affected_mob.emote("drool")
-			if(prob(15))
+/*			if(prob(15))
 				affected_mob.toxloss +=4
 				affected_mob.updatehealth()
 				if(prob(2))
-					affected_mob << "\red Your head hurts."
+					affected_mob << "\red Your head hurts." */
 			if(prob(15))
 				affected_mob.brainloss +=3
 				affected_mob.updatehealth()
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 8090a490738..2b642f65b95 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -233,7 +233,7 @@
 /proc/viral_outbreak()
 	command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
 	world << sound('outbreak7.ogg')
-	var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis)
+	var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/wizarditis)
 	for(var/mob/living/carbon/human/H in world)
 		if((H.virus) || (H.stat == 2))
 			continue
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index d49c748e880..e05dd07553e 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -98,6 +98,15 @@
 		if(!src.stuttering && prob(15))
 			message = stutter(message)
 
+	if(src.virus)
+		if(src.virus.name=="beesease" && src.virus.stage>=2)
+			if(prob(src.virus.stage*10))
+				var/bzz = length(message)
+				message = "B"
+				for(var/i=0,i<bzz,i++)
+					message += "Z"
+
+
 	switch (message_mode)
 		if ("headset")
 			if (src:ears)
diff --git a/goonstation.dme b/goonstation.dme
index 132e089db4f..44a6e383606 100644
--- a/goonstation.dme
+++ b/goonstation.dme
@@ -166,6 +166,7 @@
 #include "code\datums\sun.dm"
 #include "code\datums\vote.dm"
 #include "code\datums\diseases\alien_embryo.dm"
+#include "code\datums\diseases\beesease.dm"
 #include "code\datums\diseases\brainrot.dm"
 #include "code\datums\diseases\cold.dm"
 #include "code\datums\diseases\dna_spread.dm"
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index c7c9fa98937cfc16614c230755f5700cff11a65f..a369636b47232666965d29e77602c08fbe136074 100644
GIT binary patch
literal 2912
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

literal 2349
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
TAKIV(00000NkvXXu0mjf2~Vsx