We sailed last week on the magic and found the complimentary soda a nice change from our past cruises.
They had several ice machines and about 3 separate soda stations...we never encountered any lines. Once in a while one of the ice machines would be empty but there were 3 or 4 so ice was always available.
The products were if I can remember:
coke
diet coke
sprite
diet sprite
pink leomonade
orangeade
ice tea (not sweetened)...I mixed lemonade and ice tea together
milk
coffee
tea
hot choc.
I brought one of the medium sized Dunkin Donuts plastic cups with lid and long straw that you get when ordering ice coffee at DD...it worked great onboard as I could add lots of ice and a good quantity of beverage at one time.
I did notice that the cold cups are bigger than the cups on our last cruise.
MJ