Fixed Several Foods, Strawberry Juice
Add Strawberry Juice Port Salami https://github.com/tgstation/tgstation/pull/48817 https://github.com/tgstation/tgstation/pull/49228 Ports some TG Drinks https://github.com/tgstation/tgstation/pull/48783 Made lizards like: Egg Wrap Tweaked Soda Dispenser Moved Egg Wraps Tweaked Strawberry Tea and Strawberry Milk recipies.
This commit is contained in:
@@ -486,6 +486,7 @@
|
||||
/datum/reagent/consumable/pwr_game,
|
||||
/datum/reagent/consumable/shamblers,
|
||||
/datum/reagent/consumable/sugar,
|
||||
/datum/reagent/consumable/pineapplejuice,
|
||||
/datum/reagent/consumable/orangejuice,
|
||||
/datum/reagent/consumable/grenadine,
|
||||
/datum/reagent/consumable/limejuice,
|
||||
@@ -494,15 +495,22 @@
|
||||
/datum/reagent/consumable/menthol
|
||||
)
|
||||
upgrade_reagents = list(
|
||||
/datum/reagent/drug/mushroomhallucinogen,
|
||||
/datum/reagent/consumable/nothing,
|
||||
/datum/reagent/medicine/cryoxadone
|
||||
/datum/reagent/consumable/banana,
|
||||
/datum/reagent/consumable/berryjuice,
|
||||
/datum/reagent/consumable/strawberryjuice
|
||||
)
|
||||
upgrade_reagents2 = list(
|
||||
/datum/reagent/consumable/banana,
|
||||
/datum/reagent/consumable/berryjuice
|
||||
/datum/reagent/consumable/applejuice,
|
||||
/datum/reagent/consumable/carrotjuice,
|
||||
/datum/reagent/consumable/pumpkinjuice,
|
||||
/datum/reagent/consumable/watermelonjuice
|
||||
)
|
||||
upgrade_reagents3 = list(
|
||||
/datum/reagent/drug/mushroomhallucinogen,
|
||||
/datum/reagent/consumable/nothing,
|
||||
/datum/reagent/medicine/cryoxadone,
|
||||
/datum/reagent/consumable/peachjuice
|
||||
)
|
||||
upgrade_reagents3 = null
|
||||
emagged_reagents = list(
|
||||
/datum/reagent/consumable/ethanol/thirteenloko,
|
||||
/datum/reagent/consumable/ethanol/changelingsting,
|
||||
@@ -551,6 +559,7 @@
|
||||
/datum/reagent/consumable/ethanol/hcider,
|
||||
/datum/reagent/consumable/ethanol/creme_de_menthe,
|
||||
/datum/reagent/consumable/ethanol/creme_de_cacao,
|
||||
/datum/reagent/consumable/ethanol/creme_de_coconut,
|
||||
/datum/reagent/consumable/ethanol/triple_sec,
|
||||
/datum/reagent/consumable/ethanol/sake,
|
||||
/datum/reagent/consumable/ethanol/applejack
|
||||
|
||||
@@ -958,14 +958,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
|
||||
|
||||
/datum/reagent/consumable/ethanol/bahama_mama
|
||||
name = "Bahama Mama"
|
||||
description = "Tropical cocktail."
|
||||
description = "A tropical cocktail with a complex blend of flavors."
|
||||
color = "#FF7F3B" // rgb: 255, 127, 59
|
||||
boozepwr = 35
|
||||
quality = DRINK_GOOD
|
||||
taste_description = "lime and orange"
|
||||
taste_description = "pineapple, coconut, and a hint of coffee"
|
||||
glass_icon_state = "bahama_mama"
|
||||
glass_name = "Bahama Mama"
|
||||
glass_desc = "Tropical cocktail."
|
||||
glass_desc = "A tropical cocktail with a complex blend of flavors."
|
||||
value = 2
|
||||
|
||||
/datum/reagent/consumable/ethanol/singulo
|
||||
@@ -1563,6 +1563,16 @@ All effects don't start immediately, but rather get worse over time; the rate is
|
||||
glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
|
||||
value = 1
|
||||
|
||||
/datum/reagent/consumable/ethanol/creme_de_coconut
|
||||
name = "Creme de Coconut"
|
||||
description = "A coconut liqueur for smooth, creamy, tropical drinks."
|
||||
color = "#F7F0D0"
|
||||
boozepwr = 20
|
||||
taste_description = "a sweet milky flavor with notes of toasted sugar"
|
||||
glass_icon_state = "glass_white"
|
||||
glass_name = "Creme de Coconut"
|
||||
glass_desc = "An unintimidating glass of coconut liqueur."
|
||||
|
||||
/datum/reagent/consumable/ethanol/quadruple_sec
|
||||
name = "Quadruple Sec"
|
||||
description = "Kicks just as hard as licking the powercell on a baton, but tastier."
|
||||
@@ -1604,6 +1614,28 @@ All effects don't start immediately, but rather get worse over time; the rate is
|
||||
. = 1
|
||||
return ..()
|
||||
|
||||
/datum/reagent/consumable/ethanol/painkiller
|
||||
name = "Painkiller"
|
||||
description = "Dulls your pain. Your emotional pain, that is."
|
||||
boozepwr = 20
|
||||
color = "#EAD677"
|
||||
quality = DRINK_NICE
|
||||
taste_description = "sugary tartness"
|
||||
glass_icon_state = "painkiller"
|
||||
glass_name = "Painkiller"
|
||||
glass_desc = "A combination of tropical juices and rum. Surely this will make you feel better."
|
||||
|
||||
/datum/reagent/consumable/ethanol/pina_colada
|
||||
name = "Pina Colada"
|
||||
description = "A fresh pineapple drink with coconut rum. Yum."
|
||||
boozepwr = 40
|
||||
color = "#FFF1B2"
|
||||
quality = DRINK_FANTASTIC
|
||||
taste_description = "pineapple, coconut, and a hint of the ocean"
|
||||
glass_icon_state = "pina_colada"
|
||||
glass_name = "Pina Colada"
|
||||
glass_desc = "If you like pina coladas, and getting caught in the rain... well, you'll like this drink."
|
||||
|
||||
/datum/reagent/consumable/ethanol/grasshopper
|
||||
name = "Grasshopper"
|
||||
description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this."
|
||||
|
||||
@@ -136,6 +136,12 @@
|
||||
. = 1
|
||||
..()
|
||||
|
||||
/datum/reagent/consumable/strawberryjuice
|
||||
name = "Strawberry Juice"
|
||||
description = "No, you're not getting dosed."
|
||||
color = "#E50D31"
|
||||
taste_description = "strawberry"
|
||||
|
||||
/datum/reagent/consumable/nothing
|
||||
name = "Nothing"
|
||||
description = "Absolutely nothing."
|
||||
@@ -812,6 +818,14 @@
|
||||
taste_description = "peaches"
|
||||
glass_name = "glass of peach juice"
|
||||
|
||||
/datum/reagent/consumable/pineapplejuice
|
||||
name = "Pineapple Juice"
|
||||
description = "Tart, tropical, and hotly debated."
|
||||
color = "#F7D435"
|
||||
taste_description = "pineapple"
|
||||
glass_name = "glass of pineapple juice"
|
||||
glass_desc = "Tart, tropical, and hotly debated."
|
||||
|
||||
/datum/reagent/consumable/cream_soda
|
||||
name = "Cream Soda"
|
||||
description = "A classic space-American vanilla flavored soft drink."
|
||||
|
||||
Reference in New Issue
Block a user