Merge remote-tracking branch 'bay12-upstream/master' into development

code/modules/detectivework/microscope/microscope.dm

@@ -90,7 +90,7 @@
 	return
 
 /obj/machinery/microscope/proc/remove_sample(var/mob/living/remover)
-	if(!istype(remover) || remover.stat || !Adjacent(remover))
+	if(!istype(remover) || remover.incapacitated() || !Adjacent(remover))
 		return ..()
 	if(!sample)
 		remover << "<span class='warning'>\The [src] does not have a sample in it.</span>"

code/modules/detectivework/tools/swabs.dm

@@ -36,8 +36,8 @@
 		if(!H.organs_by_name["head"])
 			user << "<span class='warning'>They don't have a head.</span>"
 			return
-		if(H.species && (H.species.flags & NO_SCAN))
-			user << "<span class='warning'>They don't have any biological fluids to check!.</span>"
+		if(!H.check_has_mouth())
+			user << "<span class='warning'>They don't have a mouth.</span>"
 			return
 		user.visible_message("[user] swabs \the [H]'s mouth for a saliva sample.")
 		dna = list(H.dna.unique_enzymes)