From a3ca01f158e5fe0d4297665fafd83802a65e04a4 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 30 Apr 2018 22:20:52 -0400
Subject: [PATCH] Merge pull request #37593 from optimumtact/revertarmshit

Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
---
 code/game/machinery/doors/firedoor.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index ace99a5385..1635b448f4 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -142,14 +142,6 @@
 	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)