Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593

[MIRROR] Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
This commit is contained in:
deathride58
2018-05-02 01:29:15 +00:00
committed by GitHub
-8
View File
@@ -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)