From 9465eb5130ecc8dbe647a33a70ac6567f3eb902a Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Mon, 30 Apr 2018 22:02:50 +0000
Subject: [PATCH] Revert "fixes a pacifism kill through crushing firelocks!
 (#37511)"

This reverts commit 41eb3276fba4d740bcc244971f5720cda70f26ab.
---
 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 ace99a5385f..1635b448f4d 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)