CleverRaven/Cataclysm-DDA — pull request #9520 by Kodiologist (2014-10-12 01:04:30+00:00)
Title: Tweaks to caffeine in beverages.

Chocolate drink, herbal tea, and dandelion tea are now caffeine-free. The usual commercial chocolate-flavored beverages (e.g., Nesquik, Yoo-Hoo) aren't caffeinated. Teas described as "herbal teas" are generally caffeine-free. And dandelions don't contain caffeine.

Cream soda is still caffeinated, but that's mentioned in the description now.