This commit is contained in:
Fox-McCloud
2015-01-15 19:42:15 -05:00
parent 342200d6fc
commit baa88a7463
18 changed files with 172 additions and 64 deletions
+6 -9
View File
@@ -128,16 +128,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 == STAMINA)
if(!Proj)
return
src.health -= Proj.damage*0.2
healthcheck()
return 0
..()
if((Proj.damage_type != STAMINA)) //Grilles can't be exhausted to death
src.health -= Proj.damage*0.3
healthcheck()
return
/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(iswirecutter(W))