Merge branch 'master' into upstream-merge-26140

code/modules/food_and_drinks/food/condiment.dm

@@ -23,7 +23,8 @@
 	 "sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
 	 "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
 	 "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
-	 "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"))
+	 "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
+	 "mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."))
 	var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
 
 /obj/item/weapon/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
@@ -207,6 +208,13 @@
 	list_reagents = list("soysauce" = 50)
 	possible_states = list()
 
+/obj/item/weapon/reagent_containers/food/condiment/mayonnaise
+	name = "mayonnaise"
+	desc = "An oily condiment made from egg yolks."
+	icon_state = "mayonnaise"
+	list_reagents = list("mayonnaise" = 50)
+	possible_states = list()
+
 
 
 //Food packs. To easily apply deadly toxi... delicious sauces to your food!

code/modules/food_and_drinks/food/snacks.dm

@@ -170,7 +170,7 @@
 					if(istype(A, B))
 						continue contents_loop
 				qdel(A)
-	feedback_add_details("food_made","[type]")
+	SSblackbox.add_details("food_made","[type]")
 
 	if(bonus_reagents && bonus_reagents.len)
 		for(var/r_id in bonus_reagents)
@@ -262,7 +262,7 @@
 			initialize_cooked_food(S, M.efficiency)
 		else
 			initialize_cooked_food(S, 1)
-		feedback_add_details("food_made","[type]")
+		SSblackbox.add_details("food_made","[type]")
 	else
 		new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src)
 		if(M && M.dirty < 100)

code/modules/food_and_drinks/food/snacks_other.dm

@@ -468,3 +468,11 @@
 	list_reagents = list("nutriment" = 3, "vitamin" = 2, "sodiumchloride" = 5)
 	bonus_reagents = list("sodiumchloride" = 10)
 	tastes = list("bran" = 4, "raisins" = 3, "salt" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/butter
+	name = "stick of butter"
+	desc = "A stick of delicious, golden, fatty goodness."
+	icon_state = "butter"
+	list_reagents = list("nutriment" = 5)
+	filling_color = "#FFD700"
+	tastes = list("butter" = 1)

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -13,8 +13,8 @@
 	filling_color = "#D2691E"
 	tastes = list("donut" = 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/donut/New()
-	..()
+/obj/item/weapon/reagent_containers/food/snacks/donut/Initialize()
+	. = ..()
 	if(prob(30))
 		icon_state = "donut2"
 		name = "frosted donut"
@@ -28,8 +28,8 @@
 	bitesize = 10
 	tastes = list("donut" = 3, "chaos" = 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
-	..()
+/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/Initialize()
+	. = ..()
 	extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
 	reagents.add_reagent("[extra_reagent]", 3)
 	bonus_reagents = list("[extra_reagent]" = 3, "sugar" = 1)
@@ -48,8 +48,8 @@
 	extra_reagent = "berryjuice"
 	tastes = list("jelly" = 1, "donut" = 3)
 
-/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
-	..()
+/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/Initialize()
+	. = ..()
 	if(extra_reagent)
 		reagents.add_reagent("[extra_reagent]", 3)
 	if(prob(30))
@@ -210,13 +210,13 @@
 	filling_color = "#F0E68C"
 	tastes = list("mushroom" = 1, "biscuit" = 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New()
+/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize()
 	var/fey = prob(10)
 	if(fey)
 		name = "exceptional plump helmet biscuit"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
 		bonus_reagents = list("omnizine" = 5, "nutriment" = 1, "vitamin" = 1)
-	..()
+	. = ..()
 	if(fey)
 		reagents.add_reagent("omnizine", 5)
 

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -128,6 +128,13 @@
 	list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
 	tastes = list("tomato" = 1)
 
+/obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball
+	name = "eyeball soup"
+	desc = "It looks back at you..."
+	icon_state = "eyeballsoup"
+	bonus_reagents = list("nutriment" = 1, "liquidgibs" = 3)
+	tastes = list("tomato" = 1, "squirming" = 1)
+
 /obj/item/weapon/reagent_containers/food/snacks/soup/milo
 	name = "milosoup"
 	desc = "The universes best soup! Yum!!!"
@@ -196,5 +203,3 @@
 	icon_state = "redbeetsoup"
 	bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
 	tastes = list("beet" = 1)
-
-

code/modules/food_and_drinks/food/snacks_spaghetti.dm

@@ -83,5 +83,5 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "beefnoodle"
 	trash = /obj/item/weapon/reagent_containers/glass/bowl
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 6)
+	bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3)
 	tastes = list("noodle" = 1, "meat" = 1)

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -31,7 +31,7 @@
 					break
 
 		if(!input_plate)
-			GLOB.diary << "a [src] didn't find an input plate."
+			GLOB.world_game_log << "a [src] didn't find an input plate."
 			return
 
 /obj/machinery/gibber/autogibber/Bumped(atom/A)

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -142,7 +142,7 @@
 		return
 	for(var/i in 1 to (C+processor.rating_amount-1))
 		new S.coretype(loc)
-		feedback_add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
+		SSblackbox.add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
 	..()
 
 /datum/food_processor_process/mob/slime/input = /mob/living/simple_animal/slime

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

@@ -264,7 +264,7 @@
 	time = 40
 	reqs = list(
 		/obj/item/weapon/reagent_containers/food/snacks/meat/steak/goliath = 1,
-		/obj/item/weapon/legion_skull = 1,
+		/obj/item/organ/hivelord_core/legion = 1,
 		/datum/reagent/consumable/ketchup = 2,
 		/datum/reagent/consumable/capsaicin = 2
 	)
@@ -325,3 +325,5 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/branrequests
 	category = CAT_MISCFOOD
+	
+	

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

@@ -91,6 +91,18 @@
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato
 	category = CAT_SOUP
 
+/datum/crafting_recipe/food/eyeballsoup
+	name = "Eyeball soup"
+	reqs = list(
+		/datum/reagent/water = 10,
+		/obj/item/weapon/reagent_containers/glass/bowl = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2,
+		/obj/item/organ/eyes = 1
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball
+	category = CAT_SOUP
+
+
 /datum/crafting_recipe/food/milosoup
 	name = "Milo soup"
 	reqs = list(