Refactors virus spreading

code/datums/diseases/cold.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /datum/disease/cold
 	name = "The Cold"
 	max_stages = 3
@@ -63,4 +64,70 @@
 				if(!affected_mob.resistances.Find(/datum/disease/flu))
 					var/datum/disease/Flu = new /datum/disease/flu(0)
 					affected_mob.ContractDisease(Flu)
+=======
+/datum/disease/cold
+	name = "The Cold"
+	max_stages = 3
+	cure_text = "Rest & Spaceacillin"
+	cures = list("spaceacillin")
+	agent = "XY-rhinovirus"
+	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+	permeability_mod = 0.5
+	desc = "If left untreated the subject will contract the flu."
+	severity = VIRUS_SEVERITY_NONTHREAT
+
+/datum/disease/cold/stage_act()
+	..()
+	switch(stage)
+		if(2)
+/*
+			if(affected_mob.sleeping && prob(40))  //removed until sleeping is fixed
+				to_chat(affected_mob, "\blue You feel better.")
+				cure()
+				return
+*/
+			if(affected_mob.lying && prob(40))  //changed FROM prob(10) until sleeping is fixed
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1) && prob(5))
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
+		if(3)
+/*
+			if(affected_mob.sleeping && prob(25))  //removed until sleeping is fixed
+				to_chat(affected_mob, "\blue You feel better.")
+				cure()
+				return
+*/
+			if(affected_mob.lying && prob(25))  //changed FROM prob(5) until sleeping is fixed
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1) && prob(1))
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
+				cure()
+				return
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
+			if(prob(1))
+				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
+			if(prob(1) && prob(50))
+				if(!affected_mob.resistances.Find(/datum/disease/flu))
+					var/datum/disease/Flu = new /datum/disease/flu(0)
+					affected_mob.ForceContractDisease(Flu)
+>>>>>>> db0c10e... Refactors virus spreading (#31066)
 					cure()