Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490

code/game/gamemodes/clown_ops/clown_ops.dm

@@ -57,7 +57,6 @@
 	..()
 	if(visualsOnly)
 		return
-	H.dna.add_mutation(CLOWNMUT)
 	H.dna.add_mutation(SMILE)
 
 /datum/outfit/syndicate/clownop/leader

code/game/gamemodes/dynamic/dynamic.dm

@@ -741,7 +741,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 			if (M.mind && (M.mind.special_role || M.mind.antag_datums?.len > 0))
 				current_players[CURRENT_LIVING_ANTAGS].Add(M)
 		else
-			if (istype(M,/mob/dead/observer))
+			if (isobserver(M))
 				var/mob/dead/observer/O = M
 				if (O.started_as_observer) // Observers
 					current_players[CURRENT_OBSERVERS].Add(M)