shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Several Foods, Strawberry Juice

Browse Source 
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:
Winter Flare
2020-03-22 00:19:28 -04:00
parent 444419d5fa
commit 5c3037b5d0
16 changed files with 124 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+5
View File
@@ -375,6 +375,11 @@
name = "grape juice box"
desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
foodtype = FRUIT | BREAKFAST
if(/datum/reagent/consumable/pineapplejuice)
icon_state = "pineapplebox"
name = "pineapple juice box"
desc = "Why would you even want this?"
foodtype = FRUIT | PINEAPPLE
if("chocolate_milk")
icon_state = "chocolatebox"
name = "carton of chocolate milk"
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+11
View File
@@ -429,6 +429,17 @@
list_reagents = list(/datum/reagent/consumable/limejuice = 100)
foodtype = FRUIT
/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
name = "pineapple juice"
desc = "Extremely tart, yellow juice."
icon_state = "pineapplejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = FALSE
list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100)
foodtype = FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/drinks/bottle/menthol
name = "menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
code/modules/food_and_drinks/food/snacks_frozen.dm
+1 -1
View File
@@ -197,7 +197,7 @@
name = "pineapple snowcone"
desc = "Pineapple syrup drizzled over a snowball in a paper cup."
icon_state = "pineapple_sc"
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/water = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pineapplejuice = 5)
tastes = list("ice" = 1, "water" = 1, "pineapples" = 5)
foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy
code/modules/food_and_drinks/food/snacks_meat.dm
+11
View File
@@ -149,6 +149,8 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("meat" = 1)
slices_num = 6
slice_path = /obj/item/reagent_containers/food/snacks/salami
foodtype = MEAT | BREAKFAST
var/roasted = FALSE
@@ -156,6 +158,15 @@
. = ..()
eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
/obj/item/reagent_containers/food/snacks/salami
name = "salami"
filling_color = "#CD4122"
desc = "A slice of cured salami."
icon_state = "salami"
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
tastes = list("meat" = 1, "smoke" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/kebab
trash = /obj/item/stack/rods
icon_state = "kebab"
code/modules/food_and_drinks/food/snacks_other.dm
+2 -1
View File
@@ -173,7 +173,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
filling_color = "#F0E68C"
tastes = list("egg" = 1)
foodtype = MEAT | GRAIN
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/beans
name = "tin of beans"
@@ -542,6 +542,7 @@
desc = "A sliced piece of juicy pineapple."
icon_state = "pineapple_slice"
filling_color = "#F6CB0B"
juice_results = list(/datum/reagent/consumable/pineapplejuice = 3)
tastes = list("pineapple" = 1)
foodtype = FRUIT | PINEAPPLE
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+17 -6
View File
@@ -259,10 +259,10 @@
required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/limejuice = 1)
/datum/chemical_reaction/bahama_mama
name = "Bahama mama"
name = "Bahama Mama"
id = /datum/reagent/consumable/ethanol/bahama_mama
results = list(/datum/reagent/consumable/ethanol/bahama_mama = 6)
required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/orangejuice = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1)
results = list(/datum/reagent/consumable/ethanol/bahama_mama = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/pineapplejuice = 1)
/datum/chemical_reaction/singulo
name = "Singulo"
@@ -300,6 +300,17 @@
results = list(/datum/reagent/consumable/ethanol/barefoot = 3)
required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ethanol/vermouth = 1)
/datum/chemical_reaction/painkiller
name = "Painkiller"
id = /datum/reagent/consumable/ethanol/painkiller
results = list(/datum/reagent/consumable/ethanol/painkiller = 10)
required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/pineapplejuice = 4, /datum/reagent/consumable/orangejuice = 1)
/datum/chemical_reaction/pina_colada
name = "Pina Colada"
id = /datum/reagent/consumable/ethanol/pina_colada
results = list(/datum/reagent/consumable/ethanol/pina_colada = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 3, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/limejuice = 1)
////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
@@ -729,14 +740,14 @@
/datum/chemical_reaction/pinkmilk
name = "Strawberry Milk"
id = /datum/reagent/consumable/pinkmilk
results = list(/datum/reagent/consumable/pinkmilk = 5)
required_reagents = list(/datum/reagent/drug/aphrodisiacplus = 1, /datum/reagent/consumable/milk = 1)
results = list(/datum/reagent/consumable/pinkmilk = 2)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1)
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
id = /datum/reagent/consumable/pinktea
results = list(/datum/reagent/consumable/pinktea = 5)
required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/blank_paper
name = "Blank Paper"
code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+1 -1
View File
@@ -211,7 +211,7 @@
reqs = list(
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/datum/reagent/consumable/ice = 15,
/obj/item/reagent_containers/food/snacks/pineappleslice = 2
/datum/reagent/consumable/pineapplejuice = 5
)
result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple
subcategory = CAT_ICE
code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
-9
View File
@@ -100,12 +100,3 @@
)
result = /obj/item/reagent_containers/food/snacks/cubannachos
subcategory = CAT_MEXICAN
/datum/crafting_recipe/food/wrap
name = "Wrap"
reqs = list(/datum/reagent/consumable/soysauce = 10,
/obj/item/reagent_containers/food/snacks/friedegg = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
)
result = /obj/item/reagent_containers/food/snacks/eggwrap
subcategory = CAT_MEXICAN
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+9
View File
@@ -14,6 +14,15 @@
result = /obj/item/reagent_containers/food/snacks/chawanmushi
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/wrap
name = "Egg Wrap"
reqs = list(/datum/reagent/consumable/soysauce = 10,
/obj/item/reagent_containers/food/snacks/friedegg = 1,
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
)
result = /obj/item/reagent_containers/food/snacks/eggwrap
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/khachapuri
name = "Khachapuri"
reqs = list(
code/modules/hydroponics/grown/berries.dm
+2 -1
View File
@@ -261,6 +261,7 @@
seed = /obj/item/seeds/strawberry
name = "strawberry"
icon_state = "strawberry"
filling_color = "#7FFF00"
filling_color = "#E50D31"
juice_results = list(/datum/reagent/consumable/strawberryjuice = 0)
tastes = list("strawberries" = 1)
wine_power = 20
code/modules/hydroponics/grown/pineapple.dm
+1
View File
@@ -30,5 +30,6 @@
filling_color = "#F6CB0B"
w_class = WEIGHT_CLASS_NORMAL
foodtype = FRUIT | PINEAPPLE
juice_results = list(/datum/reagent/consumable/pineapplejuice = 0)
tastes = list("pineapple" = 1)
wine_power = 40
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+15 -6
View File
@@ -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
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+35 -3
View File
@@ -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."
code/modules/reagents/chemistry/reagents/drink_reagents.dm
+14
View File
@@ -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."