Adds more food recipes (#3544)

code/game/machinery/kitchen/icecream.dm

@@ -2,8 +2,10 @@
 #define ICECREAM_CHOCOLATE 2
 #define ICECREAM_STRAWBERRY 3
 #define ICECREAM_BLUE 4
-#define CONE_WAFFLE 5
+#define ICECREAM_CHERRY 5
-#define CONE_CHOC 6
+#define ICECREAM_BANANA 6
+#define CONE_WAFFLE 7
+#define CONE_CHOC 8
 
 // Ported wholesale from Apollo Station.
 
@@ -29,6 +31,10 @@
 			return list("milk", "ice", "berryjuice")
 		if(ICECREAM_BLUE)
 			return list("milk", "ice", "singulo")
+		if(ICECREAM_CHERRY)
+			return list("milk", "ice", "cherryjelly")
+		if(ICECREAM_BANANA)
+			return list("milk", "ice", "banana")
 		if(CONE_WAFFLE)
 			return list("flour", "sugar")
 		if(CONE_CHOC)
@@ -44,6 +50,10 @@
 			return "strawberry"
 		if(ICECREAM_BLUE)
 			return "blue"
+		if(ICECREAM_CHERRY)
+			return "cherry"
+		if(ICECREAM_BANANA)
+			return "banana"
 		if(CONE_WAFFLE)
 			return "waffle"
 		if(CONE_CHOC)
@@ -73,6 +83,8 @@
 	dat += "<b>Strawberry icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_STRAWBERRY]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=5'><b>x5</b></a> [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)<br>"
 	dat += "<b>Chocolate icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_CHOCOLATE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=5'><b>x5</b></a> [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)<br>"
 	dat += "<b>Blue icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_BLUE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=5'><b>x5</b></a> [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)<br></div>"
+	dat += "<b>Cherry icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_CHERRY]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHERRY];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHERRY];amount=5'><b>x5</b></a> [product_types[ICECREAM_CHERRY]] dollops left. (Ingredients: milk, ice, cherry jelly)<br>"
+	dat += "<b>Banana icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_BANANA]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_BANANA];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_BANANA];amount=5'><b>x5</b></a> [product_types[ICECREAM_BANANA]] dollops left. (Ingredients: milk, ice, banana)<br></div>"
 	dat += "<br><b>CONES</b><br><div class='statusDisplay'>"
 	dat += "<b>Waffle cones:</b> <a href='?src=\ref[src];cone=[CONE_WAFFLE]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=5'><b>x5</b></a> [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)<br>"
 	dat += "<b>Chocolate cones:</b> <a href='?src=\ref[src];cone=[CONE_CHOC]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=5'><b>x5</b></a> [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)<br></div>"
@@ -120,7 +132,7 @@
 			reagents.remove_reagent(R, amount)
 		product_types[make_type] += amount
 		var/flavour = get_flavour_name(make_type)
-		if(make_type > 4)
+		if(make_type > 6)
 			src.visible_message("<span class='info'>[user] cooks up some [flavour] cones.</span>")
 		else
 			src.visible_message("<span class='info'>[user] whips up some [flavour] icecream.</span>")
@@ -190,8 +202,10 @@
 	ice_creamed = 1
 
 #undef ICECREAM_VANILLA
-#undef FLAVOUR_CHOCOLATE
+#undef ICECREAM_CHOCOLATE
-#undef FLAVOUR_STRAWBERRY
+#undef ICECREAM_STRAWBERRY
-#undef FLAVOUR_BLUE
+#undef ICECREAM_BLUE
+#undef ICECREAM_CHERRY
+#undef ICECREAM_BANANA
 #undef CONE_WAFFLE
 #undef CONE_CHOC

code/modules/food/recipes_microwave.dm

@@ -122,7 +122,6 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/mouseburger
 
-
 /datum/recipe/hotdog
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/bun,
@@ -130,6 +129,14 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
 
+/datum/recipe/classichotdog
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
+		/obj/item/weapon/holder/corgi
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/classichotdog
+
+
 /datum/recipe/waffles
 	reagents = list("sugar" = 10)
 	items = list(
@@ -201,8 +208,6 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
 
-
-
 /datum/recipe/berryclafoutis
 	fruit = list("berries" = 1)
 	items = list(
@@ -218,7 +223,6 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
 
 
-
 /datum/recipe/humankabob
 	items = list(
 		/obj/item/stack/rods,
@@ -355,14 +359,6 @@ I said no!
 	reagent_mix = RECIPE_REAGENT_REPLACE
 	result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
 
-
-
-
-
-
-
-
-
 /datum/recipe/fishandchips
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/fries,
@@ -370,8 +366,6 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
 
-
-
 /datum/recipe/sandwich
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
@@ -473,8 +467,6 @@ I said no!
 	items = list(/obj/item/weapon/reagent_containers/food/snacks/spagetti)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
 
-
-
 /datum/recipe/meatballspagetti
 	reagents = list("water" = 5)
 	items = list(
@@ -884,3 +876,30 @@ I said no!
 	)
 	reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
 	result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast
+
+
+/datum/recipe/donerkebab
+	fruit = list("tomato" = 1, "cabbage" = 1)
+	reagents = list("sodiumchloride" = 1)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
+		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
+
+
+/datum/recipe/sashimi
+	reagents = list("soysauce" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/carpmeat
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
+
+
+/datum/recipe/nugget
+	reagents = list("flour" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
+	)
+	reagent_mix = RECIPE_REAGENT_REPLACE
+	result = /obj/item/weapon/reagent_containers/food/snacks/nugget

code/modules/food/recipes_oven.dm

@@ -472,3 +472,31 @@
 	appliance = OVEN
 	items = list(/obj/item/organ/brain)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
+
+/datum/recipe/pancakes
+	appliance = OVEN
+	fruit = list("blueberries" = 2)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
+		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/pancakes
+
+/datum/recipe/lasagna
+	appliance = OVEN
+	fruit = list("tomato" = 2, "eggplant" = 1)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
+		/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
+		/obj/item/weapon/reagent_containers/food/snacks/meat,
+		/obj/item/weapon/reagent_containers/food/snacks/meat
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/lasagna
+
+/datum/recipe/honeybun
+	appliance = OVEN
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/dough
+	)
+	reagents = list("honey" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/honeybun

code/modules/hydroponics/seed_datums.dm

@@ -39,7 +39,7 @@
 	name = "berries"
 	seed_name = "berry"
 	display_name = "berry bush"
-	mutants = list("glowberries","poisonberries")
+	mutants = list("glowberries","poisonberries","blueberries")
 	chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
 	kitchen_tag = "berries"
 
@@ -57,6 +57,23 @@
 	set_trait(TRAIT_WATER_CONSUMPTION, 6)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
 
+/datum/seed/berry/blue
+	name = "blueberries"
+	seed_name = "blueberry"
+	display_name = "blueberry bush"
+	mutants = list("berries","poisonberries","glowberries")
+	chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
+
+/datum/seed/berry/blue/setup_traits()
+	..()
+	set_trait(TRAIT_MATURATION,5)
+	set_trait(TRAIT_PRODUCTION,5)
+	set_trait(TRAIT_YIELD,2)
+	set_trait(TRAIT_POTENCY,10)
+	set_trait(TRAIT_PRODUCT_COLOUR,"#1C225C")
+	set_trait(TRAIT_WATER_CONSUMPTION, 5)
+	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.2)
+
 /datum/seed/berry/glow
 	name = "glowberries"
 	seed_name = "glowberry"

code/modules/hydroponics/seed_packets.dm

@@ -108,6 +108,9 @@ var/global/list/plant_seed_sprites = list()
 /obj/item/seeds/berryseed
 	seed_type = "berries"
 
+/obj/item/seeds/blueberryseed
+	seed_type = "blueberries"
+
 /obj/item/seeds/glowberryseed
 	seed_type = "glowberries"
 

code/modules/hydroponics/seed_storage.dm

@@ -43,6 +43,7 @@
 		/obj/item/seeds/appleseed = 3,
 		/obj/item/seeds/bananaseed = 3,
 		/obj/item/seeds/berryseed = 3,
+		/obj/item/seeds/blueberryseed = 3,
 		/obj/item/seeds/cabbageseed = 3,
 		/obj/item/seeds/carrotseed = 3,
 		/obj/item/seeds/chantermycelium = 3,
@@ -86,6 +87,7 @@
 		/obj/item/seeds/amanitamycelium = 2,
 		/obj/item/seeds/bananaseed = 3,
 		/obj/item/seeds/berryseed = 3,
+		/obj/item/seeds/blueberryseed = 3,
 		/obj/item/seeds/cabbageseed = 3,
 		/obj/item/seeds/carrotseed = 3,
 		/obj/item/seeds/chantermycelium = 3,

code/modules/mob/holder.dm

@@ -579,3 +579,12 @@ var/list/holder_mob_icon_cache = list()
 /obj/item/weapon/holder/pai/rabbit
 	icon_state = "rabbit_rest"
 	item_state = "rabbit"
+
+//corgi
+
+/obj/item/weapon/holder/corgi
+	name = "corgi"
+	icon_state = "corgi"
+	item_state = "corgi"
+	contained_sprite = 1
+	w_class = 3

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -24,6 +24,8 @@
 	seek_speed = 6
 	possession_candidate = 1
 
+	holder_type = /obj/item/weapon/holder/corgi
+
 	var/obj/item/inventory_head
 	var/obj/item/inventory_back
 

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -4424,7 +4424,6 @@
 		qdel(src)
 		qdel(W)
 
-
 /obj/item/weapon/reagent_containers/food/snacks/koiskebab2
 	name = "k'ois on a stick"
 	desc = "It's K'ois. On a stick. It looks like you could fit more."
@@ -4538,3 +4537,99 @@
 	bitesize = 4
 
 
+/obj/item/weapon/reagent_containers/food/snacks/pancakes
+	name = "pancakes"
+	desc = "Pancakes with blueberries, delicious."
+	icon_state = "pancakes"
+	trash = /obj/item/trash/plate
+	center_of_mass = "x=15;y=11"
+	nutriment_desc = list("pancake" = 8)
+	nutriment_amt = 8
+
+/obj/item/weapon/reagent_containers/food/snacks/pancakes/Initialize()
+	. = ..()
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/classichotdog
+	name = "classic hotdog"
+	desc = "Going literal."
+	icon_state = "hotcorgi"
+	center_of_mass = "x=16;y=17"
+
+/obj/item/weapon/reagent_containers/food/snacks/classichotdog/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 16)
+	bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/lasagna
+	name = "lasagna"
+	desc = "Favorite of cats."
+	icon_state = "lasagna"
+	trash = /obj/item/trash/plate
+	center_of_mass = "x=16;y=17"
+	nutriment_amt = 5
+	nutriment_desc = list("pasta" = 4, "tomato" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/classichotdog/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 4)
+	bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/donerkebab
+	name = "doner kebab"
+	desc = "A delicious sandwich-like food from ancient Earth. The meat is typically cooked on a vertical rotisserie."
+	icon_state = "doner_kebab"
+	nutriment_amt = 5
+	nutriment_desc = list("dough" = 4, "cabbage" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donerkebab/Initialize()
+	. = ..()
+	reagents.add_reagent("protein", 2)
+	bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/sashimi
+	name = "carp sashimi"
+	desc = "A traditional human dish, recreated using space carp."
+	icon_state = "sashimi"
+	filling_color = "#FFDEFE"
+	center_of_mass = list("x"=17, "y"=13)
+
+/obj/item/weapon/reagent_containers/food/snacks/sashimi/Initialize()
+	. = ..()
+	reagents.add_reagent("seafood", 3)
+	reagents.add_reagent("carpotoxin", 3)
+	bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/nugget
+	name = "chicken nugget"
+	icon_state = "nugget_lump"
+
+/obj/item/weapon/reagent_containers/food/snacks/nugget/Initialize()
+	. = ..()
+	var/shape = pick("lump", "star", "lizard", "corgi")
+	desc = "A chicken nugget vaguely shaped like a [shape]."
+	icon_state = "nugget_[shape]"
+	reagents.add_reagent("protein", 4)
+	bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
+	name = "ice cream sandwich"
+	desc = "Portable ice cream in its own packaging."
+	icon_state = "4no_raisins"
+	filling_color = "#343834"
+	center_of_mass = list("x"=15, "y"=4)
+	nutriment_desc = list("ice cream" = 4)
+	nutriment_amt = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/honeybun
+	name = "honey bun"
+	desc = "A sticky pastry bun glazed with honey."
+	icon_state = "honeybun"
+	nutriment_desc = list("pastry" = 1)
+	nutriment_amt = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/honeybun/Initialize()
+	. = ..()
+	reagents.add_reagent("honey", 3)
+	bitesize = 3
+

html/changelogs/alberyk-PR-3544.yml

@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added new food recipes."
+  - rscadd: "You can now pick up corgis."