New popcorn (#70661)

* New popcorn

Two new types of popcorn have been added - salted and with caramel.

* Update code/game/objects/items/food/misc.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* Update code/game/objects/items/trash.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* Update code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* Update code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* Update code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* Update code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* New popcorn

The structure of the new files has been slightly changed in favor of convenience.

* Update code/game/objects/items/food/misc.dm

* New popcorn

Minor code fixes

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>

code/game/objects/items/food/misc.dm

@@ -64,6 +64,23 @@
 	eatverbs = list("bite", "nibble", "gnaw", "gobble", "chomp")
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/food/popcorn/salty
+	name = "salty popcorn"
+	icon_state = "salty_popcorn"
+	desc = "Salty popcorn, a classic for all time."
+	trash_type = /obj/item/trash/popcorn/salty
+	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/salt = 2)
+	tastes = list("salt" = 2, "popcorn" = 1)
+
+/obj/item/food/popcorn/caramel
+	name = "caramel popcorn"
+	icon_state = "сaramel_popcorn"
+	desc = "Caramel-covered popcorn. Sweet!"
+	trash_type = /obj/item/trash/popcorn/caramel
+	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/caramel = 4)
+	tastes = list("caramel" = 2, "popcorn" = 1)
+	foodtypes = JUNKFOOD | SUGAR
+
 /obj/item/food/loadedbakedpotato
 	name = "loaded baked potato"
 	desc = "Totally baked."
@@ -939,3 +956,6 @@
 	tastes = list("rice wrappers" = 1, "spice" = 1, "crunchy veggies" = 1)
 	foodtypes = GRAIN | VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
+
+
+

code/game/objects/items/trash.dm

@@ -58,6 +58,16 @@
 	name = "popcorn"
 	icon_state = "popcorn"
 
+/obj/item/trash/popcorn/caramel
+	name = "empty caramel popcorn"
+	desc = "Now it's not a sweet snack, but just a sticky bag..."
+	icon_state = "empty_caramel_popcorn"
+
+/obj/item/trash/popcorn/salty
+	name = "empty salty popcorn"
+	desc = "It looks like there are only a few grains of salt left at the bottom of the bag..."
+	icon_state = "empty_salty_popcorn"
+
 /obj/item/trash/sosjerky
 	name = "\improper Scaredy's Private Reserve Beef Jerky"
 	icon_state = "sosjerky"
@@ -153,3 +163,4 @@
 	name = "empty Ready-donk"
 	desc = "It's been Donk-decimated."
 	icon_state = "ready_donk"
+

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -324,3 +324,21 @@
 	)
 	result = /obj/item/food/springroll
 	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/caramel_popcorn
+	name = "Caramel popcorn"
+	reqs = list(
+		/obj/item/food/popcorn = 1,
+		/datum/reagent/consumable/caramel = 3,
+	)
+	result = /obj/item/food/popcorn/caramel
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/salty_popcorn
+	name = "Salty popcorn"
+	reqs = list(
+		/obj/item/food/popcorn = 1,
+		/datum/reagent/consumable/salt = 3,
+	)
+	result = /obj/item/food/popcorn/salty
+	subcategory = CAT_MISCFOOD