Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451

[MIRROR] Disablers and ions wont burn plasma statues statues
This commit is contained in:
LetterJay
2017-09-07 15:55:04 -05:00
committed by GitHub
+1 -4
View File
@@ -155,12 +155,9 @@
/obj/structure/statue/plasma/bullet_act(obj/item/projectile/Proj)
var/burn = FALSE
if(istype(Proj, /obj/item/projectile/beam))
if(!(Proj.nodamage) && Proj.damage_type == BURN)
PlasmaBurn(2500)
burn = TRUE
else if(istype(Proj, /obj/item/projectile/ion))
PlasmaBurn(500)
burn = TRUE
if(burn)
var/turf/T = get_turf(src)
if(Proj.firer)