diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 79956f127fc..f91f04577ef 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -230,10 +230,8 @@ GLOBAL_LIST_INIT(advance_cures, list(
 // Assign the spread type and give it the correct description.
 /datum/disease/advance/proc/SetSpread(spread_id)
 	switch(spread_id)
-		if(NON_CONTAGIOUS)
-			spread_text = "None"
-		if(SPECIAL)
-			spread_text = "None"
+		if(NON_CONTAGIOUS, SPECIAL)
+			spread_text = "Non-contagious"
 		if(CONTACT_GENERAL, CONTACT_HANDS, CONTACT_FEET)
 			spread_text = "On contact"
 		if(AIRBORNE)
diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm
index bdbb0fe4455..bf8276667e8 100644
--- a/code/datums/diseases/appendicitis.dm
+++ b/code/datums/diseases/appendicitis.dm
@@ -2,6 +2,8 @@
 	form = "Condition"
 	name = "Appendicitis"
 	max_stages = 3
+	spread_text = "Non-contagious"
+	spread_flags = NON_CONTAGIOUS
 	cure_text = "Surgery"
 	agent = "Shitty Appendix"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -9,7 +11,6 @@
 	desc = "If left untreated the subject will become very weak, and may vomit often."
 	severity = "Dangerous!"
 	disease_flags = CAN_CARRY|CAN_RESIST
-	spread_flags = NON_CONTAGIOUS
 	visibility_flags = HIDDEN_PANDEMIC
 	required_organs = list(/obj/item/organ/internal/appendix)
 	bypasses_immunity = TRUE
diff --git a/code/datums/diseases/berserker.dm b/code/datums/diseases/berserker.dm
index 81b3ca8cb72..368adf9fdce 100644
--- a/code/datums/diseases/berserker.dm
+++ b/code/datums/diseases/berserker.dm
@@ -2,8 +2,8 @@
 	name = "Berserker"
 	max_stages = 2
 	stage_prob = 5
-	spread_text = "Non-Contagious"
-	spread_flags = SPECIAL
+	spread_text = "Non-contagious"
+	spread_flags = NON_CONTAGIOUS
 	cure_text = "Anti-Psychotics"
 	cures = list("haloperidol")
 	agent = "Jagged Crystals"
@@ -12,7 +12,6 @@
 	desc = "Swearing, shouting, attacking nearby crew members uncontrollably."
 	severity = DANGEROUS
 	disease_flags = CURABLE
-	spread_flags = NON_CONTAGIOUS
 
 /datum/disease/berserker/stage_act()
 	..()
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index ff70b3905b8..9dfc74213fe 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -1,6 +1,7 @@
 /datum/disease/cold
 	name = "The Cold"
 	max_stages = 3
+	spread_text = "Airborne"
 	spread_flags = AIRBORNE
 	cure_text = "Rest & Spaceacillin"
 	cures = list("spaceacillin")
diff --git a/code/datums/diseases/food_poisoning.dm b/code/datums/diseases/food_poisoning.dm
index 6c075e4e4de..ae2f66960e9 100644
--- a/code/datums/diseases/food_poisoning.dm
+++ b/code/datums/diseases/food_poisoning.dm
@@ -2,8 +2,8 @@
 	name = "Food Poisoning"
 	max_stages = 3
 	stage_prob = 5
-	spread_text = "Non-Contagious"
-	spread_flags = SPECIAL
+	spread_text = "Non-contagious"
+	spread_flags = NON_CONTAGIOUS
 	cure_text = "Sleep"
 	agent = "Salmonella"
 	cures = list("chicken_soup")
@@ -12,7 +12,6 @@
 	desc = "Nausea, sickness, and vomitting."
 	severity = MINOR
 	disease_flags = CURABLE
-	spread_flags = NON_CONTAGIOUS
 	virus_heal_resistant = TRUE
 
 /datum/disease/food_poisoning/stage_act()
diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm
index 19d4c287427..b907ebfeab9 100644
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -41,11 +41,10 @@
 /datum/disease/gbs/curable
 	name = "Non-Contagious GBS"
 	stage_prob = 5
-	spread_text = "Non-Contagious"
-	spread_flags = SPECIAL
+	spread_text = "Non-contagious"
+	spread_flags = NON_CONTAGIOUS
 	cure_text = "Cryoxadone"
 	cures = list("cryoxadone")
 	cure_chance = 10
 	agent = "gibbis"
-	spread_flags = NON_CONTAGIOUS
 	disease_flags = CURABLE
diff --git a/code/datums/diseases/kuru.dm b/code/datums/diseases/kuru.dm
index 3091e2bc12e..dfe9b428886 100644
--- a/code/datums/diseases/kuru.dm
+++ b/code/datums/diseases/kuru.dm
@@ -3,14 +3,13 @@
 	name = "Space Kuru"
 	max_stages = 4
 	stage_prob = 5
-	spread_text = "Non-Contagious"
-	spread_flags = SPECIAL
+	spread_text = "Non-contagious"
+	spread_flags = NON_CONTAGIOUS
 	cure_text = "Incurable"
 	agent = "Prions"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "Uncontrollable laughing."
 	severity = BIOHAZARD
-	spread_flags = NON_CONTAGIOUS
 	disease_flags = CAN_CARRY
 	bypasses_immunity = TRUE //Kuru is a prion disorder, not a virus
 	virus_heal_resistant = TRUE