From 0a783651a8fc9e9604aef64e4b5a16627481f491 Mon Sep 17 00:00:00 2001 From: Atlantiscze Date: Tue, 11 Nov 2014 08:10:01 +0100 Subject: [PATCH] Second fix attempt --- code/game/machinery/doors/door.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 07353f31515..0290d49acef 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -127,6 +127,10 @@ return /obj/machinery/door/bullet_act(var/obj/item/projectile/Proj) + //Tasers and the like should not damage doors. + if(Proj.damage_type == HALLOSS) + return + if(Proj.damage) take_damage(round(Proj.damage * 4)) ..()