Merge pull request #4 from tgstation/master

pull from tgstation master to phil235 master
Changes Aloe cocktail recipe

Changes Aloe cocktail recipe to 1 orangejuice, 1 whiskey, 1 watermelonjuice to avoid conflict with the irish cream recipe (2 whiskey, 1 milk cream)
Fixes #2914
changes the aloe recipe to 1 irishcream + 1 watermelonjuice
Merge pull request #3222 from phil235/aloefix

Changes Aloe cocktail recipe