Adds Grape Jelly and missing Condiment Bottles (#14499)

code/modules/hydroponics/seed_datums/fruits.dm

@@ -63,7 +63,7 @@
 	seed_name = "grape"
 	display_name = "grapevines"
 	mutants = list("greengrapes")
-	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/sugar = list(1,5), /decl/reagent/drink/grapejuice = list(10,10))
+	chems = list(/decl/reagent/nutriment = list(1,10), /decl/reagent/sugar = list(1,5), /decl/reagent/drink/grapejuice = list(10,10), /decl/reagent/nutriment/grapejelly = list(1,8))
 
 /datum/seed/grapes/setup_traits()
 	..()

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm

@@ -126,6 +126,10 @@
 	metabolism = REM * 0.5
 	taste_description = "mushroom"
 	fallback_specific_heat = 1.2
+	condiment_name = "Psilocybin"
+	condiment_desc = "A small bottle full of a pink liquid. Whatever could it do?"
+	condiment_icon_state = "psilocybin"
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 /decl/reagent/psilocybin/initial_effect(var/mob/living/carbon/human/M, var/alien, var/holder)
 	to_chat(M, SPAN_GOOD(pick("You lean back and begin to fall... and fall... and fall.", "Your eyes open wide and you look upon this new world you now see.", "You close your eyes, and when they open, everything appears so much more vibrant.", "You feel a wave of pleasure suddenly rush over you.", "This is already the best decision you've ever made.")))
@@ -352,6 +356,10 @@
 	taste_description = "sourness"
 	fallback_specific_heat = 1
 	overdose = 10
+	condiment_name = "Wulumunusha Extract Bottle"
+	condiment_desc = "A small dropper bottle full of a stoner's paradise. A warning label warns of muteness as a side effect."
+	condiment_icon_state = "wuluextract"
+
 
 /decl/reagent/wulumunusha/initial_effect(var/mob/living/carbon/human/M, var/alien, var/holder)
 	to_chat(M, SPAN_GOOD(pick("Your eyes open wide and you look upon this new world you now see.", "You close your eyes, and when they open, everything appears so much more vibrant.")))
@@ -378,6 +386,11 @@
 	taste_description = "spicy earth"
 	taste_mult = 0.4
 	fallback_specific_heat = 1.6
+	condiment_name = "Ambrosia Extract Bottle"
+	condiment_desc = "A small dropper bottle full of a stoner's paradise."
+	condiment_icon_state = "ambrosiaextract"
+	condiment_center_of_mass = list("x"=16, "y"=8)
+
 
 /decl/reagent/ambrosia_extract/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
 	var/mob/living/carbon/human/H = M

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

@@ -195,6 +195,10 @@
 	icon_cooked = "batter_cooked"
 	coated_adj = "battered"
 	taste_description = "batter"
+	condiment_name = "Batter Jar"
+	condiment_desc = "A vat of the most artery clogging frying ingredient around. Pour into beaker before attempting to coat ingredients."
+	condiment_icon_state = "batter"
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 /decl/reagent/nutriment/coating/beerbatter
 	name = "Beer Batter Mix"
@@ -250,6 +254,10 @@
 	name = "Egg Yolk"
 	color = "#FFFFAA"
 	taste_description = "egg"
+	condiment_name = "Egg Yolk Carton"
+	condiment_desc = "A carton full of Egg Yolk."
+	condiment_icon_state = "eggyolkcarton"
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 /decl/reagent/nutriment/egg/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
 	if(alien && alien == IS_UNATHI)
@@ -272,6 +280,10 @@
 	nutriment_factor = 12
 	color = "#ffdfb0"
 	taste_description = "fat"
+	condiment_name = "Triglyceride"
+	condiment_desc = "A bottle full of Triglyceride. Feel the burn."
+	condiment_icon_state = "triglyceridebottle"
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 //Unathi can digest fats too
 /decl/reagent/nutriment/triglyceride/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
@@ -315,6 +327,15 @@
 
 	return min((holder.get_temperature() - threshold)/step, 2.5)
 
+/decl/reagent/nutriment/grapejelly
+	name = "Grape Jelly"
+	description = "A jelly produced from blending grapes."
+	color = "#410083"
+	taste_description = "grapes"
+	condiment_name = "Grape Jelly"
+	condiment_desc = "A jar of jelly derived from grapes. Superior to cherry jelly."
+	condiment_icon_state = "grapejelly"
+
 /decl/reagent/nutriment/triglyceride/oil/corn
 	name = "Corn Oil"
 	description = "An oil derived from various types of corn."
@@ -374,6 +395,10 @@
 	color = "#302000"
 	taste_description = "bitterness"
 	taste_mult = 1.3
+	condiment_name = "Cocoa Powder Can"
+	condiment_icon_state = "cocoapowder"
+	condiment_desc = "A can full of chocolately powder. Try not to think of the calories."
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 /decl/reagent/nutriment/coffeegrounds
 	name = "Coffee Grounds"
@@ -4905,6 +4930,10 @@
 	description = "The gooey insides of a slain pumpkin. This day is the greatest..."
 	color = "#f9ab28"
 	taste_description = "gooey pumpkin"
+	condiment_name = "Pumpkin Pulp Jar"
+	condiment_desc = "An orange jar with a picture of a pumpkin on its label. Spooky."
+	condiment_icon_state = "pumpkinpulp"
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 /decl/reagent/spacespice/pumpkinspice
 	name = "Pumpkin Spice"
@@ -4912,6 +4941,10 @@
 	color = "#AE771C"
 	taste_description = "autumn bliss"
 	condiment_name = "bottle of pumpkin spice"
+	condiment_name = "Pumpkin Spice"
+	condiment_desc = "Every teenager's favorite seasonal ingredient."
+	condiment_icon_state = "pumpkinspice"
+	condiment_center_of_mass = list("x"=16, "y"=8)
 
 /decl/reagent/drink/syrup_chocolate
 	name = "Chocolate Syrup"

html/changelogs/Grape Jelly And Condiment Bottles.yml

@@ -0,0 +1,43 @@
+################################
+# 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: Roostercat12
+
+# 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:
+  - rscadd: "Added Grape Jelly and its respective condiment bottles. Obtainable by blending grapes."
+  - rscadd: "Added Condiment bottle sprites for: Ambrosia/Wulu Extract, Psilocybin, Pumpkin Pulp, Pumpkin Spice, Cocoa Powder, Batter, Egg Yolk, Triglyceride"
+