Merge pull request #175 from lilBlovy/master

Strawberry Jam
ARF-SS13 · Dec 24, 2024 · 52817b5 · 52817b5
2 parents 01499c9 + e5054f4
commit 52817b5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
@@ -378,3 +378,9 @@
 /obj/item/reagent_containers/food/condiment/pack/soup
 	name = "soup bouillon pack"
 	list_reagents = list(/datum/reagent/consumable/dry_ramen = 10)
+
+/obj/item/reagent_containers/food/condiment/strawberryjam
+	name = "Strawberry Jam"
+	desc = "A jar of super heavy and dense strawberry jam"
+	icon_state = "strawberryjam"
+	list_reagents = list(/datum/reagent/consumable/strawberryjam = 50)
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -997,3 +997,9 @@
 	filling_color = "#BA55D3"
 	tastes = list("eggplant" = 3, "cheese" = 1, "veggies" = 1)
 	foodtype = VEGETABLES | DAIRY
+
+/obj/item/reagent_containers/food/snacks/strawberryjam
+	name = "Strawberry Jam"
+	desc= "A Jar of really heavy and dense strawberry jam."
+	icon_state = "strawberryjam"
+	list_reagents = list(/datum/reagent/consumable/strawberryjam = 20)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -1051,3 +1051,10 @@
 	nutriment_factor = 4 * REAGENTS_METABOLISM
 	taste_description = "fluffy sweet cream"
 	canbrew = TRUE
+
+/datum/reagent/consumable/strawberryjam
+	name = "Strawberry Jam"
+	description = "A jar of super dense and heavy strawberry jam"
+	nutriment_factor = 60 * REAGENTS_METABOLISM
+	taste_description = "very heavy strawberry"
+	color = "661F1E"
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi