Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598

[MIRROR] Adds grenadine.
This commit is contained in:
LetterJay
2018-05-23 22:26:44 -05:00
committed by GitHub
7 changed files with 27 additions and 6 deletions
@@ -377,6 +377,15 @@
isGlass = FALSE
list_reagents = list("menthol" = 100)
/obj/item/reagent_containers/food/drinks/bottle/grenadine
name = "Jester Grenadine"
desc = "Contains 0% real cherries!"
icon_state = "grenadine"
isGlass = TRUE
list_reagents = list("grenadine" = 100)
foodtype = FRUIT
////////////////////////// MOLOTOV ///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/molotov
name = "molotov cocktail"
@@ -141,8 +141,8 @@
/datum/chemical_reaction/tequila_sunrise
name = "Tequila Sunrise"
id = "tequilasunrise"
results = list("tequilasunrise" = 3)
required_reagents = list("tequila" = 2, "orangejuice" = 1)
results = list("tequilasunrise" = 5)
required_reagents = list("tequila" = 2, "orangejuice" = 2, "grenadine" = 1)
/datum/chemical_reaction/toxins_special
name = "Toxins Special"