From fb865811592f6d11ae163a316310a7a679b9d434 Mon Sep 17 00:00:00 2001 From: Tramziller Date: Sun, 4 Jan 2015 21:12:32 +0100 Subject: [PATCH] Fixes bug where girders can be destroyed with stun beams. --- code/game/objects/structures/girders.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 93f4777adb..27d4808343 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -8,6 +8,10 @@ bullet_act(var/obj/item/projectile/Proj) + //Tasers and the like should not damage girders. + if(Proj.damage_type == HALLOSS || Proj.damage_type == TOX || Proj.damage_type == CLONE) + return + if(istype(Proj, /obj/item/projectile/beam)) health -= Proj.damage ..() @@ -245,6 +249,7 @@ del(src) bullet_act(var/obj/item/projectile/Proj) //No beam check- How else will you destroy the cult girder with silver bullets????? + health -= Proj.damage ..() if(health <= 0)