cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7687 from Tramziller/Girder_fix

Browse Source 
Fixes bug where girders can be destroyed with stun beams.
This commit is contained in:
PsiOmegaDelta
2015-01-04 23:50:36 +01:00
parent 5a2b6a51fa fb86581159
commit d1d88fa365
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,10 @@
bullet_act(var/obj/item/projectile/Proj)
//Tasers and the like should not damage girders.
if(Proj.damage_type == HALLOSS || Proj.damage_type == TOX || Proj.damage_type == CLONE)
return
if(istype(Proj, /obj/item/projectile/beam))
health -= Proj.damage
..()
@@ -245,6 +249,7 @@
del(src)
bullet_act(var/obj/item/projectile/Proj) //No beam check- How else will you destroy the cult girder with silver bullets?????
health -= Proj.damage
..()
if(health <= 0)