Merge pull request #6480 from VOREStation/upstream-merge-6628

[MIRROR] Adds a mega cooking recipe

code/game/objects/items/weapons/circuitboards/frame.dm

@@ -249,3 +249,14 @@
 							/obj/item/weapon/stock_parts/capacitor = 1,
 							/obj/item/weapon/stock_parts/spring = 1,
 							/obj/item/stack/cable_coil = 5)
+
+/obj/item/weapon/circuitboard/microwave/advanced
+	name = T_BOARD("deluxe microwave")
+	build_path = /obj/machinery/microwave/advanced
+	board_type = new /datum/frame/frame_types/microwave
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	req_components = list(
+							/obj/item/weapon/stock_parts/console_screen = 1,
+							/obj/item/weapon/stock_parts/motor = 1,
+							/obj/item/weapon/stock_parts/capacitor = 1)
+

code/modules/food/food/thecake.dm

@@ -0,0 +1,280 @@
+// Chaos cake
+
+/datum/recipe/chaoscake_layerone
+	reagents = list("flour" = 300,"milk" = 200, "sugar" = 100, "egg" = 30)
+	fruit = list("poisonberries" = 15, "cherries" =  15)
+	items = list(
+			/obj/item/weapon/reagent_containers/food/snacks/meat/,
+			/obj/item/weapon/reagent_containers/food/snacks/meat/,
+			/obj/item/weapon/reagent_containers/food/snacks/meat/,
+			/obj/item/weapon/reagent_containers/food/snacks/meat/
+		)
+	result = /obj/structure/chaoscake
+
+/datum/recipe/chaoscake_layertwo
+	reagents = list("flour" = 300, "milk" = 200, "sugar" = 100, "egg" = 30, )
+	fruit = list("vanilla" =  15, "banana" = 15)
+	items = list(
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough
+		)
+	result = /obj/item/weapon/chaoscake_layer
+
+/datum/recipe/chaoscake_layerthree
+	reagents = list("flour" = 240, "milk" = 150, "sugar" = 80, "egg" = 24, "deathbell" = 100)
+	fruit = list("grapes" = 30)
+	items = list(
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough
+		)
+	result = /obj/item/weapon/chaoscake_layer/three
+
+/datum/recipe/chaoscake_layerfour
+	reagents = list("flour" = 240, "milk" = 150, "sugar" = 80, "egg" = 24, "milkshake" = 300)
+	fruit = list("rice" = 30)
+	items = list(
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough
+		)
+	result = /obj/item/weapon/chaoscake_layer/four
+
+/datum/recipe/chaoscake_layerfive
+	reagents = list("flour" = 180, "milk" = 100, "sugar" = 60, "egg" = 18, "blood" = 300)
+	fruit = list("tomato" = 20)
+	items = list() //supposed to be made with lobster, still has to be ported.
+	result = /obj/item/weapon/chaoscake_layer/five
+
+/datum/recipe/chaoscake_layersix
+	reagents = list("flour" = 180, "milk" = 100, "sugar" = 60, "egg" = 18, "sprinkles" = 10)
+	fruit = list("apple" = 30)
+	items = list(
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+			/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+			/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
+		)
+	result = /obj/item/weapon/chaoscake_layer/six
+
+/datum/recipe/chaoscake_layerseven
+	reagents = list("flour" = 120, "milk" = 50, "sugar" = 40, "egg" = 12, "devilskiss" = 200)
+	fruit = list("potato" = 10)
+	items = list(
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough
+		)
+	result = /obj/item/weapon/chaoscake_layer/seven
+
+/datum/recipe/chaoscake_layereight
+	reagents = list("flour" = 120, "milk" = 50, "sugar" = 40, "egg" = 12, "cream" = 200)
+	fruit = list("lemon" = 10)
+	items = list(
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough,
+			/obj/item/weapon/reagent_containers/food/snacks/dough
+		)
+	result = /obj/item/weapon/chaoscake_layer/eight
+
+/datum/recipe/chaoscake_layernine
+	reagents = list("water" = 100, "blood" = 100)
+	fruit = list("goldapple" = 50)
+	items = list()
+	result = /obj/item/weapon/chaoscake_layer/nine
+
+/obj/structure/chaoscake
+	name = "An unfinished cake"
+	desc = "A single layer of a strange cake, you can see the cherry paste ooze, but it feels very incomplete..."
+
+	icon = 'icons/obj/food64x64.dmi'
+	icon_state = "chaoscake_unfinished-1"
+	pixel_x = -16
+
+	var/slices = 6
+	var/maxslices = 6
+	var/stage = 1
+	var/maxstages = 9
+	var/edible = 0
+
+	var/regentime = 1000
+	var/interval = 0
+
+	var/static/list/desclist2 = list(
+			"The first layer of a strange cake, you can see the cherry paste ooze.",
+			"The second layer of the cake sits in place now, smelling of pear with delicious colourful cream.",
+			"The third layer of cake adds a strange purple layer, glazed over with frosting. It smells of grapes, but with a hint of something foul underneath.",
+			"With the fourth layer added the cake looks happier again. Reeking of vanilla, it brings up memories of childhood joy.",
+			"The fifth layer is extremely disturbing on that cake. Smelling of pure copper, it seems that bright blood clots are forming on top.",
+			"The cake is getting closer with the sixth layer added, the pink hue smelling of chocolate, with colourful sprinkles on top.",
+			"The first pair of triplets rest on the cake, despite being mostly similar to the first three, an evil aura becomes noticable.",
+			"The second pair of triplets rest on the cake, if you stand on the bright side, you can feel a good aura lifting your mood.",
+			"A chaos cake. Both a creation of dark and light, the two cakes are kept in a careful balance by that mystical coin in the middle. It's said its effects would dissipate if the balance is ever tipped in favour of one side too much, so both sides much be cut equally."
+		)
+
+/obj/item/weapon/chaoscake_layer
+	name = "A layer of cake"
+	desc = "a layer of cake, it is made out of colourful cream."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "chaoscake_layer-2"
+	var/layer_stage = 1
+
+/obj/item/weapon/chaoscake_layer/three
+	desc = "a layer of cake, glazed in purple."
+	icon_state = "chaoscake_layer-3"
+	layer_stage = 2
+
+/obj/item/weapon/chaoscake_layer/four
+	desc = "a layer of cake, reminding you of a colouring book."
+	icon_state = "chaoscake_layer-4"
+	layer_stage = 3
+
+/obj/item/weapon/chaoscake_layer/five
+	desc = "A layer of cake, smells like copper."
+	icon_state = "chaoscake_layer-5"
+	layer_stage = 4
+
+/obj/item/weapon/chaoscake_layer/six
+	desc = "A layer of cake, featuring colourful sprinkles."
+	icon_state = "chaoscake_layer-6"
+	layer_stage = 5
+
+/obj/item/weapon/chaoscake_layer/seven
+	desc = "A triplet of evil cake parts."
+	icon_state = "chaoscake_layer-7"
+	layer_stage = 6
+
+/obj/item/weapon/chaoscake_layer/eight
+	desc = "A triplet of good cake parts."
+	icon_state = "chaoscake_layer-8"
+	layer_stage = 7
+
+/obj/item/weapon/chaoscake_layer/nine
+	name = "A coin of balance"
+	desc = "A very peculiar coin, it seems to stabilise the air around it."
+	icon_state = "chaoscake_layer-9"
+	layer_stage = 8
+
+/obj/structure/chaoscake/proc/HasSliceMissing()
+	..()
+	if(slices < maxslices)
+		if(interval >= regentime)
+			interval = 0
+			slices++
+			HasSliceMissing()
+		else
+			interval++
+			HasSliceMissing()
+	else
+		return
+
+/obj/item/weapon/reagent_containers/food/snacks/chaoscakeslice
+	name = "The Chaos Cake Slice"
+	desc = "A slice from The Chaos Cake, it pulses weirdly, as if angry to be seperated from the whole"
+	icon_state = "chaoscake_slice-1"
+
+	center_of_mass = list("x"=16, "y"=10)
+	nutriment_desc = list()
+	nutriment_amt = 4
+	volume = 80
+
+/obj/item/weapon/reagent_containers/food/snacks/chaoscakeslice/Initialize()
+	..()
+	var/i = rand(1,6)
+	icon_state = "chaoscake_slice-[i]"
+	switch(i)
+		if(1)
+			name = "Slice Of Evil" //Pretty damn poisonous, takes a lot of work to make safe for consumption, useful for medical.
+			desc = "An odd slice, despite the grease and cherries oozing off the top, it smells delicious."
+			nutriment_desc = list("The desire to consume" = 10) // You won't even taste the poison.
+			reagents.add_reagent("neurotoxic_protein", 2)
+			reagents.add_reagent("shockchem", 2)
+			reagents.add_reagent("amatoxin", 2)
+			reagents.add_reagent("carpotoxin", 2)
+			reagents.add_reagent("spidertoxin", 2)
+			bitesize = 7
+		if(2)
+			name = "Slice Of Evil" //A bad trip
+			desc = "A mysterious slice, coated in purple frosting that smells like grapes."
+			nutriment_desc = list("The desire to show off an party" = 10)
+			reagents.add_reagent("stoxin", 2)
+			reagents.add_reagent("space_drugs", 10)
+			reagents.add_reagent("serotrotium", 4)
+			reagents.add_reagent("cryptobiolin", 8)
+			reagents.add_reagent("mindbreaker", 10)
+			reagents.add_reagent("psilocybin", 10)
+			bitesize = 30 //even a single bite won't make you escape fate.
+		if(3)
+			name = "Slice Of Evil" //acidic
+			desc = "A menacing slice, smelling clearly of copper, blood clots float on top."
+			nutriment_desc = list("Infernal Rage" = 10)
+			reagents.add_reagent("blood", 20)
+			reagents.add_reagent("stomacid", 10)
+			reagents.add_reagent("mutagen", 4)
+			reagents.add_reagent("thirteenloko", 20)
+			reagents.add_reagent("hyperzine", 10)
+			bitesize = 30
+		if(4)
+			name = "Slice Of Good" //anti-tox
+			desc = "A colourful slice, smelling of pear and coated in delicious cream."
+			nutriment_desc = list("Hapiness" = 10)
+			reagents.add_reagent("anti_toxin", 2)
+			reagents.add_reagent("tricordrazine", 2)
+			bitesize = 3
+		if(5)
+			name = "Slice Of Good" //anti-oxy
+			desc = "A light slice, it's pretty to look at and smells of vanilla."
+			nutriment_desc = list("Freedom" = 10)
+			reagents.add_reagent("dexalinp", 2)
+			reagents.add_reagent("tricordrazine", 2)
+			bitesize = 3
+		if(6)
+			name = "Slice Of Good" //anti-burn/brute
+			desc = "A hearty slice, it smells of chocolate and strawberries."
+			nutriment_desc = list("Love" = 10)
+			reagents.add_reagent("bicaridine", 2)
+			reagents.add_reagent("tricordrazine", 2)
+			reagents.add_reagent("kelotane", 2)
+			bitesize = 4
+
+/obj/structure/chaoscake/attackby(var/obj/item/weapon/W, var/mob/living/user)
+	if(istype(W,/obj/item/weapon/material/knife))
+		if(edible == 1)
+			HasSliceMissing()
+			if(slices <= 0)
+				user << "The cake hums away quietly as the chaos powered goodness slowly recovers the large amount of lost mass, best to give it a moment before cutting another slice."
+				return
+			else
+				user << "You cut a slice of the cake. The slice looks like the cake was just baked, and you can see before your eyes as the spot where you cut the slice slowly regenerates!"
+				slices = slices - 1
+				icon_state = "chaoscake-[slices]"
+				new /obj/item/weapon/reagent_containers/food/snacks/chaoscakeslice(src.loc)
+
+		else
+			to_chat(user, "<span class='notice'>It looks so good... But it feels so wrong to eat it before it's finished...</span>")
+			return
+	if(istype(W,/obj/item/weapon/chaoscake_layer))
+		var/obj/item/weapon/chaoscake_layer/C = W
+		if(C.layer_stage == 8)
+			user << "Finally! The coin on the top, the almighty chaos cake is complete!"
+			qdel(W)
+			stage++
+			desc = desclist2[stage]
+			icon_state = "chaoscake-6"
+			edible = 1
+			name = "The Chaos Cake!"
+		else if(stage == maxstages)
+			user << "The cake is already done!"
+		else if(stage == C.layer_stage)
+			user << "You add another layer to the cake, nice."
+			qdel(W)
+			stage++
+			desc = desclist2[stage]
+			icon_state = "chaoscake_stage-[stage]"
+		else
+			user << "Hmm, doesnt seem like this layer is supposed to be added there?"
+

code/modules/food/kitchen/microwave.dm

@@ -12,6 +12,8 @@
 	var/operating = 0 // Is it on?
 	var/dirty = 0 // = {0..100} Does it need cleaning?
 	var/broken = 0 // ={0,1,2} How broken is it???
+	var/circuit_item_capacity = 1 //how many items does the circuit add to max number of items
+	var/item_level = 0 // items microwave can handle, 0 foodstuff, 1 materials
 	var/global/list/datum/recipe/available_recipes // List of the recipes you can use
 	var/global/list/acceptable_items // List of the items you can put in
 	var/global/list/acceptable_reagents // List of the reagents you can put in
@@ -124,7 +126,7 @@
 			to_chat(user, "<span class='warning'>It's dirty!</span>")
 			return 1
 	else if(is_type_in_list(O,acceptable_items))
-		if (contents.len>=(max_n_of_items + component_parts.len + 1))	//Adds component_parts to the maximum number of items.	The 1 is from the circuit
+		if (contents.len>=(max_n_of_items + component_parts.len + circuit_item_capacity))	//Adds component_parts to the maximum number of items. changed 1 to actually just be the circuit item capacity var.
 			to_chat(user, "<span class='warning'>This [src] is full of ingredients, you cannot put more.</span>")
 			return 1
 		if(istype(O, /obj/item/stack) && O:get_amount() > 1) // This is bad, but I can't think of how to change it
@@ -308,14 +310,26 @@
 		sleep(5) //VOREStation Edit - Quicker Microwaves
 	return 1
 
-/obj/machinery/microwave/proc/has_extra_item()
-	for (var/obj/O in ((contents - component_parts) - circuit))
-		if ( \
-				!istype(O,/obj/item/weapon/reagent_containers/food) && \
-				!istype(O, /obj/item/weapon/grown) \
-			)
-			return 1
-	return 0
+/obj/machinery/microwave/proc/has_extra_item() //- coded to have different microwaves be able to handle different items
+	if(item_level == 0)
+		for (var/obj/O in ((contents - component_parts) - circuit))
+			if ( \
+					!istype(O,/obj/item/weapon/reagent_containers/food) && \
+					!istype(O, /obj/item/weapon/grown) \
+				)
+				return 1
+		return 0
+	if(item_level == 1)
+		for (var/obj/O in ((contents - component_parts) - circuit))
+			if ( \
+					!istype(O, /obj/item/weapon/reagent_containers/food) && \
+					!istype(O, /obj/item/weapon/grown) && \
+					!istype(O, /obj/item/slime_extract) && \
+					!istype(O, /obj/item/organ) && \
+					!istype(O, /obj/item/stack/material) \
+				)
+				return 1
+		return 0
 
 /obj/machinery/microwave/proc/start()
 	src.visible_message("<span class='notice'>The microwave turns on.</span>", "<span class='notice'>You hear a microwave.</span>")
@@ -395,4 +409,16 @@
 
 		if ("dispose")
 			dispose()
-	return
+	return
+
+/obj/machinery/microwave/advanced // specifically for complex recipes
+	name = "deluxe microwave"
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "mw-deluxe"
+	circuit = /obj/item/weapon/circuitboard/microwave/advanced
+	circuit_item_capacity = 100
+	item_level = 1
+
+/obj/machinery/microwave/advanced/Initialize()
+	..()
+	reagents.maximum_volume = 1000

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -3527,6 +3527,28 @@
 	glass_name = "fusionnaire"
 	glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations."
 
+/datum/reagent/ethanol/deathbell
+	name = "Deathbell"
+	id = "deathbell"
+	description = "A successful experiment to make the most alcoholic thing possible."
+	taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol"
+	color = "#9f6aff"
+	taste_mult = 5
+	strength = 10
+	adj_temp = 10
+	targ_temp = 330
+
+	glass_name = "Deathbell"
+	glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on."
+
+/datum/reagent/ethanol/deathbell/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
+
+	if(dose * strength >= strength) // Early warning
+		M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects.
+	if(dose * strength >= strength * 2.5) // Slurring takes longer. Again, intentional.
+		M.slurring = max(M.slurring, 30)
+
 /datum/reagent/nutriment/magicdust
 	name = "Magic Dust"
 	id = "magicdust"

code/modules/reagents/Chemistry-Recipes.dm

@@ -2210,6 +2210,13 @@
 	required_reagents = list("sake" = 1, "melonliquor" = 1)
 	result_amount = 2
 
+/datum/chemical_reaction/drinks/deathbell
+	name = "Deathbell"
+	id = "deathbell"
+	result = "deathbell"
+	required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1)
+	result_amount = 3
+
 /datum/chemical_reaction/bitters
 	name = "Bitters"
 	id = "bitters"

code/modules/research/designs/circuits/circuits.dm

@@ -614,6 +614,13 @@ CIRCUITS BELOW
 	build_path = /obj/item/weapon/circuitboard/aicore
 	sort_string = "XAAAA"
 
+/datum/design/circuit/microwave/advanced
+	name = "deluxe microwave"
+	id = "deluxe microwave"
+	req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4)
+	build_path = /obj/item/weapon/circuitboard/microwave/advanced
+	sort_string = "MAAAC"
+
 
 /* I have no idea how this was even running before, but it doesn't seem to be necessary.
 ///////////////////////////////////

vorestation.dme

@@ -1933,6 +1933,7 @@
 #include "code\modules\food\food\snacks.dm"
 #include "code\modules\food\food\snacks_vr.dm"
 #include "code\modules\food\food\z_custom_food_vr.dm"
+#include "code\modules\food\food\thecake.dm"
 #include "code\modules\food\food\drinks\bottle.dm"
 #include "code\modules\food\food\drinks\cup.dm"
 #include "code\modules\food\food\drinks\drinkingglass.dm"