This commit is contained in:
Fox-McCloud
2014-12-12 06:52:20 -05:00
parent 1a425064a5
commit e76c8f26f3
27 changed files with 110 additions and 44 deletions
+2 -2
View File
@@ -110,7 +110,7 @@
health -= M.melee_damage_upper
healthcheck()
return
/obj/structure/grille/mech_melee_attack(obj/mecha/M)
if(..())
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
@@ -132,7 +132,7 @@
if(!Proj) return
//Tasers and the like should not damage grilles.
if(Proj.damage_type == HALLOSS)
if(Proj.damage_type == STAMINA)
return
src.health -= Proj.damage*0.2