Merge branch 'master' into plant-adding

code/modules/food_and_drinks/drinks/drinks.dm

@@ -217,6 +217,7 @@
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
 	foodtype = BREAKFAST
+	price = 2
 
 //Used by MREs
 /obj/item/reagent_containers/food/drinks/coffee/type2
@@ -240,6 +241,7 @@
 	icon_state = "tea"
 	item_state = "coffee"
 	spillable = TRUE
+	price = 2
 
 /* Doesn't exist lol
 /datum/chemical_reaction/catnip_tea
@@ -259,6 +261,7 @@
 	name = "Duke Purple tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
 	list_reagents = list(/datum/reagent/consumable/tea = 30)
+	price = 2
 
 /obj/item/reagent_containers/food/drinks/mug/coco
 	name = "Dutch hot coco"
@@ -276,6 +279,7 @@
 	list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
 	foodtype = GRAIN
 	isGlass = FALSE
+	price = 3
 
 /obj/item/reagent_containers/food/drinks/beer
 	name = "space beer"
@@ -414,6 +418,7 @@
 	reagent_flags = NONE
 	spillable = FALSE
 	isGlass = FALSE
+	price = 2
 
 /obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is trying to eat \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -538,3 +543,4 @@
 	icon_state = "monkey_energy"
 	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
 	foodtype = SUGAR | JUNKFOOD
+	price = 3

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -416,6 +416,7 @@
 	isGlass = FALSE
 	list_reagents = list(/datum/reagent/consumable/cream = 100)
 	foodtype = DAIRY
+	price = 3
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
 	name = "tomato juice"

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -90,6 +90,7 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
 	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
+	price = 7
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
 	name = "Syndicat Bomb"

code/modules/food_and_drinks/food/condiment.dm

@@ -186,6 +186,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	list_reagents = list(/datum/reagent/consumable/milk = 50)
 	possible_states = list()
+	price = 5
 
 /obj/item/reagent_containers/food/condiment/flour
 	name = "flour sack"

code/modules/food_and_drinks/food/snacks_other.dm

@@ -59,6 +59,8 @@
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
 	dunkable = TRUE
+	price = 2
+
 
 /obj/item/reagent_containers/food/snacks/hugemushroomslice
 	name = "huge mushroom slice"
@@ -559,9 +561,9 @@
 
 /obj/item/reagent_containers/food/snacks/tinychocolate
 	name = "chocolate"
-	desc = "A tiny and sweet chocolate. Has a 'strawberry' filling!"
+	desc = "A tiny and sweet chocolate. Has a strawberry filling!"
 	icon_state = "tiny_chocolate"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1, /datum/reagent/drug/aphrodisiac = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1, /datum/reagent/consumable/pinkmilk = 1)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR

code/modules/food_and_drinks/food/snacks_salad.dm

@@ -116,3 +116,12 @@
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("rice" = 1, "egg" = 1)
 	foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
+
+/obj/item/reagent_containers/food/snacks/salad/hellcobb
+	name = "hell cobb salad"
+	desc = "If you're being honest with yourself it's just a bowl of mushrooms with chunks of meat and an egg."
+	icon_state = "hellcobb"
+	trash = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	tastes = list("fruity cactus" = 5, "ash" = 1, "tough meat" = 3, "your eternal damnation" = 1)
+	foodtype = FRUIT | MEAT | VEGETABLES //MUSHROOM = VEGETABLE -VladinXXV 2021

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -254,3 +254,20 @@
 	tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1)
 	filling_color = "#E6A625"
 	foodtype = VEGETABLES | FRUIT | DAIRY
+
+/obj/item/reagent_containers/food/snacks/soup/creamofwastes
+	name = "cream of the wastes soup"
+	desc = "Locals say the bowl gives it a unique flavor each time. That might just be whatever killed the goliath getting in your bowl, though."
+	icon_state = "wastessoup"
+	trash = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
+	var/snowflake_reagent = null
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6)
+	tastes = list("a fresh kill" = 3, "creamy mushroom" = 5, "a warm sunset over the scorched landscape of hell" = 1)
+
+/obj/item/reagent_containers/food/snacks/soup/creamofwastes/Initialize()
+	. = ..()
+	snowflake_reagent = pick(/datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil,
+							 /datum/reagent/blood, /datum/reagent/oil, /datum/reagent/consumable/honey,
+							 /datum/reagent/carbon, /datum/reagent/drug/mushroomhallucinogen)
+	bonus_reagents = list(snowflake_reagent = 5, /datum/reagent/consumable/nutriment = 6)
+	reagents.add_reagent(snowflake_reagent, 5)

code/modules/food_and_drinks/food/snacks_vend.dm

@@ -12,6 +12,7 @@
 	filling_color = "#D2691E"
 	tastes = list("candy" = 1)
 	foodtype = JUNKFOOD | SUGAR
+	price = 2
 
 /obj/item/reagent_containers/food/snacks/sosjerky
 	name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -23,6 +24,7 @@
 	filling_color = "#8B0000"
 	tastes = list("dried meat" = 1)
 	foodtype = JUNKFOOD | MEAT | SUGAR
+	price = 3
 
 /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	name = "homemade beef jerky"
@@ -41,6 +43,7 @@
 	filling_color = "#FFD700"
 	tastes = list("salt" = 1, "crisps" = 1)
 	foodtype = JUNKFOOD | FRIED
+	price = 2
 
 /obj/item/reagent_containers/food/snacks/no_raisin
 	name = "4no raisins"
@@ -52,6 +55,7 @@
 	filling_color = "#8B0000"
 	tastes = list("dried raisins" = 1)
 	foodtype = JUNKFOOD | FRUIT | SUGAR
+	price = 2
 
 /obj/item/reagent_containers/food/snacks/no_raisin/healthy
 	name = "homemade raisins"
@@ -68,6 +72,7 @@
 	junkiness = 25
 	filling_color = "#FFD700"
 	foodtype = JUNKFOOD | GRAIN | SUGAR
+	price = 4
 
 /obj/item/reagent_containers/food/snacks/cheesiehonkers
 	name = "cheesie honkers"
@@ -79,6 +84,7 @@
 	filling_color = "#FFD700"
 	tastes = list("cheese" = 5, "crisps" = 2)
 	foodtype = JUNKFOOD | DAIRY | SUGAR
+	price = 4
 
 /obj/item/reagent_containers/food/snacks/soyfood
 	name = "Soyfood"
@@ -90,6 +96,7 @@
 	filling_color = "#FFD700"
 	tastes = list("nanomachines" = 2, "soybeans" = 5)
 	foodtype = JUNKFOOD | DAIRY | GRAIN
+	price = 3
 
 /obj/item/reagent_containers/food/snacks/syndicake
 	name = "syndi-cakes"
@@ -100,6 +107,7 @@
 	filling_color = "#F5F5DC"
 	tastes = list("sweetness" = 3, "cake" = 1)
 	foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
+  price = 5
 
 /obj/item/reagent_containers/food/snacks/carbonnanotube_noodles
 	name = "carbon nanotube noodles"
@@ -111,3 +119,4 @@
 	filling_color = "#FFD700"
 	tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
 	foodtype = GRAIN | VEGETABLES
+	price = 3

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -892,3 +892,10 @@
 	results = list(/datum/reagent/consumable/ethanol/commander_and_chief = 50)
 	required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10)
 	mix_message = "When your powers combine, I am Captain Pl-..."
+
+/datum/chemical_reaction/wockyslush
+	name = "Wocky Slush"
+	id = /datum/reagent/consumable/wockyslush
+	results = list(/datum/reagent/consumable/wockyslush = 5)
+	required_reagents = list(/datum/reagent/toxin/fentanyl = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/lemon_lime = 1)
+	mix_message = "That thang bleedin’ P!"

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

@@ -94,3 +94,16 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
 	subcategory = CAT_SALAD
+
+/datum/crafting_recipe/food/hellcobb
+	name = "Hell Cobb Salad"
+	reqs = list(
+		/obj/item/reagent_containers/glass/bowl/mushroom_bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf = 3,
+		/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit = 2,
+		/obj/item/reagent_containers/food/snacks/meat/steak/goliath = 1,
+		/obj/item/reagent_containers/food/snacks/boiledegg = 1
+
+	)
+	result = /obj/item/reagent_containers/food/snacks/salad/hellcobb
+	subcategory = CAT_SALAD

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

@@ -247,3 +247,15 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/soup/macaco
 	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/creamofwastes
+	name = "Cream of the Wastes soup"
+	reqs = list(
+		/datum/reagent/consumable/milk = 10,
+		/obj/item/reagent_containers/glass/bowl/mushroom_bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf = 1,
+		/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem =2,
+		/obj/item/reagent_containers/food/snacks/meat/steak/goliath = 2 //wanted to make this three cutlets, but goliath meat doesn't get a unique cutlet
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/creamofwastes
+	subcategory = CAT_SOUP