From 4d64af69f4c7f57dfd57a5fa50cf41cd612bcd84 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 9 May 2014 21:29:44 +0930 Subject: [PATCH] Fixes #4923 --- code/game/objects/structures/grille.dm | 6 ++++++ code/game/objects/structures/window.dm | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index bfdad4e2bc..97d7657d36 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -93,7 +93,13 @@ return !density /obj/structure/grille/bullet_act(var/obj/item/projectile/Proj) + if(!Proj) return + + //Tasers and the like should not damage grilles. + if(Proj.damage_type == HALLOSS) + return + src.health -= Proj.damage*0.2 healthcheck() return 0 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 843ab7dd37..0f73a44ffb 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -18,6 +18,11 @@ /obj/structure/window/bullet_act(var/obj/item/projectile/Proj) + + //Tasers and the like should not damage windows. + if(Proj.damage_type == HALLOSS) + return + health -= Proj.damage ..() if(health <= 0)