Merge pull request #179 from lilBlovy/Jammy-BugFix1

Jammy BugFix1
ARF-SS13 · Dec 26, 2024 · 26d5f36 · 26d5f36
2 parents 53e0482 + 3a0fe8e
commit 26d5f36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
@@ -384,15 +384,17 @@
 	desc = "A jar of super heavy and dense strawberry jam"
 	icon_state = "strawberryjam"
 	list_reagents = list(/datum/reagent/consumable/strawberryjam = 50)
+
 
 /obj/item/reagent_containers/food/condiment/raspberryjam
 	name = "Raspberry Jam"
 	desc = "A jar of sweet raspberry jam"
 	icon_state = "raspberryjam"
 	list_reagents = list(/datum/reagent/consumable/raspberryjam = 50)
-
+	
 /obj/item/reagent_containers/food/condiment/lemonjam
 	name = "Strawberry Jam"
-	desc = "A Jar of sweet lemon jam"
+	desc = "A Jar of tangy lemon jam"
 	icon_state = "lemonjam"
 	list_reagents = list(/datum/reagent/consumable/lemonjam = 50)
+
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -1003,15 +1003,18 @@
 	desc= "A Jar of really heavy and dense strawberry jam."
 	icon_state = "strawberryjam"
 	list_reagents = list(/datum/reagent/consumable/strawberryjam = 40)
+	w_class = 3
 
 /obj/item/reagent_containers/food/snacks/raspberryjam
 	name = "Raspberry Jam"
 	desc= "A Jar of sweet raspberry jam."
 	icon_state = "raspberryjam"
 	list_reagents = list(/datum/reagent/consumable/raspberryjam = 10)
+	w_class = 2
 
 /obj/item/reagent_containers/food/snacks/lemonjam
 	name = "Lemon Jam"
 	desc= "A Jar of sweet lemon jam."
 	icon_state = "lemonjam"
 	list_reagents = list(/datum/reagent/consumable/lemonjam = 10)
+	w_class = 2
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -1061,14 +1061,14 @@
 
 /datum/reagent/consumable/raspberryjam
 	name = "Raspberry Jam"
-	description = "A jar of sweet raspberry jam"
+	description = "Some very tasty sweet raspberry jam"
 	nutriment_factor = 10 * REAGENTS_METABOLISM
 	taste_description = "calming raspberry"
 	color = "#630807"
 
 /datum/reagent/consumable/lemonjam
 	name = "Lemon Jam"
-	description = "A jar of sweet lemon jam"
+	description = "Some very tangy lemon jam"
 	nutriment_factor = 10 * REAGENTS_METABOLISM
 	taste_description = "very tangy lemon"
 	color = "#f5fc19"