Skip to content

Commit

Permalink
pies
Browse files Browse the repository at this point in the history
  • Loading branch information
NPC1314 committed Dec 11, 2024
1 parent 69f7164 commit eb77a32
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 76 deletions.
48 changes: 48 additions & 0 deletions code/datums/pollutants/foods.dm
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,51 @@
/datum/pollutant/food/fried_crow
name = "fried crows"
scent = "fried crows"

/datum/pollutant/food/oatmeal
name = "boiled oats"
scent = "boiled oats"

/datum/pollutant/food/potato_stew
name = "potato stew"
scent = "potato stew"

/datum/pollutant/food/onion_stew
name = "onion soup"
scent = "onion soup"

/datum/pollutant/food/cabbage_stew
name = "cabbage soup"
scent = "cabbage soup"

/datum/pollutant/food/turnip_stew
name = "turnip soup"
scent = "turnip soup"

/datum/pollutant/food/fish_stew
name = "fish stew"
scent = "fish stew"

/datum/pollutant/food/chicken_stew
name = "chicken stew"
scent = "chicken stew"

/datum/pollutant/food/meat_stew
name = "meat stew"
scent = "meat stew"

/datum/pollutant/food/egg_soup
name = "egg soup"
scent = "egg soup"

/datum/pollutant/food/truffle_stew
name = "truffle stew"
scent = "truffle stew"

/datum/pollutant/food/cheese_soup
name = "cheese soup"
scent = "cheese soup"

/datum/pollutant/food/druqks
name = "acrid air"
scent = "acrid air"
74 changes: 0 additions & 74 deletions code/modules/food_and_drinks/food/snacks/dough.dm
Original file line number Diff line number Diff line change
@@ -1,80 +1,6 @@


/////////////////// Dough Ingredients ////////////////////////

/obj/item/reagent_containers/food/snacks/dough
name = "dough"
desc = ""
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "dough"
cooked_type = /obj/item/reagent_containers/food/snacks/store/bread/plain
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN


// Dough + rolling pin = flat dough
/obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/rogueweapon/mace/woodclub/rollingpin))
if(isturf(loc))
new /obj/item/reagent_containers/food/snacks/flatdough(loc)
to_chat(user, "<span class='notice'>I flatten [src].</span>")
qdel(src)
else
to_chat(user, "<span class='warning'>I need to put [src] on a surface to roll it out!</span>")
else
..()


// sliceable into 3xdoughslices
/obj/item/reagent_containers/food/snacks/flatdough
name = "flat dough"
desc = ""
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flat dough"
slice_path = /obj/item/reagent_containers/food/snacks/doughslice
slices_num = 3
cooked_type = /obj/item/reagent_containers/food/snacks/pizzabread
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("dough" = 1)
foodtype = GRAIN

/obj/item/reagent_containers/food/snacks/pizzabread
name = "pizza bread"
desc = ""
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pizzabread"
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pizza
list_reagents = list(/datum/reagent/consumable/nutriment = 7)
w_class = WEIGHT_CLASS_NORMAL
tastes = list("bread" = 1)
foodtype = GRAIN


/obj/item/reagent_containers/food/snacks/doughslice
name = "dough slice"
desc = ""
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "doughslice"
cooked_type = /obj/item/reagent_containers/food/snacks/bun
filling_color = "#CD853F"
tastes = list("dough" = 1)
foodtype = GRAIN


/obj/item/reagent_containers/food/snacks/bun
name = "bun"
desc = ""
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bun"
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/burger
filling_color = "#CD853F"
tastes = list("bun" = 1) // the bun tastes of bun.
foodtype = GRAIN

/obj/item/reagent_containers/food/snacks/cakebatter
name = "cake batter"
desc = ""
Expand Down
4 changes: 2 additions & 2 deletions code/modules/food_and_drinks/recipes/food_mixtures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@
id = "dough"
required_reagents = list(/datum/reagent/water = 10, /datum/reagent/consumable/flour = 15)
mix_message = "The ingredients form a dough."

/*
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/dough(location)

*/
/datum/chemical_reaction/cakebatter
name = "Cake Batter"
id = "cakebatter"
Expand Down
Binary file modified modular/Neu_Food/icons/food.dmi
Binary file not shown.

0 comments on commit eb77a32

Please sign in to comment.