Merge remote-tracking branch 'upstream/master' into kk-misc3

This commit is contained in:
Killian
2021-02-08 19:27:24 +00:00
59 changed files with 2656 additions and 1409 deletions
@@ -433,7 +433,7 @@
color = "#c07c40"
/datum/reagent/nutriment/soysauce
name = "Soysauce"
name = "Soy Sauce"
id = "soysauce"
description = "A salty sauce made from the soy plant."
taste_description = "umami"
@@ -451,6 +451,15 @@
nutriment_factor = 5
color = "#731008"
/datum/reagent/nutriment/barbecue
name = "Barbeque Sauce"
id = "barbecue"
description = "Barbecue sauce for barbecues and long shifts."
taste_description = "barbeque"
reagent_state = LIQUID
nutriment_factor = 5
color = "#4F330F"
/datum/reagent/nutriment/rice
name = "Rice"
id = "rice"
@@ -1505,13 +1514,13 @@
/datum/reagent/drink/soda/pineappleade
name = "Pineappleade"
id = "pineappleade"
description = "Spineapple, juiced up."
description = "Pineapple, juiced up."
taste_description = "sweet`n`sour pineapples"
color = "#FFFF00"
adj_temp = -5
glass_name = "pineappleade"
glass_desc = "Spineapple, juiced up."
glass_desc = "Pineapple, juiced up."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/kiraspecial
@@ -1292,6 +1292,13 @@
required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
result_amount = 4
/datum/chemical_reaction/food/barbecue
name = "Barbeque Sauce"
id = "barbecue"
result = "barbecue"
required_reagents = list("tomatojuice" = 2, "applejuice" = 1, "sugar" = 1, "spacespice" = 1)
result_amount = 4
/datum/chemical_reaction/food/peanutbutter
name = "Peanut Butter"
id = "peanutbutter"