diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm
index 3bdea5a88a..a5a6bab856 100644
--- a/code/ATMOSPHERICS/components/valve.dm
+++ b/code/ATMOSPHERICS/components/valve.dm
@@ -42,9 +42,9 @@
 
 /obj/machinery/atmospherics/valve/init_dir()
 	switch(dir)
-		if(NORTH || SOUTH)
+		if(NORTH, SOUTH)
 			initialize_directions = NORTH|SOUTH
-		if(EAST || WEST)
+		if(EAST, WEST)
 			initialize_directions = EAST|WEST
 
 /obj/machinery/atmospherics/valve/get_neighbor_nodes_for_init()
diff --git a/code/_helpers/type2type.dm b/code/_helpers/type2type.dm
index b5659351be..3e6c3e9854 100644
--- a/code/_helpers/type2type.dm
+++ b/code/_helpers/type2type.dm
@@ -389,9 +389,9 @@
 		switch(child)
 			if(/datum)
 				return null
-			if(/obj || /mob)
+			if(/obj, /mob)
 				return /atom/movable
-			if(/area || /turf)
+			if(/area, /turf)
 				return /atom
 			else
 				return /datum
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index f14d2bdc4f..efd1dd300f 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -1060,13 +1060,13 @@
 			parent_helmet = /obj/item/clothing/head/helmet/space/void/pilot/alt
 			parent_suit = /obj/item/clothing/suit/space/void/pilot/alt
 		//Antag Suits
-		if("^%###^%$" || "Mercenary")
+		if("^%###^%$", "Mercenary")
 			parent_helmet = /obj/item/clothing/head/helmet/space/void/merc
 			parent_suit = /obj/item/clothing/suit/space/void/merc
 		if("Charring")
 			parent_helmet = /obj/item/clothing/head/helmet/space/void/merc/fire
 			parent_suit = /obj/item/clothing/suit/space/void/merc/fire
-		if("Gem-Encrusted" || "Wizard")
+		if("Gem-Encrusted", "Wizard")
 			parent_helmet = /obj/item/clothing/head/helmet/space/void/wizard
 			parent_suit = /obj/item/clothing/suit/space/void/wizard
 		//Special or Event suits
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 2581366a3e..f0a567c0f9 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -48,12 +48,12 @@
 			updateUsrDialog()
 			return
 		charges -= 1
-		switch(rand(1,2))
-			if(1)
-				temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
-				updateUsrDialog()
-				spawn(rand(50,200)) selfdestruct()
-				return
+		if (prob(50))
+			temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
+			updateUsrDialog()
+			spawn(rand(50, 200))
+				selfdestruct()
+			return
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/N = M
 			to_chat(N, "<B>You have joined the ranks of the Syndicate and become a traitor to the station!</B>")
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
deleted file mode 100644
index ff6a44c3dc..0000000000
--- a/code/modules/flufftext/TextFilters.dm
+++ /dev/null
@@ -1,82 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-/proc/Intoxicated(phrase)
-	phrase = html_decode(phrase)
-	var/leng=length(phrase)
-	var/counter=length(phrase)
-	var/newphrase=""
-	var/newletter=""
-	while(counter>=1)
-		newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
-		if(rand(1,3)==3)
-			if(lowertext(newletter)=="o")	newletter="u"
-			if(lowertext(newletter)=="s")	newletter="ch"
-			if(lowertext(newletter)=="a")	newletter="ah"
-			if(lowertext(newletter)=="c")	newletter="k"
-		switch(rand(1,7))
-			if(1,3,5,8)	newletter="[lowertext(newletter)]"
-			if(2,4,6,15)	newletter="[uppertext(newletter)]"
-			if(7)	newletter+="'"
-			//if(9,10)	newletter="<b>[newletter]</b>"
-			//if(11,12)	newletter="<big>[newletter]</big>"
-			//if(13)	newletter="<small>[newletter]</small>"
-		newphrase+="[newletter]";counter-=1
-	return newphrase
-
-/proc/NewStutter(phrase,stunned)
-	phrase = html_decode(phrase)
-
-	var/list/split_phrase = splittext(phrase," ") //Split it up into words.
-
-	var/list/unstuttered_words = split_phrase.Copy()
-	var/i = rand(1,3)
-	if(stunned) i = split_phrase.len
-	for(,i > 0,i--) //Pick a few words to stutter on.
-
-		if (!unstuttered_words.len)
-			break
-		var/word = pick(unstuttered_words)
-		unstuttered_words -= word //Remove from unstuttered words so we don't stutter it again.
-		var/index = split_phrase.Find(word) //Find the word in the split phrase so we can replace it.
-
-		//Search for dipthongs (two letters that make one sound.)
-		var/first_sound = copytext(word,1,3)
-		var/first_letter = copytext(word,1,2)
-		if(lowertext(first_sound) in list("ch","th","sh"))
-			first_letter = first_sound
-
-		//Repeat the first letter to create a stutter.
-		var/rnum = rand(1,3)
-		switch(rnum)
-			if(1)
-				word = "[first_letter]-[word]"
-			if(2)
-				word = "[first_letter]-[first_letter]-[word]"
-			if(3)
-				word = "[first_letter]-[word]"
-
-		split_phrase[index] = word
-
-	return sanitize(jointext(split_phrase," "))
-
-/proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness.
-	step(M, pick(d,turn(d,90),turn(d,-90)))
-
-/proc/Ellipsis(original_msg, chance = 50)
-	if(chance <= 0) return "..."
-	if(chance >= 100) return original_msg
-
-	var/list/words = splittext(original_msg," ")
-	var/list/new_words = list()
-
-	var/new_msg = ""
-
-	for(var/w in words)
-		if(prob(chance))
-			new_words += "..."
-		else
-			new_words += w
-
-	new_msg = jointext(new_words," ")
-
-	return new_msg
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 23335e0ab8..c908b7952b 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -203,14 +203,17 @@
 			if(lowertext(newletter)=="s")	newletter="ch"
 			if(lowertext(newletter)=="a")	newletter="ah"
 			if(lowertext(newletter)=="c")	newletter="k"
-		switch(rand(1,15))
-			if(1,3,5,8)	newletter="[lowertext(newletter)]"
-			if(2,4,6,15)	newletter="[uppertext(newletter)]"
-			if(7)	newletter+="'"
-			//if(9,10)	newletter="<b>[newletter]</b>"
-			//if(11,12)	newletter="<big>[newletter]</big>"
-			//if(13)	newletter="<small>[newletter]</small>"
-		newphrase+="[newletter]";counter-=1
+		var/randomValue = rand(1, 15)
+		switch (randomValue)
+			if (1 to 4)
+				newletter = "[lowertext(newletter)]"
+			if (5 to 8)
+				newletter = "[uppertext(newletter)]"
+			if (9)
+				newletter += "'"
+			// for 10 to 15, do nothing
+		newphrase += "[newletter]"
+		counter -= 1
 	return newphrase
 
 /proc/stutter(n)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index e9e842b3a3..30b98f9fb7 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -337,10 +337,10 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
 	var/dir2 = 0
 	var/dir3 = 0
 	switch(direction)
-		if(NORTH||SOUTH)
+		if(NORTH, SOUTH)
 			dir2 = 4
 			dir3 = 8
-		if(EAST||WEST)
+		if(EAST, WEST)
 			dir2 = 1
 			dir3 = 2
 	var/turf/T2 = T
diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm
index 26866da24d..f20f0259fd 100644
--- a/code/unit_tests/zas_tests.dm
+++ b/code/unit_tests/zas_tests.dm
@@ -38,7 +38,7 @@
 					return test_result
 
 
-			if(UT_NORMAL || UT_NORMAL_COLD)
+			if(UT_NORMAL, UT_NORMAL_COLD)
 				if(abs(pressure - ONE_ATMOSPHERE) > 10)
 					test_result["msg"] = "Pressure out of bounds: [pressure] | [t_msg]"
 					return test_result
diff --git a/polaris.dme b/polaris.dme
index 08ef13101f..e9e331692b 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1842,7 +1842,6 @@
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"
 #include "code\modules\flufftext\look_up.dm"
-#include "code\modules\flufftext\TextFilters.dm"
 #include "code\modules\food\food.dm"
 #include "code\modules\food\recipe.dm"
 #include "code\modules\food\recipe_dump.dm"