Merge remote-tracking branch 'citadel/master' into mobility_flags

code/datums/diseases/advance/symptoms/choking.dm

@@ -41,7 +41,7 @@ Bonus
 		suppress_warning = TRUE
 
 /datum/symptom/choking/Activate(datum/disease/advance/A)
-	if(!..())
+	if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
 		return
 	var/mob/living/M = A.affected_mob
 	switch(A.stage)
@@ -112,7 +112,7 @@ Bonus
 		power = 2
 
 /datum/symptom/asphyxiation/Activate(datum/disease/advance/A)
-	if(!..())
+	if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
 		return
 	var/mob/living/M = A.affected_mob
 	switch(A.stage)

code/datums/diseases/advance/symptoms/cough.dm

@@ -50,7 +50,7 @@ BONUS
 		symptom_delay_max = 10
 
 /datum/symptom/cough/Activate(datum/disease/advance/A)
-	if(!..())
+	if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
 		return
 	var/mob/living/M = A.affected_mob
 	switch(A.stage)

code/datums/diseases/advance/symptoms/sneeze.dm

@@ -39,7 +39,7 @@ Bonus
 		suppress_warning = TRUE
 
 /datum/symptom/sneeze/Activate(datum/disease/advance/A)
-	if(!..())
+	if(!..() || HAS_TRAIT(A.affected_mob,TRAIT_NOBREATH))
 		return
 	var/mob/living/M = A.affected_mob
 	switch(A.stage)

code/datums/diseases/wizarditis.dm

@@ -94,7 +94,7 @@ STI KALY - blind
 	var/area/thearea = pick(theareas)
 
 	var/list/L = list()
-	for(var/turf/T in get_area_turfs(thearea.type))
+	for(var/turf/T in thearea)
 		if(T.z != affected_mob.z)
 			continue
 		if(T.name == "space")