Merge pull request #6567 from Citadel-Station-13/upstream-merge-37511

[MIRROR] fixes a pacifism kill through crushing firelocks!

code/game/machinery/doors/firedoor.dm

@@ -142,6 +142,14 @@
 	if(density)
 		open()
 	else
+		if(iscarbon(user))
+			var/mob/living/carbon/C = user
+			if(C.has_trait(TRAIT_PACIFISM))
+				var/T = get_turf(src)
+				for(var/mob/living/L in T)
+					if((L.stat != DEAD) && !L.has_trait(TRAIT_FAKEDEATH))
+						to_chat(user, "<span class='notice'>Closing [src] would hurt [L]!</span>")
+						return
 		close()
 
 /obj/machinery/door/firedoor/interact(mob/user)