diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 3ba5796fd5c..d3713135eae 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -41,11 +41,7 @@
/datum/supply_packs/food
name = "Food crate"
- 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/snacks/flour,
+ contains = list(/obj/item/weapon/reagent_containers/food/drinks/flour,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/storage/fancy/egg_box,
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 6c7380a1557..a6ae5d3efe2 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -163,9 +163,6 @@
if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg))
items_measures[display_name] = "egg"
items_measures_p[display_name] = "eggs"
- if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/flour))
- items_measures[display_name] = "cup of flour"
- items_measures_p[display_name] = "cups of flour"
if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu))
items_measures[display_name] = "tofu chunk"
items_measures_p[display_name] = "tofu chunks"
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index 0cfb53d0f84..30f896f8c87 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -25,10 +25,6 @@
del(what)
/* objs */
- wheat
- input = /obj/item/weapon/reagent_containers/food/snacks/grown/wheat
- output = /obj/item/weapon/reagent_containers/food/snacks/flour
-
meat
input = /obj/item/weapon/reagent_containers/food/snacks/meat
output = /obj/item/weapon/reagent_containers/food/snacks/faggot
@@ -57,9 +53,6 @@
input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
output = /obj/item/weapon/reagent_containers/food/snacks/soydope
- flour
- input = /obj/item/weapon/reagent_containers/food/snacks/flour
- output = /obj/item/weapon/reagent_containers/food/snacks/spagetti
/* mobs */
mob
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index bc73d9f5580..67c82a8f440 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -33,6 +33,16 @@
icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
+/obj/effect/decal/cleanable/flour
+ name = "flour"
+ desc = "It's still good. Four second rule!"
+ gender = PLURAL
+ density = 0
+ anchored = 1
+ layer = 2
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "flour"
+
/obj/effect/decal/cleanable/greenglow
name = "glowing goo"
desc = "Jeez. I hope that's not for lunch."
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 1e8e3207b11..13a823d4ab0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -19,8 +19,8 @@
New()
..()
sleep(2)
- for(var/i = 0, i < 16, i++)
- new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
+ for(var/i = 0, i < 3, i++)
+ new /obj/item/weapon/reagent_containers/food/drinks/flour(src)
new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
return
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 8e8e8903e91..f651e3349aa 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -40,16 +40,15 @@
*/
/datum/recipe/jellydonut
- reagents = list("berryjuice" = 5)
+ reagents = list("berryjuice" = 5, "flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
/datum/recipe/donut
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
@@ -75,8 +74,8 @@
return HB
/datum/recipe/human/burger
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/meat/human
)
result = /obj/item/weapon/reagent_containers/food/snacks/human/burger
@@ -91,22 +90,22 @@
*/
/datum/recipe/plainburger
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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/flour,
/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/flour,
/obj/item/brain
)
result = /obj/item/weapon/reagent_containers/food/snacks/brainburger
@@ -121,52 +120,51 @@
*/
/datum/recipe/xenoburger
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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/flour,
/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/flour,
/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/reagent_containers/food/snacks/flour,
/obj/item/weapon/ectoplasm
)
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/flour,
/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/flour,
/obj/item/clothing/head/beret
)
result = /obj/item/weapon/reagent_containers/food/snacks/mimeburger
/datum/recipe/waffles
+ 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/egg,
)
@@ -180,8 +178,8 @@
*/
/datum/recipe/donkpocket
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
)
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
@@ -208,10 +206,8 @@
return being_cooked
/datum/recipe/meatbread
+ 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,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -222,10 +218,8 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
@@ -244,10 +238,8 @@
*/
/datum/recipe/xenomeatbread
+ 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/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
@@ -258,11 +250,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
/datum/recipe/bananabread
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -280,10 +269,9 @@
result = /obj/item/weapon/reagent_containers/food/snacks/omelette
/datum/recipe/muffin
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin
@@ -296,30 +284,23 @@
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)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -328,11 +309,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
/datum/recipe/cheesecake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -342,11 +320,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
/datum/recipe/plaincake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -354,33 +329,29 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
)
result = /obj/item/weapon/reagent_containers/food/snacks/xemeatpie
/datum/recipe/pie
+ 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/grown/banana,
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie
@@ -394,9 +365,8 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/grown/berries,
)
result = /obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
@@ -409,9 +379,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
/datum/recipe/chaosdonut
- reagents = list("frostoil" = 5, "capsaicin" = 5, )
+ reagents = list("frostoil" = 5, "capsaicin" = 5, "flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
@@ -449,10 +418,8 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
@@ -477,8 +444,8 @@
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/flour,
/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
)
@@ -491,8 +458,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/popcorn
/datum/recipe/fortunecookie
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/paper,
)
@@ -527,9 +494,8 @@
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/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,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
@@ -539,9 +505,8 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -551,9 +516,8 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
@@ -563,9 +527,8 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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,
@@ -575,9 +538,8 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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,
@@ -656,37 +618,36 @@
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/flour,
/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/flour,
- /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/plump_pie
/datum/recipe/spellburger
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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/flour,
/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/flour,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -703,31 +664,23 @@
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)
+ reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkeycube,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
/datum/recipe/baguette
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
- 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,
- )
+ reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 15)
result = /obj/item/weapon/reagent_containers/food/snacks/baguette
/datum/recipe/fishandchips
@@ -738,11 +691,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
/datum/recipe/birthdaycake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -751,11 +701,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
/datum/recipe/bread
- 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,
- )
+ reagents = list("flour" = 15)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
/datum/recipe/sandwich
@@ -790,10 +736,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/tomatosoup
/datum/recipe/rofflewaffles
- reagents = list("psilocybin" = 5)
+ reagents = list("psilocybin" = 5, "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/egg,
)
@@ -837,6 +781,9 @@
)
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/boiledspagetti
reagents = list("water" = 5)
@@ -855,8 +802,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
/datum/recipe/poppypretzel
+ reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/seeds/poppyseed,
/obj/item/weapon/reagent_containers/food/snacks/egg,
)
@@ -883,11 +830,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
/datum/recipe/superbiteburger
- reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
+ reagents = list("sodiumchloride" = 5, "blackpepper" = 5, "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,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -914,19 +858,15 @@
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/flour,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -936,9 +876,9 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
/datum/recipe/metroidburger
- reagents = list("metroid" = 5)
+ reagents = list("metroid" = 5, "flour" = 15)
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/metroidburger
@@ -959,11 +899,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/metroidsandwich
/datum/recipe/orangecake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -973,11 +910,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake
/datum/recipe/limecake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -987,11 +921,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
/datum/recipe/lemoncake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -1001,11 +932,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
/datum/recipe/chocolatecake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -1045,11 +973,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/boiledmetroidcore
/datum/recipe/braincake
- reagents = list("milk" = 5)
+ reagents = list("milk" = 5, "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/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -1072,9 +997,8 @@
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,
)
@@ -1091,17 +1015,16 @@
result = /obj/item/weapon/reagent_containers/food/snacks/mysterysoup
/datum/recipe/pumpkinpie
- reagents = list("milk" = 5, "sugar" = 5)
+ reagents = list("milk" = 5, "sugar" = 5, "flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin,
- /obj/item/weapon/reagent_containers/food/snacks/flour,
/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)
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
@@ -1131,9 +1054,8 @@
result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup
/datum/recipe/appletart
- reagents = list("sugar" = 5, "milk" = 5)
+ reagents = list("sugar" = 5, "milk" = 5, "flour" = 15)
items = list(
- /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,
)
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index c9f58c00a59..8269300a730 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -696,6 +696,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" = 0),
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index ab36605a8d6..dcab4200415 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2077,6 +2077,23 @@ datum
..()
return
+ flour
+ name = "flour"
+ id = "flour"
+ description = "This is what you rub all over yourself to pretend to be a ghost."
+ reagent_state = SOLID
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#FFFFFF" // rgb: 0, 0, 0
+
+ on_mob_life(var/mob/living/M as mob)
+ M.nutrition += nutriment_factor
+ ..()
+ return
+
+ reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/flour(T)
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 7e3886aa804..bf855fe698c 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -998,6 +998,14 @@ datum
required_catalysts = list("enzyme" = 5)
result_amount = 10
+ spacebeer
+ name = "Space Beer"
+ id = "spacebeer"
+ result = "beer"
+ required_reagents = list("flour" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
+
vodka
name = "Vodka"
id = "vodka"
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index b39011bc0ce..52236d5badd 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -156,6 +156,18 @@
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
+/obj/item/weapon/reagent_containers/food/drinks/flour
+ name = "flour sack"
+ desc = "A big bag of flour. Good for baking!"
+ icon = 'icons/obj/food.dmi'
+ icon_state = "flour"
+ item_state = "flour"
+ New()
+ ..()
+ 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"
desc = "It's soy milk. White and nutritious goodness!"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 06003a4b6ca..f792447bb5b 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -461,13 +461,13 @@
..()
reagents.add_reagent("nutriment", 2)
-/obj/item/weapon/reagent_containers/food/snacks/flour
+/*/obj/item/weapon/reagent_containers/food/snacks/flour //Has been converted into a reagent. Use that instead of the item!
name = "flour"
desc = "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
name = "appendix"
diff --git a/html/changelog.html b/html/changelog.html
index 36cfa4cc839..0605dae9118 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -49,6 +49,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
+
+
6 September 2012
+
Cheridan updated:
+
+ - -Changes flour from an item to a container-held reagent. All recipes have been updated to use 5 units of reagent flour for every item required previously. This has a few advantages: The 16(!) sacks of flour previously in the kitchen cabinet have been condensed to an equivalent 3 sacks. Beer is now brewable with universal enzyme, and converting lots of wheat into flour should be less tedious. Also, flour grenades, etc. Because of this, flour is now obtained from the all-in-one blender rather than the processor, and spaghetti noodles are made with 5 units of flour in the microwave.
+
+
6 September 2012
Giacom updated:
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 39bbf9e3cb5..7d42071f677 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ