Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm

code/game/objects/effects/decals/Cleanable/fuel.dm

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