Merge pull request #6663 from VOREStation/upstream-merge-6717

[MIRROR] Fixes Mint Apple Sparkle having a recipe, but no drink
This commit is contained in:
Novacat
2020-02-24 20:23:32 -05:00
committed by GitHub
3 changed files with 15 additions and 0 deletions
@@ -647,6 +647,10 @@ Drinks Data
glass_icon_state = "appleade"
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/drink/mintapplesparkle
glass_icon_state = "mintapplesparkle"
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/drink/soda/pineappleade
glass_icon_state = "pineappleade"
glass_center_of_mass = list("x"=16, "y"=8)
@@ -1823,6 +1823,17 @@
glass_desc = "A fruity punch!"
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/mintapplesparkle
name = "Mint Apple Sparkle"
id = "mintapplesparkle"
description = "Delicious appleade with a touch of mint."
taste_description = "minty apples"
color = "#FDDA98"
glass_name = "mint apple sparkle"
glass_desc = "Delicious appleade with a touch of mint."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/berrycordial
name = "Berry Cordial"
id = "berrycordial"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 89 KiB