Iiiiit's merge conflict time!

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm

@@ -142,7 +142,7 @@
 
 			else
 				if(articount > 1)
-					state("Cannot harvest. Too many artifacts on the pad.")
+					atom_say("Cannot harvest. Too many artifacts on the pad.")
 				else if(analysed)
 					cur_artifact = analysed
 

code/modules/research/xenobiology/xenobiology.dm

@@ -403,6 +403,8 @@
 		return 0
 	if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
 		return 0
+	if(!O.can_reenter_corpse)
+		return 0
 	if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
 		return 0
 	return 1