This commit is contained in:
Zuhayr
2014-05-12 03:10:37 -04:00
committed by ZomgPonies
parent dbdc032e49
commit fbbb3b50ce
2 changed files with 11 additions and 0 deletions
+6
View File
@@ -121,7 +121,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
+5
View File
@@ -18,6 +18,11 @@
// var/icon/silicateIcon = null // the silicated icon
/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)