Merge pull request #8346 from PsiOmegaDelta/Fuel

Fixes #8343
This commit is contained in:
Chinsky
2015-03-03 23:55:06 +03:00

View File

@@ -12,15 +12,20 @@ obj/effect/decal/cleanable/liquid_fuel
log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])") log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])")
src.amount = amt src.amount = amt
var/has_spread = 0
//Be absorbed by any other liquid fuel in the tile. //Be absorbed by any other liquid fuel in the tile.
for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc) for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
if(other != src) if(other != src)
other.amount += src.amount other.amount += src.amount
spawn other.Spread() other.Spread()
del src has_spread = 1
break
Spread()
. = ..() . = ..()
if(!has_spread)
Spread()
else
del(src)
proc/Spread() proc/Spread()
//Allows liquid fuels to sometimes flow into other tiles. //Allows liquid fuels to sometimes flow into other tiles.