diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 6c5e4290e83..0c677cc83e7 100755
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -45,12 +45,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/food
name = "Food crate"
- contains = list(/obj/item/weapon/reagent_containers/food/drinks/flour,
+ contains = list(/obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/storage/fancy/egg_box,
- /obj/item/weapon/reagent_containers/food/condiment/enzyme,
- /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana)
cost = 10
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index f5e5b2987df..2107bbd0398 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -53,6 +53,13 @@
input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
output = /obj/item/weapon/reagent_containers/food/snacks/soydope
+ wheat
+ input = /obj/item/weapon/reagent_containers/food/snacks/grown/wheat
+ output = /obj/item/weapon/reagent_containers/food/snacks/flour
+
+ spaghetti
+ input = /obj/item/weapon/reagent_containers/food/snacks/flour
+ output = /obj/item/weapon/reagent_containers/food/snacks/spagetti
/* mobs */
mob
@@ -143,13 +150,13 @@
src.processing = 1
user.visible_message("\blue [user] turns on \a [src].", \
"You turn on \a [src].", \
- "You hear a food processor")
+ "You hear a food processor.")
playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
use_power(500)
sleep(P.time)
P.process(src.loc, O)
src.processing = 0
src.visible_message("\blue \the [src] finished processing.", \
- "You hear food processor stops")
+ "You hear the food processor stopping/")
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 9302f810b2f..efe862d79b7 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -77,7 +77,7 @@
dat = {"Engineering notes on single-stage Supermatter engine,
-Waleed Asad
-
+
Station,
Exodus
@@ -735,7 +735,7 @@
/obj/item/weapon/book/manual/chef_recipes
name = "Chef Recipes"
icon_state = "cooked_book"
- author = "Lord Frenrir Cageth"
+ author = "Victoria Ponsonby"
title = "Chef Recipes"
dat = {"
@@ -753,32 +753,35 @@
Food for Dummies
Here is a guide on basic food recipes and also how to not poison your customers accidentally.
+ Basics:
+ Knead an egg and some flour to make dough. Bake that to make a bun or flatten and cut it.
+
Burger:
- Put 1 meat and 1 flour into the microwave and turn it on. Then wait.
+ Put a bun and some meat into the microwave and turn it on. Then wait.
Bread:
- Put 3 flour into the microwave and then wait.
+ Put some dough and an egg into the microwave and then wait.
Waffles:
- Add 2 flour and 2 egg to the microwave and then wait.
+ Add two lumps of dough and 10u of sugar to the microwave and then wait.
Popcorn:
Add 1 corn to the microwave and wait.
Meat Steak:
- Put 1 meat, 1 unit of salt and 1 unit of pepper into the microwave and wait.
+ Put a slice of meat, 1 unit of salt and 1 unit of pepper into the microwave and wait.
Meat Pie:
- Put 1 meat and 2 flour into the microwave and wait.
+ Put a flattened piece of dough and some meat into the microwave and wait.
- Boiled Spagetti:
- Put 1 spagetti and 5 units of water into the microwave and wait.
+ Boiled Spaghetti:
+ Put the spaghetti (processed flour) and 5 units of water into the microwave and wait.
Donuts:
- Add 1 egg and 1 flour to the microwave and wait.
+ Add some dough and 5 units of sugar to the microwave and wait.
Fries:
- Add one potato to the processor and wait.
+ Add one potato to the processor, then bake them in the microwave.
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 13a823d4ab0..eb5ca2cf7d3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -19,9 +19,11 @@
New()
..()
sleep(2)
- for(var/i = 0, i < 3, i++)
- new /obj/item/weapon/reagent_containers/food/drinks/flour(src)
+ for(var/i = 0, i < 6, i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
+ for(var/i = 0, i < 3, i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
return
@@ -64,7 +66,7 @@
sleep(2)
for(var/i = 0, i < 5, i++)
new /obj/item/weapon/reagent_containers/food/drinks/milk(src)
- for(var/i = 0, i < 5, i++)
+ for(var/i = 0, i < 3, i++)
new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/weapon/storage/fancy/egg_box(src)
diff --git a/code/modules/destilery/main.dm b/code/modules/destilery/main.dm
index 429a29afdf1..e6944724aaf 100644
--- a/code/modules/destilery/main.dm
+++ b/code/modules/destilery/main.dm
@@ -45,10 +45,10 @@
switch(milled_item.type)
if(/obj/item/weapon/reagent_containers/food/snacks/grown/wheat) //Wheat becomes flour
- var/obj/item/weapon/reagent_containers/food/drinks/flour/F = new(src)
+ var/obj/item/weapon/reagent_containers/food/snacks/flour/F = new(src)
output += F
- if(/obj/item/weapon/reagent_containers/food/drinks/flour) //Flour is still flour
- var/obj/item/weapon/reagent_containers/food/drinks/flour/F = new(src)
+ if(/obj/item/weapon/reagent_containers/food/snacks/flour) //Flour is still flour
+ var/obj/item/weapon/reagent_containers/food/snacks/flour/F = new(src)
output += F
else
error = 1
@@ -117,7 +117,7 @@
return //Not done yet.
switch(fermenting_item.type)
- if(/obj/item/weapon/reagent_containers/food/drinks/flour) //Flour is still flour
+ if(/obj/item/weapon/reagent_containers/food/snacks/flour) //Flour is still flour
var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = new(src)
output += B
else
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 8228520cb86..1b5f6fac20b 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -34,7 +34,7 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
/datum/recipe/dionaroast
- reagents = list("radium" = 5)
+ reagents = list("sacid" = 5) //It dissolves the carapace. Still poisonous, though.
items = list(
/obj/item/weapon/holder/diona,
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
@@ -53,27 +53,34 @@ I said no!
*/
/datum/recipe/jellydonut
- reagents = list("berryjuice" = 5, "flour" = 5)
+ reagents = list("berryjuice" = 5, "sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
+ /obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
/datum/recipe/jellydonut/slime
- reagents = list("slimejelly" = 5, "flour" = 5)
+ reagents = list("slimejelly" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/dough
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
/datum/recipe/jellydonut/cherry
- reagents = list("cherryjelly" = 5, "flour" = 5)
+ reagents = list("cherryjelly" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/dough
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
/datum/recipe/donut
- reagents = list("flour" = 5)
+ reagents = list("sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
+ /obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
+/* what is this
/datum/recipe/human
//invalid recipe
make_food(var/obj/container as obj)
@@ -93,115 +100,114 @@ I said no!
HB.name = human_name+HB.name
HB.job = human_job
return HB
+*/
/datum/recipe/human/burger
- reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat/human
+ /obj/item/weapon/reagent_containers/food/snacks/meat/human,
+ /obj/item/weapon/reagent_containers/food/snacks/bun
)
result = /obj/item/weapon/reagent_containers/food/snacks/human/burger
-/*
+/* Duplicated by plainburger
/datum/recipe/monkeyburger
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
*/
/datum/recipe/plainburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/weapon/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/humanburger
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
/datum/recipe/syntiburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/weapon/syntiflesh
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
/datum/recipe/brainburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/brain
)
result = /obj/item/weapon/reagent_containers/food/snacks/brainburger
-/* NO FUN ALLOWED
/datum/recipe/roburger
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/robot_parts/head
)
result = /obj/item/weapon/reagent_containers/food/snacks/roburger
-*/
/datum/recipe/xenoburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/xenoburger
/datum/recipe/fishburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishburger
/datum/recipe/tofuburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofuburger
/datum/recipe/ghostburger
- reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/ectoplasm
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
+ /obj/item/weapon/ectoplasm //where do you even find this stuff
)
result = /obj/item/weapon/reagent_containers/food/snacks/ghostburger
/datum/recipe/clownburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/clothing/mask/gas/clown_hat,
/* /obj/item/weapon/reagent_containers/food/snacks/grown/banana, */
)
result = /obj/item/weapon/reagent_containers/food/snacks/clownburger
/datum/recipe/mimeburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
/obj/item/clothing/head/beret
)
result = /obj/item/weapon/reagent_containers/food/snacks/mimeburger
-/datum/recipe/waffles
- reagents = list("flour" = 10)
+/datum/recipe/hotdog
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/bun,
+ /obj/item/weapon/reagent_containers/food/snacks/sausage
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
+
+/datum/recipe/waffles
+ reagents = list("sugar" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
+ /obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/waffles
-/*
-/datum/recipe/faggot
- monkeymeat_amount = 1
- humanmeat_amount = 1
- creates = "/obj/item/weapon/reagent_containers/food/snacks/faggot"
-*/
-
/datum/recipe/donkpocket
- reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/faggot,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
+ /obj/item/weapon/reagent_containers/food/snacks/faggot
)
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
@@ -228,8 +234,10 @@ I said no!
return being_cooked
/datum/recipe/meatbread
- reagents = list("flour" = 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/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -240,8 +248,10 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
/datum/recipe/syntibread
- reagents = list("flour" = 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/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
@@ -251,17 +261,11 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
-/*
-/datum/recipe/meatbreadhuman
- flour_amount = 3
- humanmeat_amount = 3
- cheese_amount = 3
- creates = "/obj/item/weapon/reagent_containers/food/snacks/meatbread"
-*/
-
/datum/recipe/xenomeatbread
- reagents = list("flour" = 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/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
@@ -272,11 +276,11 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
/datum/recipe/bananabread
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /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/grown/banana,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread
@@ -291,9 +295,9 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/omelette
/datum/recipe/muffin
- reagents = list("milk" = 5, "flour" = 5)
+ reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin
@@ -306,96 +310,96 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm
/datum/recipe/soylenviridians
- reagents = list("flour" = 15)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
/datum/recipe/soylentgreen
- reagents = list("flour" = 15)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/meat/human,
/obj/item/weapon/reagent_containers/food/snacks/meat/human,
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
/datum/recipe/carrotcake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/grown/carrot //TODO: more carrots
+ /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/grown/carrot,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
/datum/recipe/cheesecake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /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/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
/datum/recipe/plaincake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /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/reagent_containers/food/snacks/sliceable/plaincake
/datum/recipe/meatpie
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/meat,
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatpie
/datum/recipe/tofupie
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofupie
/datum/recipe/xemeatpie
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
)
result = /obj/item/weapon/reagent_containers/food/snacks/xemeatpie
/datum/recipe/pie
- reagents = list("flour" = 10)
+ reagents = list("sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie
/datum/recipe/cherrypie
- reagents = list("flour" = 10)
+ reagents = list("sugar" = 10)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
)
result = /obj/item/weapon/reagent_containers/food/snacks/cherrypie
-/*
-/datum/recipe/berrypie
- reagents = list("berryjuice" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/berrypie
-*/
+
/datum/recipe/berryclafoutis
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/grown/berries,
)
result = /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
@@ -408,9 +412,9 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
/datum/recipe/chaosdonut
- reagents = list("frostoil" = 5, "capsaicin" = 5, "flour" = 5)
+ reagents = list("frostoil" = 5, "capsaicin" = 5, "sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
+ /obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
@@ -447,8 +451,10 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob
/datum/recipe/tofubread
- reagents = list("flour" = 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/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
@@ -473,8 +479,8 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries
/datum/recipe/cubancarp
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
)
@@ -488,17 +494,17 @@ I said no!
/datum/recipe/cookie
- reagents = list("milk" = 5, "flour" = 5)
+ reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
)
result = /obj/item/weapon/reagent_containers/food/snacks/cookie
/datum/recipe/fortunecookie
- reagents = list("flour" = 5)
+ reagents = list("sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/paper,
)
result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
@@ -532,8 +538,8 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
/datum/recipe/pizzamargherita
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
@@ -543,8 +549,8 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita
/datum/recipe/meatpizza
- reagents = list("flour" = 10)
items = list(
+ /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,
/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -554,8 +560,8 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/syntipizza
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
@@ -565,23 +571,26 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/mushroompizza
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
/datum/recipe/vegetablepizza
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
@@ -656,45 +665,46 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/coldchili
/datum/recipe/amanita_pie
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita,
)
result = /obj/item/weapon/reagent_containers/food/snacks/amanita_pie
/datum/recipe/plump_pie
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
)
result = /obj/item/weapon/reagent_containers/food/snacks/plump_pie
/datum/recipe/spellburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/monkeyburger,
/obj/item/clothing/head/wizard/fake,
)
result = /obj/item/weapon/reagent_containers/food/snacks/spellburger
/datum/recipe/spellburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/monkeyburger,
/obj/item/clothing/head/wizard,
)
result = /obj/item/weapon/reagent_containers/food/snacks/spellburger
/datum/recipe/bigbiteburger
- reagents = list("flour" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/monkeyburger,
/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/egg,
)
result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
/datum/recipe/enchiladas
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
@@ -702,23 +712,30 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
/datum/recipe/creamcheesebread
- reagents = list("flour" = 15)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
/datum/recipe/monkeysdelight
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 5)
+ reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/monkeycube,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
/datum/recipe/baguette
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 15)
+ reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/baguette
/datum/recipe/fishandchips
@@ -729,17 +746,20 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
/datum/recipe/birthdaycake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /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/clothing/head/cakehat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
/datum/recipe/bread
- reagents = list("flour" = 15)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
+ /obj/item/weapon/reagent_containers/food/snacks/egg
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
/datum/recipe/sandwich
@@ -774,10 +794,10 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/tomatosoup
/datum/recipe/rofflewaffles
- reagents = list("psilocybin" = 5, "flour" = 10)
+ reagents = list("psilocybin" = 5, "sugar" = 10)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
)
result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
@@ -826,9 +846,11 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
-/datum/recipe/spagetti
- reagents = list("flour" = 5)
- result= /obj/item/weapon/reagent_containers/food/snacks/spagetti
+/*/datum/recipe/spagetti We have the processor now
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/doughslice
+ )
+ result= /obj/item/weapon/reagent_containers/food/snacks/spagetti*/
/datum/recipe/boiledspagetti
reagents = list("water" = 5)
@@ -855,10 +877,9 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
/datum/recipe/poppypretzel
- reagents = list("flour" = 5)
items = list(
/obj/item/seeds/poppyseed,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
)
result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
@@ -883,23 +904,14 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
/datum/recipe/superbiteburger
- reagents = list("sodiumchloride" = 5, "blackpepper" = 5, "flour" = 15)
+ reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
+ /obj/item/weapon/reagent_containers/food/snacks/dough,
/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,
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
-
+ /obj/item/weapon/reagent_containers/food/snacks/boiledegg,
)
result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger
@@ -911,31 +923,35 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
/datum/recipe/applepie
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
)
result = /obj/item/weapon/reagent_containers/food/snacks/applepie
/datum/recipe/applecake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /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/grown/apple,
/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
/datum/recipe/slimeburger
- reagents = list("slimejelly" = 5, "flour" = 15)
- items = list()
+ reagents = list("slimejelly" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/slime
/datum/recipe/jellyburger
- reagents = list("cherryjelly" = 5, "flour" = 15)
- items = list()
+ reagents = list("cherryjelly" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/bun
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry
/datum/recipe/twobread
@@ -963,8 +979,11 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
/datum/recipe/orangecake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -974,8 +993,11 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake
/datum/recipe/limecake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -985,8 +1007,11 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
/datum/recipe/lemoncake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -996,8 +1021,11 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
/datum/recipe/chocolatecake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -1014,11 +1042,9 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/bloodsoup
-
/datum/recipe/slimesoup
reagents = list("water" = 10, "slimejelly" = 5)
- items = list(
- )
+ items = list()
result = /obj/item/weapon/reagent_containers/food/snacks/slimesoup
/datum/recipe/clownstears
@@ -1028,17 +1054,20 @@ I said no!
/obj/item/weapon/ore/clown,
)
result = /obj/item/weapon/reagent_containers/food/snacks/clownstears
-/*
+
/datum/recipe/boiledslimeextract
reagents = list("water" = 5)
items = list(
- /obj/item/slime_core,
+ /obj/item/slime_extract,
)
result = /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
-*/
+
/datum/recipe/braincake
- reagents = list("milk" = 5, "flour" = 15)
+ reagents = list("milk" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -1056,13 +1085,14 @@ I said no!
/datum/recipe/sausage
items = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot,
- /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sausage
/datum/recipe/fishfingers
- reagents = list("flour" = 10)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
)
@@ -1079,16 +1109,18 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/mysterysoup
/datum/recipe/pumpkinpie
- reagents = list("milk" = 5, "sugar" = 5, "flour" = 5)
+ reagents = list("milk" = 5, "sugar" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin,
/obj/item/weapon/reagent_containers/food/snacks/egg,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
/datum/recipe/plumphelmetbiscuit
- reagents = list("flour" = 5)
+ reagents = list("water" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
)
result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
@@ -1118,8 +1150,11 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup
/datum/recipe/appletart
- reagents = list("sugar" = 5, "milk" = 5, "flour" = 15)
+ reagents = list("sugar" = 5, "milk" = 5)
items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
+ /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple,
)
@@ -1159,7 +1194,10 @@ I said no!
return being_cooked
/datum/recipe/cracker
- reagents = list("flour" = 5, "sodiumchloride" = 1)
+ reagents = list("sodiumchloride" = 1)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/doughslice
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/cracker
/datum/recipe/stuffing
@@ -1176,3 +1214,52 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/stuffing,
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey
+
+
+//////////////////////////////////////////
+// bs12 food port stuff
+//////////////////////////////////////////
+
+/datum/recipe/taco
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/doughslice,
+ /obj/item/weapon/reagent_containers/food/snacks/cutlet,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/taco
+
+/datum/recipe/bun
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/dough
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/bun
+
+/datum/recipe/flatbread
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/flatbread
+
+/datum/recipe/faggot
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/rawfaggot
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/faggot
+
+/datum/recipe/cutlet
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/rawcutlet
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/cutlet
+
+/datum/recipe/fries
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/rawsticks
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/fries
+
+/datum/recipe/mint
+ reagents = list("sugar" = 5, "frostoil" = 5)
+ result = /obj/item/weapon/reagent_containers/food/snacks/mint
+
+
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 6e024f3bd75..bf8e2338131 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -902,7 +902,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/corn = list("cornoil" = 0),
- /obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
+ ///obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/ricestalk = list("rice" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/plastellium = list("plasticide" = 5),
@@ -1259,4 +1259,4 @@
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, amount)
if(!O.reagents.total_volume)
- remove_object(O)
+ remove_object(O)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 50d208ef2bc..baf235b3665 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2333,6 +2333,7 @@ datum
..()
return
+/* We're back to flour bags
flour
name = "flour"
id = "flour"
@@ -2350,6 +2351,7 @@ datum
src = null
if(!istype(T, /turf/space))
new /obj/effect/decal/cleanable/flour(T)
+*/
rice
name = "Rice"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 63ab84432f2..fe56d442e0a 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1549,7 +1549,7 @@ datum
name = "Space Beer"
id = "spacebeer"
result = "beer"
- required_reagents = list("flour" = 10)
+ required_reagents = list("cornoil" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 10
diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm
index 53bdeca5f84..07f98a014e6 100644
--- a/code/modules/reagents/reagent_containers/food.dm
+++ b/code/modules/reagents/reagent_containers/food.dm
@@ -8,5 +8,5 @@
/obj/item/weapon/reagent_containers/food/New()
..()
- src.pixel_x = rand(-5.0, 5) //Randomizes postion slightly.
- src.pixel_y = rand(-5.0, 5)
\ No newline at end of file
+ src.pixel_x = rand(-10.0, 10) //Randomizes postion
+ src.pixel_y = rand(-10.0, 10)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index fe49ad0262a..6d1635f10d1 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -167,6 +167,7 @@
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
+/* Flour is no longer a reagent
/obj/item/weapon/reagent_containers/food/drinks/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
@@ -178,6 +179,7 @@
reagents.add_reagent("flour", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
+*/
/obj/item/weapon/reagent_containers/food/drinks/soymilk
name = "SoyMilk"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 4476eb6d4f1..6d774f1d464 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -260,7 +260,7 @@
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"
- desc = "Nougat love it or hate it."
+ desc = "Nougat, love it or hate it."
icon_state = "candy"
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
@@ -283,7 +283,7 @@
/obj/item/weapon/reagent_containers/food/snacks/candy_corn
name = "candy corn"
- desc = "It's a handful of candy corn. Can be stored in a detective's hat."
+ desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
icon_state = "candy_corn"
filling_color = "#FFFCB0"
@@ -318,7 +318,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
name = "Chocolate Bar"
- desc = "Such, sweet, fattening food."
+ desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
filling_color = "#7D5F46"
@@ -331,7 +331,7 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg
name = "Chocolate Egg"
- desc = "Such, sweet, fattening food."
+ desc = "Such sweet, fattening food."
icon_state = "chocolateegg"
filling_color = "#7D5F46"
@@ -539,15 +539,16 @@
..()
reagents.add_reagent("nutriment", 2)
-/*/obj/item/weapon/reagent_containers/food/snacks/flour //Has been converted into a reagent. Use that instead of the item!
+/obj/item/weapon/reagent_containers/food/snacks/flour
name = "flour"
- desc = "Some flour"
+ desc = "A small bag filled with some flour."
icon_state = "flour"
New()
..()
- reagents.add_reagent("nutriment", 1)*/
+ reagents.add_reagent("nutriment", 1)
-/obj/item/weapon/reagent_containers/food/snacks/appendix //yes, this is the same as meat. I might do something different in future
+/obj/item/weapon/reagent_containers/food/snacks/appendix
+//yes, this is the same as meat. I might do something different in future
name = "appendix"
desc = "An appendix which looks perfectly healthy."
icon = 'icons/obj/surgery.dmi'
@@ -748,6 +749,14 @@
reagents.add_reagent("nutriment", 6)
bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/cheeseburger
+ name = "cheeseburger"
+ desc = "The cheese adds a good flavor."
+ icon_state = "cheeseburger"
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
@@ -790,7 +799,9 @@
New()
..()
- reagents.add_reagent("nanites", 2)
+ reagents.add_reagent("nutriment", 2)
+ if(prob(5))
+ reagents.add_reagent("nanites", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/roburgerbig
@@ -1195,7 +1206,7 @@
/obj/item/weapon/reagent_containers/food/snacks/fries
name = "Space Fries"
- desc = "AKA: French Fries, Freedom Fries, etc"
+ desc = "AKA: French Fries, Freedom Fries, etc."
icon_state = "fries"
trash = /obj/item/trash/plate
filling_color = "#EDDD00"
@@ -1219,7 +1230,7 @@
/obj/item/weapon/reagent_containers/food/snacks/spagetti
name = "Spagetti"
- desc = "Now thats a nice pasta!"
+ desc = "A bundle of raw spaghetti."
icon_state = "spagetti"
filling_color = "#EDDD00"
@@ -1901,7 +1912,7 @@
New()
..()
- reagents.add_reagent("nutriment", 40)
+ reagents.add_reagent("nutriment", 50)
bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
@@ -1917,7 +1928,7 @@
/obj/item/weapon/reagent_containers/food/snacks/applepie
name = "Apple Pie"
- desc = "A pie containing sweet sweet love...or apple."
+ desc = "A pie containing sweet sweet love... or apple."
icon_state = "applepie"
filling_color = "#E0EDC5"
@@ -1970,7 +1981,7 @@
New()
..()
reagents.add_reagent("cherryjelly", 5)
-/*
+
/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
name = "Boiled slime Core"
desc = "A boiled red thing."
@@ -1979,7 +1990,7 @@
..()
reagents.add_reagent("slimejelly", 5)
bitesize = 3
-*/
+
/obj/item/weapon/reagent_containers/food/snacks/mint
name = "mint"
desc = "it is only wafer thin."
@@ -2122,7 +2133,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
name = "xenomeatbread loaf"
- desc = "The culinary base of every self-respecting eloquen/tg/entleman. Extra Heretical."
+ desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical."
icon_state = "xenomeatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
slices_num = 5
@@ -2489,7 +2500,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita
name = "Margherita"
- desc = "The most cheezy pizza in galaxy"
+ desc = "The golden standard of pizzas."
icon_state = "pizzamargherita"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/margheritaslice
slices_num = 6
@@ -2501,14 +2512,14 @@
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice
name = "Margherita slice"
- desc = "A slice of the most cheezy pizza in galaxy"
+ desc = "A slice of the classic pizza."
icon_state = "pizzamargheritaslice"
filling_color = "#BAA14C"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
name = "Meatpizza"
- desc = "" //TODO:
+ desc = "A pizza with meat topping."
icon_state = "meatpizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
slices_num = 6
@@ -2520,7 +2531,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
name = "Meatpizza slice"
- desc = "A slice of " //TODO:
+ desc = "A slice of a meaty pizza."
icon_state = "meatpizzaslice"
filling_color = "#BAA14C"
bitesize = 2
@@ -2545,7 +2556,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
name = "Vegetable pizza"
- desc = "No one of Tomatos Sapiens were harmed during making this pizza"
+ desc = "No one of Tomato Sapiens were harmed during making this pizza"
icon_state = "vegetablepizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
slices_num = 6
@@ -2750,4 +2761,198 @@
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("radium", 2)
- bitesize = 2
\ No newline at end of file
+ bitesize = 2
+
+
+
+
+///////////////////////////////////////////
+// new old food stuff from bs12
+///////////////////////////////////////////
+
+// Flour + egg = dough
+/obj/item/weapon/reagent_containers/food/snacks/flour/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg))
+ new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
+ user << "You make some dough."
+ del(W)
+ del(src)
+
+// Egg + flour = dough
+/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/flour))
+ new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
+ user << "You make some dough."
+ del(W)
+ del(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/dough
+ name = "dough"
+ desc = "A piece of dough."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "dough"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+
+// Dough + rolling pin = flat dough
+/obj/item/weapon/reagent_containers/food/snacks/dough/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weapon/kitchen/rollingpin))
+ new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(src)
+ user << "You flatten the dough."
+ del(src)
+
+// slicable into 3xdoughslices
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
+ name = "flat dough"
+ desc = "A flattened dough."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "flat dough"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice
+ slices_num = 3
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/doughslice
+ name = "dough slice"
+ desc = "A building block of an impressive dish."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "doughslice"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/bun
+ name = "bun"
+ desc = "A base for any self-respecting burger."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "bun"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ // Bun + meatball = burger
+ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/faggot))
+ new /obj/item/weapon/reagent_containers/food/snacks/monkeyburger(src)
+ user << "You make a burger."
+ del(W)
+ del(src)
+
+ // Bun + cutlet = hamburger
+ else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/cutlet))
+ new /obj/item/weapon/reagent_containers/food/snacks/monkeyburger(src)
+ user << "You make a burger."
+ del(W)
+ del(src)
+
+ // Bun + sausage = hotdog
+ else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/sausage))
+ new /obj/item/weapon/reagent_containers/food/snacks/hotdog(src)
+ user << "You make a hotdog."
+ del(W)
+ del(src)
+
+// Burger + cheese wedge = cheeseburger
+/obj/item/weapon/reagent_containers/food/snacks/monkeyburger/attackby(obj/item/weapon/reagent_containers/food/snacks/cheesewedge/W as obj, mob/user as mob)
+ if(istype(W))// && !istype(src,/obj/item/weapon/reagent_containers/food/snacks/cheesewedge))
+ new /obj/item/weapon/reagent_containers/food/snacks/cheeseburger(src)
+ user << "You make a cheeseburger."
+ del(W)
+ del(src)
+ return
+ else
+ ..()
+
+// Human Burger + cheese wedge = cheeseburger
+/obj/item/weapon/reagent_containers/food/snacks/human/burger/attackby(obj/item/weapon/reagent_containers/food/snacks/cheesewedge/W as obj, mob/user as mob)
+ if(istype(W))
+ new /obj/item/weapon/reagent_containers/food/snacks/cheeseburger(src)
+ user << "You make a cheeseburger."
+ del(W)
+ del(src)
+ return
+ else
+ ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/taco
+ name = "taco"
+ desc = "Take a bite!"
+ icon_state = "taco"
+ bitesize = 3
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 7)
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
+ name = "raw cutlet"
+ desc = "A thin piece of raw meat."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "rawcutlet"
+ bitesize = 1
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/cutlet
+ name = "cutlet"
+ desc = "A tasty meat slice."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "cutlet"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/rawfaggot
+ name = "raw meatball"
+ desc = "A raw meatball."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "rawmeatball"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/hotdog
+ name = "hotdog"
+ desc = "Unrelated to dogs, maybe."
+ icon_state = "hotdog"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/flatbread
+ name = "flatbread"
+ desc = "Bland but filling."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "flatbread"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+
+// potato + knife = raw sticks
+/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weapon/kitchen/utensil/knife))
+ new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src)
+ user << "You cut the potato."
+ del(src)
+ else
+ ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/rawsticks
+ name = "raw potato sticks"
+ desc = "Raw fries, not very tasty."
+ icon = 'icons/obj/food_ingredients.dmi'
+ icon_state = "rawsticks"
+ bitesize = 2
+ New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+
diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
index 5a4dacbf05c..3728044cc8c 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
@@ -9,6 +9,15 @@
reagents.add_reagent("nutriment", 3)
src.bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weapon/kitchen/utensil/knife))
+ new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
+ new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
+ new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
+ user << "You cut the meat in thin strips."
+ del(src)
+ else
+ ..()
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh
name = "synthetic meat"
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index d2abe08214a..54610e3fe68 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ