Resolving some convos.

Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
This commit is contained in:
Winter Flare
2020-02-21 07:16:39 -05:00
parent 00d66c9b91
commit 79967b0ac5
13 changed files with 249 additions and 248 deletions
@@ -294,7 +294,7 @@
icon_state = "bowl"
reagent_flags = OPENCONTAINER
materials = list(MAT_GLASS = 500)
w_class = WEIGHT_CLASS_SMALL
w_class = WEIGHT_CLASS_NORMAL
/obj/item/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params)
if(istype(I, /obj/item/reagent_containers/food/snacks))
@@ -85,6 +85,20 @@
tastes = list("cake" = 4, "cream cheese" = 3)
foodtype = GRAIN | DAIRY
/obj/item/reagent_containers/food/snacks/store/cake/brioche
name = "brioche cake"
desc = "A ring of sweet, glazed buns."
icon_state = "briochecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
slices_num = 6
bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
/obj/item/reagent_containers/food/snacks/cakeslice/brioche
name = "brioche cake slice"
desc = "Delicious sweet-bread. Who needs anything else?"
icon_state = "briochecake_slice"
filling_color = "#FFD700"
/obj/item/reagent_containers/food/snacks/cakeslice/cheese
name = "cheese cake slice"
desc = "Slice of pure cheestisfaction."
@@ -101,7 +101,7 @@
desc = "A fried egg with a side of bacon. Delicious!"
icon_state = "baconegg"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 1
bitesize = 2
filling_color = "#FFFFF0"
tastes = list("egg" = 2, "bacon" = 2, "salt" = 1, "pepper" = 1)
foodtype = MEAT | FRIED | BREAKFAST
@@ -150,7 +150,17 @@
desc = "There is only one egg on this, how rude."
icon_state = "benedict"
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
w_class = WEIGHT_CLASS_NORMAL
trash = /obj/item/trash/plate
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
foodtype = MEAT | BREAKFAST
/obj/item/reagent_containers/food/snacks/scotchegg
name = "scotch egg"
desc = "A boiled egg wrapped in a delicious, seasoned meatball."
icon_state = "scotchegg"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 3
filling_color = "#FFFFF0"
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
@@ -685,29 +685,6 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2)
filling_color = "#A0522D"
/obj/item/reagent_containers/food/snacks/store/cake/brioche
name = "brioche cake"
desc = "A ring of sweet, glazed buns."
icon_state = "briochecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche
slices_num = 6
bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
/obj/item/reagent_containers/food/snacks/cakeslice/brioche
name = "brioche cake slice"
desc = "Delicious sweet-bread. Who needs anything else?"
icon_state = "briochecake_slice"
filling_color = "#FFD700"
/obj/item/reagent_containers/food/snacks/scotchegg
name = "scotch egg"
desc = "A boiled egg wrapped in a delicious, seasoned meatball."
icon_state = "scotchegg"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 3
filling_color = "#FFFFF0"
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
/obj/item/reagent_containers/food/snacks/soup/mammi
name = "Mammi"
desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
@@ -4,7 +4,7 @@
icon = 'icons/obj/food/soupsalad.dmi'
trash = /obj/item/reagent_containers/glass/bowl
bitesize = 3
w_class = WEIGHT_CLASS_SMALL
w_class = WEIGHT_CLASS_NORMAL
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("leaves" = 1)
foodtype = VEGETABLES
@@ -1,5 +1,5 @@
/obj/item/reagent_containers/food/snacks/soup
w_class = WEIGHT_CLASS_SMALL
w_class = WEIGHT_CLASS_NORMAL
icon = 'icons/obj/food/soupsalad.dmi'
trash = /obj/item/reagent_containers/glass/bowl
bitesize = 5
@@ -80,6 +80,15 @@
result = /obj/item/reagent_containers/food/snacks/store/cake/birthday
subcategory = CAT_CAKE
/datum/crafting_recipe/food/briochecake
name = "Brioche cake"
reqs = list(
/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
/datum/reagent/consumable/sugar = 2
)
result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
subcategory = CAT_CAKE
/datum/crafting_recipe/food/carrotcake
name = "Carrot cake"
reqs = list(
@@ -59,4 +59,15 @@
/obj/item/reagent_containers/food/snacks/grown/corn = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/eggbowl
subcategory = CAT_EGG
/datum/crafting_recipe/food/scotchegg
name = "Scotch egg"
reqs = list(
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
/obj/item/reagent_containers/food/snacks/boiledegg = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1
)
result = /obj/item/reagent_containers/food/snacks/scotchegg
subcategory = CAT_EGG
@@ -254,6 +254,110 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha
////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
/datum/crafting_recipe/food/muffin
time = 15
name = "Muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/berrymuffin
name = "Berry muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/berries = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin/berry
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/booberrymuffin
name = "Booberry muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/berries = 1,
/obj/item/ectoplasm = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin/booberry
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/poppymuffin
name = "Poppy muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
/obj/item/seeds/poppy = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin/poppy
subcategory = CAT_PASTRY
////////////////////////////////////////////CUPCAKES////////////////////////////////////////////
/datum/crafting_recipe/food/cherrycupcake
name = "Cherry cupcake"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/cherries = 1
)
result = /obj/item/reagent_containers/food/snacks/cherrycupcake
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/bluecherrycupcake
name = "Blue cherry cupcake"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
)
result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/strawberrycupcake
name = "Strawberry cherry cupcake"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/strawberry = 1
)
result = /obj/item/reagent_containers/food/snacks/strawberrycupcake
subcategory = CAT_PASTRY
////////////////////////////////////////////COOKIES////////////////////////////////////////////
/datum/crafting_recipe/food/raisincookie
name = "Raisin cookie"
reqs = list(
/obj/item/reagent_containers/food/snacks/no_raisin = 1,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/oat = 1
)
result = /obj/item/reagent_containers/food/snacks/raisincookie
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/oatmealcookie
name = "Oatmeal cookie"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/oat = 1
)
result = /obj/item/reagent_containers/food/snacks/oatmealcookie
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/sugarcookie
time = 15
name = "Sugar cookie"
reqs = list(
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/reagent_containers/food/snacks/sugarcookie
subcategory = CAT_PASTRY
////////////////////////////////////////////////WAFFLES AND PANCAKES////////////////////////////////////////////////
/datum/crafting_recipe/food/waffles
@@ -320,7 +424,6 @@ datum/crafting_recipe/food/donut/meat
result = /obj/item/reagent_containers/food/snacks/pancakes/chocolatechip
subcategory = CAT_PASTRY
////////////////////////////////////////////////DONKPOCCKETS////////////////////////////////////////////////
/datum/crafting_recipe/food/donkpocket
@@ -343,108 +446,8 @@ datum/crafting_recipe/food/donut/meat
result = /obj/item/reagent_containers/food/snacks/dankpocket
subcategory = CAT_PASTRY
////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
/datum/crafting_recipe/food/muffin
time = 15
name = "Muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/berrymuffin
name = "Berry muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/berries = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin/berry
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/booberrymuffin
name = "Booberry muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/berries = 1,
/obj/item/ectoplasm = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin/booberry
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/poppymuffin
name = "Poppy muffin"
reqs = list(
/datum/reagent/consumable/milk = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
/obj/item/seeds/poppy = 1
)
result = /obj/item/reagent_containers/food/snacks/muffin/poppy
subcategory = CAT_PASTRY
////////////////////////////////////////////OTHER////////////////////////////////////////////
/datum/crafting_recipe/food/cherrycupcake
name = "Cherry cupcake"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/cherries = 1
)
result = /obj/item/reagent_containers/food/snacks/cherrycupcake
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/bluecherrycupcake
name = "Blue cherry cupcake"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/bluecherries = 1
)
result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/strawberrycupcake
name = "Strawberry cherry cupcake"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/strawberry = 1
)
result = /obj/item/reagent_containers/food/snacks/strawberrycupcake
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/raisincookie
name = "Raisin cookie"
reqs = list(
/obj/item/reagent_containers/food/snacks/no_raisin = 1,
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/oat = 1
)
result = /obj/item/reagent_containers/food/snacks/raisincookie
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/oatmealcookie
name = "Oatmeal cookie"
reqs = list(
/obj/item/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/reagent_containers/food/snacks/grown/oat = 1
)
result = /obj/item/reagent_containers/food/snacks/oatmealcookie
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/sugarcookie
time = 15
name = "Sugar cookie"
reqs = list(
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/pastrybase = 1
)
result = /obj/item/reagent_containers/food/snacks/sugarcookie
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/chococornet
name = "Choco cornet"
reqs = list(
@@ -474,6 +477,25 @@ datum/crafting_recipe/food/donut/meat
result = /obj/item/reagent_containers/food/snacks/honeybun
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/hotcrossbun
name = "Hot-Cross Bun"
reqs = list(
/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
/datum/reagent/consumable/sugar = 1
)
result = /obj/item/reagent_containers/food/snacks/hotcrossbun
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/mammi
name = "Mammi"
reqs = list(
/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
/datum/reagent/consumable/milk = 5
)
result = /obj/item/reagent_containers/food/snacks/soup/mammi
subcategory = CAT_PASTRY
/datum/crafting_recipe/food/poppypretzel
time = 15
name = "Poppy pretzel"
@@ -493,3 +515,78 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
subcategory = CAT_PASTRY
////////////////////////////////////////////SWEETS////////////////////////////////////////////
/datum/crafting_recipe/food/candiedapple
name = "Candied apple"
reqs = list(/datum/reagent/water = 5,
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/grown/apple = 1
)
result = /obj/item/reagent_containers/food/snacks/candiedapple
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/chococoin
name = "Choco coin"
reqs = list(
/obj/item/coin = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/reagent_containers/food/snacks/chococoin
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/chocoorange
name = "Choco orange"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/reagent_containers/food/snacks/chocoorange
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/chocolatebunny
name = "Chocolate bunny"
reqs = list(
/datum/reagent/consumable/sugar = 2,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1
)
result = /obj/item/reagent_containers/food/snacks/chocolatebunny
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/chocolatestrawberry
name = "Chocolate Strawberry"
reqs = list(
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
/obj/item/reagent_containers/food/snacks/grown/strawberry = 1
)
result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/fudgedice
name = "Fudge dice"
reqs = list(
/obj/item/dice = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/reagent_containers/food/snacks/fudgedice
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/honeybar
name = "Honey nut bar"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/oat = 1,
/datum/reagent/consumable/honey = 5
)
result = /obj/item/reagent_containers/food/snacks/honeybar
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/spiderlollipop
name = "Spider Lollipop"
reqs = list(/obj/item/stack/rods = 1,
/datum/reagent/consumable/sugar = 5,
/datum/reagent/water = 5,
/obj/item/reagent_containers/food/snacks/spiderling = 1
)
result = /obj/item/reagent_containers/food/snacks/spiderlollipop
subcategory = CAT_SWEETS
@@ -1,117 +0,0 @@
// see code/module/crafting/table.dm
// SWEETS
/datum/crafting_recipe/food/candiedapple
name = "Candied apple"
reqs = list(/datum/reagent/water = 5,
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/grown/apple = 1
)
result = /obj/item/reagent_containers/food/snacks/candiedapple
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/chococoin
name = "Choco coin"
reqs = list(
/obj/item/coin = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/reagent_containers/food/snacks/chococoin
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/chocoorange
name = "Choco orange"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/reagent_containers/food/snacks/chocoorange
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/chocolatestrawberry
name = "Chocolate Strawberry"
reqs = list(
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
/obj/item/reagent_containers/food/snacks/grown/strawberry = 1
)
result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/fudgedice
name = "Fudge dice"
reqs = list(
/obj/item/dice = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
)
result = /obj/item/reagent_containers/food/snacks/fudgedice
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/honeybar
name = "Honey nut bar"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/oat = 1,
/datum/reagent/consumable/honey = 5
)
result = /obj/item/reagent_containers/food/snacks/honeybar
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/spiderlollipop
name = "Spider Lollipop"
reqs = list(/obj/item/stack/rods = 1,
/datum/reagent/consumable/sugar = 5,
/datum/reagent/water = 5,
/obj/item/reagent_containers/food/snacks/spiderling = 1
)
result = /obj/item/reagent_containers/food/snacks/spiderlollipop
subcategory = CAT_SWEETS
//Easter Stuff
/datum/crafting_recipe/food/chocolatebunny
name = "Chocolate bunny"
reqs = list(
/datum/reagent/consumable/sugar = 2,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1
)
result = /obj/item/reagent_containers/food/snacks/chocolatebunny
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/hotcrossbun
name = "Hot-Cross Bun"
reqs = list(
/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
/datum/reagent/consumable/sugar = 1
)
result = /obj/item/reagent_containers/food/snacks/hotcrossbun
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/briochecake
name = "Brioche cake"
reqs = list(
/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
/datum/reagent/consumable/sugar = 2
)
result = /obj/item/reagent_containers/food/snacks/store/cake/brioche
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/scotchegg
name = "Scotch egg"
reqs = list(
/datum/reagent/consumable/sodiumchloride = 1,
/datum/reagent/consumable/blackpepper = 1,
/obj/item/reagent_containers/food/snacks/boiledegg = 1,
/obj/item/reagent_containers/food/snacks/faggot = 1
)
result = /obj/item/reagent_containers/food/snacks/scotchegg
subcategory = CAT_SWEETS
/datum/crafting_recipe/food/mammi
name = "Mammi"
reqs = list(
/obj/item/reagent_containers/food/snacks/store/bread/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
/datum/reagent/consumable/milk = 5
)
result = /obj/item/reagent_containers/food/snacks/soup/mammi
subcategory = CAT_SWEETS