cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-09 17:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #4923

Browse Source
This commit is contained in:
Zuhayr
2014-05-09 21:29:44 +09:30
parent 5426670a3d
commit 4d64af69f4
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/structures/grille.dm
View File

@@ -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

5
code/game/objects/structures/window.dm
View File

@@ -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)