Merge pull request #37593 from optimumtact/revertarmshit
Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
This commit is contained in:
committed by
CitadelStationBot
parent
7205a15ef7
commit
a3ca01f158
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user