From 48d8375cacf55850178ee648d1d9583c9d9a16a6 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Sat, 21 Oct 2017 22:26:33 -0700 Subject: [PATCH] Incendiary >= 2 projectile fixes. (#4127) * A whole load of things. * Fixes the SM Rod's travel distance. * Flame it again, Tony. Fixes flamefuel spawning on rock-wall turf. --- code/modules/projectiles/projectile.dm | 8 +++++--- code/modules/projectiles/projectile/bullets.dm | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index a08db6cd9d2..fdc5a445b98 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -333,9 +333,11 @@ else if(!bumped) tracer_effect(effect_transform) - if(incendiary >= 2 && !istype(src.loc, /turf/simulated/wall)) - var/trail_volume = (flammability * 0.20) - new /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(src.loc, trail_volume, src.dir) + if(incendiary >= 2) //This should cover the bases of 'Why is there fuel here?' in a much cleaner way than previous. + if(src && src.loc) //Safety. + if(!src.loc.density) + var/trail_volume = (flammability * 0.20) + new /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(src.loc, trail_volume, src.dir) if(!hitscan) sleep(step_delay) //add delay between movement iterations if it's not a hitscan weapon diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 5b95ee66397..283e487272b 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -272,6 +272,7 @@ flammability = 4 agony = 30 kill_count = 4 + vacuum_traversal = 0 /obj/item/projectile/bullet/incendiary/flamethrower/large damage = 15