Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/modules/unit_tests/merge_type.dm

@@ -9,7 +9,9 @@
 
 	var/list/paths = subtypesof(/obj/item/stack) - blacklist
 
-	for(var/stackpath in paths)
+	for(var/obj/item/stack/stackpath as anything in paths)
+		if(initial(stackpath.is_cyborg))
+			continue
 		var/obj/item/stack/stack = new stackpath
 		if(!stack.merge_type)
 			Fail("([stack]) lacks set merge_type variable!")

code/modules/unit_tests/vore_tests.dm

@@ -35,11 +35,11 @@
 	H = new(T)
 	startOxyloss = H.getOxyLoss()
 
-	return 1
+	return TRUE
 
 /datum/unit_test/space_suffocation/check_result()
 	if(H.life_tick < 10)
-		return 0
+		return FALSE
 
 	endOxyloss = H.getOxyLoss()
 
@@ -47,7 +47,7 @@
 		Fail("Human mob is not taking oxygen damage in space. (Before: [startOxyloss]; after: [endOxyloss])")
 
 	qdel(H)
-	return 1
+	return TRUE
 
 /datum/unit_test/belly_nonsuffocation
 	name = "MOB: human mob does not suffocate in a belly"