From 814dc3f8113811d0084c552883af99d96baf83f9 Mon Sep 17 00:00:00 2001 From: Armhulen Date: Sun, 29 Apr 2018 08:10:59 -0700 Subject: [PATCH] fixes a pacifism kill through crushing firelocks! (#37511) * fix! * ORANGES LOOK AWAY * thanks maintainer --- code/game/machinery/doors/firedoor.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4e20cebb12..3754d52130 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/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, "Closing [src] would hurt [L]!") + return close() /obj/machinery/door/firedoor/interact(mob/user)