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

Incendiary >= 2 projectile fixes. (#4127)

Browse Source 
* A whole load of things.

* Fixes the SM Rod's travel distance.

* Flame it again, Tony. Fixes flamefuel spawning on rock-wall turf.
This commit is contained in:
Mechoid
2017-10-21 22:26:33 -07:00
committed by Anewbe
parent 6a52111680
commit 48d8375cac
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/projectile.dm
View File

@@ -333,7 +333,9 @@
else if(!bumped) else if(!bumped)
tracer_effect(effect_transform) tracer_effect(effect_transform)
if(incendiary >= 2 && !istype(src.loc, /turf/simulated/wall)) 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) var/trail_volume = (flammability * 0.20)
new /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(src.loc, trail_volume, src.dir) new /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(src.loc, trail_volume, src.dir)

1
code/modules/projectiles/projectile/bullets.dm
View File

@@ -272,6 +272,7 @@
flammability = 4 flammability = 4
agony = 30 agony = 30
kill_count = 4 kill_count = 4
vacuum_traversal = 0
/obj/item/projectile/bullet/incendiary/flamethrower/large /obj/item/projectile/bullet/incendiary/flamethrower/large
damage = 15 damage = 15