Berry Redelightful (#12990)

code/game/machinery/vending_types.dm

@@ -727,8 +727,10 @@
 		/obj/item/seeds/appleseed = 3,
 		/obj/item/seeds/bananaseed = 3,
 		/obj/item/seeds/berryseed = 3,
+		/obj/item/seeds/blackraspberryseed = 3,
 		/obj/item/seeds/blizzard = 3,
 		/obj/item/seeds/blueberryseed = 3,
+		/obj/item/seeds/blueraspberryseed = 3,
 		/obj/item/seeds/cabbageseed = 3,
 		/obj/item/seeds/carrotseed = 3,
 		/obj/item/seeds/chantermycelium = 3,
@@ -763,11 +765,14 @@
 		/obj/item/seeds/pumpkinseed = 3,
 		/obj/item/seeds/qlortseed = 3,
 		/obj/item/seeds/clam/rasval = 3,
+		/obj/item/seeds/raspberryseed = 3,
 		/obj/item/seeds/replicapod = 3,
 		/obj/item/seeds/reishimycelium = 3,
 		/obj/item/seeds/riceseed = 3,
+		/obj/item/seeds/richcoffeeseed = 3,
 		/obj/item/seeds/shandseed = 3,
 		/obj/item/seeds/soyaseed = 3,
+		/obj/item/seeds/strawberryseed = 3,
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
 		/obj/item/seeds/sugartree = 2,
@@ -797,8 +802,10 @@
 		/obj/item/seeds/appleseed = 50,
 		/obj/item/seeds/bananaseed = 60,
 		/obj/item/seeds/berryseed = 40,
+		/obj/item/seeds/blackraspberryseed = 40,
 		/obj/item/seeds/blizzard = 60,
 		/obj/item/seeds/blueberryseed = 30,
+		/obj/item/seeds/blueraspberryseed = 40,
 		/obj/item/seeds/cabbageseed = 40,
 		/obj/item/seeds/carrotseed = 20,
 		/obj/item/seeds/chantermycelium = 20,
@@ -833,11 +840,14 @@
 		/obj/item/seeds/pumpkinseed = 40,
 		/obj/item/seeds/qlortseed = 70,
 		/obj/item/seeds/clam/rasval = 100,
+		/obj/item/seeds/raspberryseed = 40,
 		/obj/item/seeds/reishimycelium = 30,
 		/obj/item/seeds/replicapod = 200,
 		/obj/item/seeds/riceseed = 20,
+		/obj/item/seeds/richcoffeeseed = 140,
 		/obj/item/seeds/shandseed = 60,
 		/obj/item/seeds/soyaseed = 40,
+		/obj/item/seeds/strawberryseed = 40,
 		/obj/item/seeds/sugarcaneseed = 20,
 		/obj/item/seeds/sunflowerseed = 20,
 		/obj/item/seeds/sugartree = 40,

code/modules/hydroponics/seed_datums/adhomai.dm

@@ -74,7 +74,7 @@
 	name = "nifberries"
 	seed_name = "dirt berries"
 	display_name = "dirt berries shrub"
-	chems = list(/decl/reagent/nutriment = list(0, 15), /decl/reagent/nutriment/triglyceride/oil = list(1, 5))
+	chems = list(/decl/reagent/nutriment = list(0, 15), /decl/reagent/nutriment/triglyceride/oil = list(1, 5), /decl/reagent/drink/dirtberryjuice = list(10,10))
 	kitchen_tag = "nifberries"
 
 /datum/seed/nifberries/setup_traits()

code/modules/hydroponics/seed_datums/fruits.dm

@@ -129,14 +129,10 @@
 	seed_name = "blueberry"
 	display_name = "blueberry bush"
 	mutants = list("berries","poisonberries","glowberries")
-	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/drink/berryjuice = list(10,10))
+	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/drink/blueberryjuice = list(10,10))
 
 /datum/seed/berry/blue/setup_traits()
 	..()
-	set_trait(TRAIT_MATURATION,5)
-	set_trait(TRAIT_PRODUCTION,5)
-	set_trait(TRAIT_YIELD,2)
-	set_trait(TRAIT_POTENCY,10)
 	set_trait(TRAIT_PRODUCT_COLOUR,"#1C225C")
 	set_trait(TRAIT_WATER_CONSUMPTION, 5)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.2)
@@ -149,7 +145,7 @@
 	seed_name = "glowberry"
 	display_name = "glowberry bush"
 	mutants = null
-	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/uranium = list(3,5))
+	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/uranium = list(3,5), /decl/reagent/drink/glowberryjuice = list(10,10))
 
 /datum/seed/berry/glow/setup_traits()
 	..()
@@ -188,7 +184,7 @@
 	seed_name = "death berry"
 	display_name = "death berry bush"
 	mutants = null
-	chems = list(/decl/reagent/nutriment = list(1), /decl/reagent/toxin = list(3,3), /decl/reagent/lexorin = list(1,5))
+	chems = list(/decl/reagent/nutriment = list(1), /decl/reagent/toxin = list(3,3), /decl/reagent/lexorin = list(1,5), /decl/reagent/toxin/deathberryjuice = list(10,10))
 
 /datum/seed/berry/poison/death/setup_traits()
 	..()
@@ -199,6 +195,62 @@
 
 /obj/item/seeds/deathberryseed
 	seed_type = "deathberries"
+
+/datum/seed/berry/raspberry
+	name = "raspberries"
+	seed_name = "raspberry"
+	display_name = "raspberry bush"
+	mutants = list("berries","poisonberries","glowberries")
+	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/drink/raspberryjuice = list(10,10))
+
+/datum/seed/berry/raspberry/setup_traits()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#ff0000")
+
+/obj/item/seeds/raspberryseed
+	seed_type = "raspberries"
+
+/datum/seed/berry/raspberry/blue
+	name = "blue raspberries"
+	seed_name = "blue raspberry"
+	display_name = "blue raspberry bush"
+	mutants = list("berries","poisonberries","glowberries")
+	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/drink/blueraspberryjuice = list(10,10))
+
+/datum/seed/berry/raspberry/blue/setup_traits()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#030145")
+
+/obj/item/seeds/blueraspberryseed
+	seed_type = "blue raspberries"
+
+/datum/seed/berry/raspberry/black
+	name = "blackberries"
+	seed_name = "blackberry"
+	display_name = "blackberry bush"
+	mutants = list("berries","poisonberries","glowberries")
+	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/drink/blackraspberryjuice = list(10,10))
+
+/datum/seed/berry/raspberry/black/setup_traits()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#1a063f")
+
+/obj/item/seeds/blackraspberryseed
+	seed_type = "blackberries"
+
+/datum/seed/berry/strawberry
+	name = "strawberries"
+	seed_name = "strawberry"
+	display_name = "strawberry bush"
+	mutants = list("berries","poisonberries","glowberries")
+	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/drink/strawberryjuice = list(10,10))
+
+/datum/seed/berry/strawberry/setup_traits()
+	..()
+	set_trait(TRAIT_PRODUCT_COLOUR,"#bb0202")
+
+/obj/item/seeds/strawberryseed
+	seed_type = "strawberries"
 //////////////
 //  Apples  //
 //////////////
@@ -398,4 +450,26 @@
 	set_trait(TRAIT_IDEAL_LIGHT, 6)
 
 /obj/item/seeds/coffeeseed
-	seed_type = "coffee"
+	seed_type = "coffee"
+
+/datum/seed/richcoffee
+	name = "rich coffee"
+	seed_name = "rich coffee beans"
+	display_name = "rich coffee bush"
+	chems = list(/decl/reagent/nutriment/darkcoffeegrounds = list(2,10))
+	kitchen_tag = "richcoffee"
+
+/datum/seed/richcoffee/setup_traits()
+	..()
+	set_trait(TRAIT_HARVEST_REPEAT,1)
+	set_trait(TRAIT_MATURATION,3)
+	set_trait(TRAIT_PRODUCTION,3)
+	set_trait(TRAIT_YIELD,4)
+	set_trait(TRAIT_POTENCY,2)
+	set_trait(TRAIT_PRODUCT_ICON,"bean2")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#be9109")
+	set_trait(TRAIT_PLANT_ICON,"bush2")
+	set_trait(TRAIT_IDEAL_LIGHT, 6)
+
+/obj/item/seeds/richcoffeeseed
+	seed_type = "richcoffee"

code/modules/hydroponics/seed_datums/jargon.dm

@@ -119,7 +119,7 @@
 	seed_name = "ylpha berry"
 	display_name = "ylpha berry bush"
 	mutants = null
-	chems = list(/decl/reagent/nutriment = list(3, 5))
+	chems = list(/decl/reagent/nutriment = list(3, 5), /decl/reagent/drink/ylphaberryjuice = list(10,10))
 	kitchen_tag = "ylpha"
 
 /datum/seed/ylpha/setup_traits()

code/modules/hydroponics/seed_storage.dm

@@ -44,8 +44,10 @@
 		/obj/item/seeds/appleseed = 3,
 		/obj/item/seeds/bananaseed = 3,
 		/obj/item/seeds/berryseed = 3,
+		/obj/item/seeds/blackraspberryseed = 3,
 		/obj/item/seeds/blizzard = 3,
 		/obj/item/seeds/blueberryseed = 3,
+		/obj/item/seeds/blueraspberryseed = 3,
 		/obj/item/seeds/cabbageseed = 3,
 		/obj/item/seeds/carrotseed = 3,
 		/obj/item/seeds/chantermycelium = 3,
@@ -77,12 +79,15 @@
 		/obj/item/seeds/potatoseed = 3,
 		/obj/item/seeds/pumpkinseed = 3,
 		/obj/item/seeds/qlortseed = 2,
+		/obj/item/seeds/raspberryseed = 3,
 		/obj/item/seeds/reishimycelium = 2,
 		/obj/item/seeds/replicapod = 3,
 		/obj/item/seeds/riceseed = 3,
+		/obj/item/seeds/richcoffeeseed = 3,
 		/obj/item/seeds/seaweed = 3,
 		/obj/item/seeds/shandseed = 2,
 		/obj/item/seeds/soyaseed = 3,
+		/obj/item/seeds/strawberryseed = 3,
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sugartree = 2,
 		/obj/item/seeds/sunflowerseed = 3,
@@ -111,8 +116,10 @@
 		/obj/item/seeds/amanitamycelium = 2,
 		/obj/item/seeds/bananaseed = 3,
 		/obj/item/seeds/berryseed = 3,
+		/obj/item/seeds/blackraspberryseed = 3,
 		/obj/item/seeds/blizzard = 3,
 		/obj/item/seeds/blueberryseed = 3,
+		/obj/item/seeds/blueraspberryseed = 3,
 		/obj/item/seeds/cabbageseed = 3,
 		/obj/item/seeds/carrotseed = 3,
 		/obj/item/seeds/chantermycelium = 3,
@@ -145,9 +152,12 @@
 		/obj/item/seeds/poppyseed = 3,
 		/obj/item/seeds/potatoseed = 3,
 		/obj/item/seeds/pumpkinseed = 3,
+		/obj/item/seeds/raspberryseed = 3,
 		/obj/item/seeds/reishimycelium = 2,
 		/obj/item/seeds/riceseed = 3,
+		/obj/item/seeds/richcoffeeseed = 3,
 		/obj/item/seeds/soyaseed = 3,
+		/obj/item/seeds/strawberryseed = 3,
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
 		/obj/item/seeds/sugartree = 2,

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -405,6 +405,32 @@
 		M.make_jittery(5)
 		//copied from coffee
 
+/decl/reagent/nutriment/darkcoffeegrounds
+	name = "Rich Coffee Grounds"
+	description = "Enjoy the great taste of espresso."
+	reagent_state = SOLID
+	nutriment_factor = 1
+	color = "#5c4a11"
+	taste_description = "earthy gritty coffee"
+	taste_mult = 0.4
+	condiment_name = "rich ground coffee"
+	condiment_icon_state = "coffee"
+	condiment_center_of_mass = list("x"=16, "y"=8)
+
+/decl/reagent/nutriment/darkcoffeegrounds/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
+	..()
+	if(alien != IS_DIONA)
+		M.dizziness = max(0, M.dizziness - 5)
+		M.drowsiness = max(0, M.drowsiness - 3)
+		M.sleeping = max(0, M.sleeping - 2)
+		M.intoxication = max(0, (M.intoxication - (removed*0.25)))
+		//copied from coffee
+
+/decl/reagent/nutriment/darkcoffeegrounds/overdose(var/mob/living/carbon/M, var/alien, var/datum/reagents/holder)
+	if(alien != IS_DIONA)
+		M.make_jittery(5)
+		//copied from coffee
+
 /decl/reagent/nutriment/teagrounds
 	name = "Tea Grounds"
 	description = "Enjoy the great taste of tea."
@@ -852,7 +878,6 @@
 	description = "The raw essence of a banana."
 	color = "#C3AF00"
 	taste_description = "banana"
-
 	glass_icon_state = "banana"
 	glass_name = "glass of banana juice"
 	glass_desc = "The raw essence of a banana. HONK!"
@@ -862,17 +887,107 @@
 	description = "A delicious blend of several different kinds of berries."
 	color = "#990066"
 	taste_description = "berries"
-
 	glass_icon_state = "berryjuice"
 	glass_name = "glass of berry juice"
 	glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
 
+/decl/reagent/drink/dirtberryjuice
+	name = "Dirt Berry Juice"
+	description = "A delicious blend of several dirt berries."
+	color = "#C4AE7A"
+	taste_description = "dirt berries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of dirt berry juice"
+	glass_desc = "Dirt Berry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/drink/glowberryjuice
+	name = "Glow Berry Juice"
+	description = "A delicious blend of several glow berries."
+	color = "#c9fa16"
+	taste_description = "glow berries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of glow berry juice"
+	glass_desc = "Glowberry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/drink/strawberryjuice
+	name = "Strawberry Juice"
+	description = "A delicious blend of several strawberries."
+	color = "#bb0202"
+	taste_description = "strawberries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of strawberry juice"
+	glass_desc = "Strawberry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/drink/blueberryjuice
+	name = "Blueberry Juice"
+	description = "A delicious blend of several blueberries."
+	color = "#1C225C"
+	taste_description = "blueberries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of blueberry juice"
+	glass_desc = "Blueberry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/drink/raspberryjuice
+	name = "Raspberry Juice"
+	description = "A delicious blend of several raspberries."
+	color = "#ff0000"
+	taste_description = "raspberries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of raspberry juice"
+	glass_desc = "Raspberry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/drink/blueraspberryjuice
+	name = "Blue Raspberry Juice"
+	description = "A delicious blend of several dark raspberries."
+	color = "#030145"
+	taste_description = "blue raspberries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of blue raspberry juice"
+	glass_desc = "Blue Raspberry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/drink/blackraspberryjuice
+	name = "Black Raspberry Juice"
+	description = "A delicious blend of several black raspberries."
+	color = "#1a063f"
+	taste_description = "black raspberries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of black raspberry juice"
+	glass_desc = "Black Raspberry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/toxin/poisonberryjuice // It has more in common with toxins than drinks... but it's a juice
+	name = "Poison Berry Juice"
+	description = "A tasty juice blended from various kinds of very deadly and toxic berries."
+	color = "#863353"
+	strength = 5
+	taste_description = "berries"
+	glass_icon_state = "poisonberryjuice"
+	glass_name = "glass of berry juice"
+	glass_desc = "Berry juice. Or maybe it's jam. Who cares?."
+
+/decl/reagent/toxin/deathberryjuice
+	name = "Death Berry Juice"
+	description = "A delicious blend of several toxic death berries."
+	color = "#7A5454"
+	strength = 10
+	taste_description = "death and decay"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of berry juice?"
+	glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
+
+/decl/reagent/drink/ylphaberryjuice
+	name = "Ylpha Berry Juice"
+	description = "A delicious blend of several ylpha berries."
+	color = "#d46423"
+	taste_description = "ylpha berries"
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of ylpha berry juice"
+	glass_desc = "Ylpha berry juice. Or maybe it's jam. Who cares?"
+
 /decl/reagent/drink/carrotjuice
 	name = "Carrot juice"
 	description = "It is just like a carrot but without crunching."
 	color = "#FF8C00" // rgb: 255, 140, 0
 	taste_description = "carrots"
-
 	glass_icon_state = "carrotjuice"
 	glass_name = "glass of carrot juice"
 	glass_desc = "It is just like a carrot but without crunching."
@@ -888,7 +1003,6 @@
 	description = "It's grrrrrape!"
 	color = "#660099"
 	taste_description = "grapes"
-
 	glass_icon_state = "grapejuice"
 	glass_name = "glass of grape juice"
 	glass_desc = "It's grrrrrape!"
@@ -939,17 +1053,6 @@
 		return
 	M.adjustOxyLoss(-2 * removed)
 
-/decl/reagent/toxin/poisonberryjuice // It has more in common with toxins than drinks... but it's a juice
-	name = "Poison Berry Juice"
-	description = "A tasty juice blended from various kinds of very deadly and toxic berries."
-	color = "#863353"
-	strength = 5
-	taste_description = "berries"
-
-	glass_icon_state = "poisonberryjuice"
-	glass_name = "glass of poison berry juice"
-	glass_desc = "A glass of deadly juice."
-
 /decl/reagent/drink/potatojuice
 	name = "Potato Juice"
 	description = "Juice of the potato. Bleh."
@@ -4797,7 +4900,6 @@
 	description = "Thick chocolate syrup used to flavor drinks."
 	taste_description = "chocolate"
 	color = "#542a0c"
-
 	glass_name = "chocolate syrup"
 	glass_desc = "Thick chocolate syrup used to flavor drinks."
 
@@ -4806,7 +4908,6 @@
 	description = "Thick caramel syrup used to flavor drinks."
 	taste_description = "caramel"
 	color = "#85461e"
-
 	glass_name = "caramel syrup"
 	glass_desc = "Thick caramel syrup used to flavor drinks."
 
@@ -4815,7 +4916,6 @@
 	description = "Thick vanilla syrup used to flavor drinks."
 	taste_description = "vanilla"
 	color = "#f3e5ab"
-
 	glass_name = "vanilla syrup"
 	glass_desc = "Thick vanilla syrup used to flavor drinks."
 
@@ -4824,9 +4924,97 @@
 	description = "Thick spiced pumpkin syrup used to flavor drinks."
 	taste_description = "spiced pumpkin"
 	color = "#d88b4c"
-
 	glass_name = "pumpkin spice syrup"
 	glass_desc = "Thick spiced pumpkin syrup used to flavor drinks."
+//berry
+/decl/reagent/drink/syrup_berry
+	name = "Berry Syrup"
+	description = "Thick berry syrup used to flavor drinks."
+	taste_description = "berry"
+	color = "#f3e5ab"
+	glass_name = "berry syrup"
+	glass_desc = "Thick berry syrup used to flavor drinks."
+//strawberry
+/decl/reagent/drink/syrup_strawberry
+	name = "Strawberry Syrup"
+	description = "Thick strawberry syrup used to flavor drinks."
+	taste_description = "strawberry"
+	color = "#f3e5ab"
+	glass_name = "strawberry syrup"
+	glass_desc = "Thick strawberry syrup used to flavor drinks."
+//blueberry
+/decl/reagent/drink/syrup_blueberry
+	name = "Blueberry Syrup"
+	description = "Thick blueberry syrup used to flavor drinks."
+	taste_description = "blueberry"
+	color = "#f3e5ab"
+	glass_name = "blueberry syrup"
+	glass_desc = "Thick blueberry syrup used to flavor drinks."
+//rasp
+/decl/reagent/drink/syrup_raspberry
+	name = "Raspberry Syrup"
+	description = "Thick raspberry syrup used to flavor drinks."
+	taste_description = "raspberry"
+	color = "#f3e5ab"
+	glass_name = "raspberry syrup"
+	glass_desc = "Thick raspberry syrup used to flavor drinks."
+//black rasp
+/decl/reagent/drink/syrup_blackraspberry
+	name = "Black Raspberry Syrup"
+	description = "Thick black raspberry syrup used to flavor drinks."
+	taste_description = "black raspberry"
+	color = "#f3e5ab"
+	glass_name = "black raspberry syrup"
+	glass_desc = "Thick black raspberry syrup used to flavor drinks."
+//blue rasp
+/decl/reagent/drink/syrup_blueraspberry
+	name = "Blue Raspberry Syrup"
+	description = "Thick blue raspberry syrup used to flavor drinks."
+	taste_description = "blue raspberry"
+	color = "#f3e5ab"
+	glass_name = "blue raspberry syrup"
+	glass_desc = "Thick blue raspberry syrup used to flavor drinks."
+//glow
+/decl/reagent/drink/syrup_glowberry
+	name = "Glowberry Syrup"
+	description = "Thick glowberry syrup used to flavor drinks."
+	taste_description = "glowberry"
+	color = "#f3e5ab"
+	glass_name = "glowberry syrup"
+	glass_desc = "Thick glowberry syrup used to flavor drinks."
+//poison
+/decl/reagent/drink/syrup_poisonberry
+	name = "Poison Berry Syrup"
+	description = "Thick poison berry syrup used to flavor drinks."
+	taste_description = "something sweet"
+	color = "#f3e5ab"
+	glass_name = "poison berry syrup"
+	glass_desc = "Thick poison berry syrup used to flavor drinks."
+//death
+/decl/reagent/drink/syrup_deathberry
+	name = "Death Berry Syrup"
+	description = "Thick death berry syrup used to flavor drinks."
+	taste_description = "something sweet"
+	color = "#f3e5ab"
+	glass_name = "death berry syrup"
+	glass_desc = "Thick death berry syrup used to flavor drinks."
+//ylpha
+/decl/reagent/drink/syrup_ylphaberry
+	name = "Ylpha Berry Syrup"
+	description = "Thick ylpha berry syrup used to flavor drinks."
+	taste_description = "ylpha berry"
+	color = "#f3e5ab"
+	glass_name = "ylpha berry syrup"
+	glass_desc = "Thick ylpha berry syrup used to flavor drinks."
+//dirt
+/decl/reagent/drink/syrup_dirtberry
+	name = "Dirt Berry Syrup"
+	description = "Thick dirt berry syrup used to flavor drinks."
+	taste_description = "dirt berry"
+	color = "#f3e5ab"
+	glass_name = "dirt berry syrup"
+	glass_desc = "Thick dirt berry syrup used to flavor drinks."
+
 
 /decl/reagent/drink/syrup_simple
 	name = "Simple Syrup"

code/modules/reagents/Chemistry-Recipes.dm

@@ -3427,17 +3427,17 @@
 //Coffee expansion
 //=======================
 /datum/chemical_reaction/drink/coffee
-	name = "Latte"
+	name = "Coffee"
-	id = "latte"
+	id = "coffee"
 	result = /decl/reagent/drink/coffee
-	required_reagents = list(/decl/reagent/drink/coffee/espresso = 5, /decl/reagent/water = 5)
+	required_reagents = list(/decl/reagent/nutriment/coffeegrounds = 1, /decl/reagent/water = 5)
 	result_amount = 10
 
 /datum/chemical_reaction/drink/espresso
-	name = "Latte"
+	name = "Espresso"
-	id = "latte"
+	id = "espresso"
 	result = /decl/reagent/drink/coffee/espresso
-	required_reagents = list(/decl/reagent/nutriment/coffeegrounds = 1, /decl/reagent/water = 5)
+	required_reagents = list(/decl/reagent/nutriment/darkcoffeegrounds = 1, /decl/reagent/water = 5)
 	result_amount = 5
 
 /datum/chemical_reaction/caramelisation
@@ -3506,6 +3506,85 @@
 	required_reagents = list(/decl/reagent/nutriment/mint = 2, /decl/reagent/drink/syrup_simple = 3)
 	result_amount = 5
 
+//
+/datum/chemical_reaction/berrysyrup
+	name = "Berry Syrup"
+	id = "berrysyrup"
+	result = /decl/reagent/drink/syrup_berry
+	required_reagents = list(/decl/reagent/drink/berryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/strawberrysyrup
+	name = "Strawberry Syrup"
+	id = "strawberrysyrup"
+	result = /decl/reagent/drink/syrup_strawberry
+	required_reagents = list(/decl/reagent/drink/strawberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/blueberrysyrup
+	name = "Blueberry Syrup"
+	id = "blueberrysyrup"
+	result = /decl/reagent/drink/syrup_blueberry
+	required_reagents = list(/decl/reagent/drink/blueberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/raspberrysyrup
+	name = "Raspberry Syrup"
+	id = "raspberrysyrup"
+	result = /decl/reagent/drink/syrup_raspberry
+	required_reagents = list(/decl/reagent/drink/raspberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/blueraspberrysyrup
+	name = "Blue Raspberry Syrup"
+	id = "blueraspberrysyrup"
+	result = /decl/reagent/drink/syrup_blueraspberry
+	required_reagents = list(/decl/reagent/drink/blueraspberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/blackraspberrysyrup
+	name = "Black Raspberry Syrup"
+	id = "blackraspberrysyrup"
+	result = /decl/reagent/drink/syrup_blackraspberry
+	required_reagents = list(/decl/reagent/drink/blackraspberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/poisonberrysyrup
+	name = "Poison Berry Syrup"
+	id = "poisonberrysyrup"
+	result = /decl/reagent/drink/syrup_poisonberry
+	required_reagents = list(/decl/reagent/toxin/poisonberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/deathberrysyrup
+	name = "Death Berry Syrup"
+	id = "deathberrysyrup"
+	result = /decl/reagent/drink/syrup_deathberry
+	required_reagents = list(/decl/reagent/toxin/deathberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/glowberrysyrup
+	name = "Glowberry Syrup"
+	id = "glowberrysyrup"
+	result = /decl/reagent/drink/syrup_glowberry
+	required_reagents = list(/decl/reagent/drink/glowberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/ylphaberrysyrup
+	name = "Ylpha Berry Syrup"
+	id = "ylphaberrysyrup"
+	result = /decl/reagent/drink/syrup_ylphaberry
+	required_reagents = list(/decl/reagent/drink/ylphaberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+/datum/chemical_reaction/dirtberrysyrup
+	name = "Dirt Berry Syrup"
+	id = "dirtberrysyrup"
+	result = /decl/reagent/drink/syrup_dirtberry
+	required_reagents = list(/decl/reagent/drink/dirtberryjuice = 2, /decl/reagent/drink/syrup_simple = 3)
+	result_amount = 5
+
+//
 /datum/chemical_reaction/drink/cuba_libre
 	name = "Cuba Libre"
 	id = "cubalibre"
@@ -3696,7 +3775,7 @@
 	result = /decl/reagent/alcohol/butanol/pulque
 	required_reagents = list(/decl/reagent/alcohol/pulque = 1, /decl/reagent/alcohol/butanol/xuizijuice = 1)
 	result_amount = 2
-	
+
 /datum/chemical_reaction/drink/ichor
 	name = "xsain ichor"
 	id = "ichor"

html/changelogs/xxxxyobdab-12990.yml

@@ -0,0 +1,50 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: xxxxyobdab
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscdel: "Removed recipe: Espresso + Water = coffee. Reason: Americano already uses this mix."
+  - rscadd: "Rich Coffee Plant to gather Rich Coffee Beans."
+  - rscadd: "Grind Rich Coffee Beans for Dark Coffee Grounds."
+  - rscadd: "Recipe:Dark Coffee Grounds + Water = Espresso"
+  - tweak: "(Coffee Grounds + Water) From: makes Espresso. To: makes Coffee"
+  - rscadd: "Plants: Strawberry, Raspberry, Black Raspberry, Blue Raspberry"
+  - rscadd: "Strawberry, Raspberry, Black Raspberry, Blue Raspberry and Rich Coffee Seeds added to vending machines."
+  - rscadd: "Produce: Strawberries, Raspberries, Black Raspberries, Blue Raspberries"
+  - rscadd: "Specific juices for: Glowberry, Deathberry, Dirtberry, Ylphaberry, Blueberry, Strawberry, Raspberry, Blue raspberry, Black raspberry"
+  - rscadd: "Syrup(3u simple syrup + 2u of listed juice) recipes for: Berry, Strawberry, Blueberry, Poisonberry, Deathberry, Glowberry, Dirtberry, Ylphaberry, Raspberry, Black Raspberry, Blue Raspberry"