Merge branch 'master' into upstream-merge-31737

code/datums/diseases/parrotpossession.dm

@@ -18,10 +18,11 @@
 	if(!parrot || parrot.loc != affected_mob)
 		cure()
 	else if(prob(parrot.speak_chance))
-		affected_mob.say(pick(parrot.speech_buffer))
+		if(parrot.speech_buffer.len)
+			affected_mob.say(pick(parrot.speech_buffer))
 
 /datum/disease/parrot_possession/cure()
 	if(parrot && parrot.loc == affected_mob)
 		parrot.forceMove(affected_mob.drop_location())
 		affected_mob.visible_message("<span class='danger'>[parrot] is violently driven out of [affected_mob]!</span>", "<span class='userdanger'>[parrot] bursts out of your chest!</span>")
-	..()
+	..()

code/datums/diseases/wizarditis.dm

@@ -95,8 +95,10 @@ STI KALY - blind
 
 	var/list/L = list()
 	for(var/turf/T in get_area_turfs(thearea.type))
-		if(T.z != affected_mob.z) continue
-		if(T.name == "space") continue
+		if(T.z != affected_mob.z)
+			continue
+		if(T.name == "space")
+			continue
 		if(!T.density)
 			var/clear = 1
 			for(var/obj/O in T)