Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233

[MIRROR] Fixes floating bullet holes
This commit is contained in:
LetterJay
2017-10-03 12:31:59 -04:00
committed by GitHub
+1 -1
View File
@@ -156,7 +156,7 @@
/turf/closed/bullet_act(obj/item/projectile/Proj)
. = ..()
if(!Proj.nodamage && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
if((. != -1) && !Proj.nodamage && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
var/mutable_appearance/bullet_hole = mutable_appearance('icons/effects/effects.dmi', "bullet_hole", BULLET_HOLE_LAYER)
var/random_x = rand(-13, 13)