cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Better slices (#27807)

Browse Source 
* Slices have a base class /food/slice

* Refactor

* Small fix

* Adds default reagent for empy slices

* Looks good

* adds_list_reagents

* "Reverted snake_case_remap files to state from original commit

* I don't know how to resolve merge conflicts :)

---------

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
This commit is contained in:
Drsmail
2025-01-25 22:36:04 +03:00
committed by GitHub
parent 99d18c8513
commit 754a868650
40 changed files with 431 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
+1 -1
View File
@@ -423,7 +423,7 @@
M.update_icons()
// Supply them with some chow. How generous is the Syndicate?
var/obj/item/food/breadslice/food = new(get_turf(M))
var/obj/item/food/sliced/bread/food = new(get_turf(M)) // TODO 545
food.name = "stale bread"
food.desc = "Looks like your captors care for their prisoners as much as their bread."
food.trash = null
code/modules/food_and_drinks/food/customizables.dm
+1 -1
View File
@@ -6,7 +6,7 @@ do {\
qdel(src);\
} while(FALSE)
/obj/item/food/breadslice/attackby__legacy__attackchain(obj/item/W, mob/user, params)
/obj/item/food/sliced/bread/attackby__legacy__attackchain(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/sandwich)
return
code/modules/food_and_drinks/food/foods/baked_goods.dm
+87 -60
View File
@@ -10,7 +10,7 @@
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "carrotcake"
slice_path = /obj/item/food/carrotcakeslice
slice_path = /obj/item/food/sliced/carrot_cake
slices_num = 5
bitesize = 3
filling_color = "#FFD675"
@@ -18,13 +18,14 @@
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/carrotcakeslice
/obj/item/food/sliced/carrot_cake
name = "carrot cake slice"
desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "carrotcake_slice"
trash = /obj/item/trash/plate
filling_color = "#FFD675"
list_reagents = list("nutriment" = 4, "oculine" = 2, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -34,7 +35,7 @@
desc = "A squishy cake-thing."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "braincake"
slice_path = /obj/item/food/braincakeslice
slice_path = /obj/item/food/sliced/brain_cake
slices_num = 5
filling_color = "#E6AEDB"
bitesize = 3
@@ -42,13 +43,14 @@
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/braincakeslice
/obj/item/food/sliced/brain_cake
name = "brain cake slice"
desc = "Lemme tell you something about brains. THEY'RE DELICIOUS."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "braincakeslice"
trash = /obj/item/trash/plate
filling_color = "#E6AEDB"
list_reagents = list("protein" = 2, "nutriment" = 2, "mannitol" = 2, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -57,7 +59,7 @@
desc = "DANGEROUSLY cheesy."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "cheesecake"
slice_path = /obj/item/food/cheesecakeslice
slice_path = /obj/item/food/sliced/cheese_cake
slices_num = 5
filling_color = "#FAF7AF"
bitesize = 3
@@ -65,13 +67,14 @@
tastes = list("cake" = 4, "cream cheese" = 3)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/cheesecakeslice
/obj/item/food/sliced/cheese_cake
name = "cheese cake slice"
desc = "Slice of pure cheestisfaction."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "cheesecake_slice"
trash = /obj/item/trash/plate
filling_color = "#FAF7AF"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 4, "cream cheese" = 3)
goal_difficulty = FOOD_GOAL_EASY
@@ -80,7 +83,7 @@
desc = "A plain cake, not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plaincake"
slice_path = /obj/item/food/plaincakeslice
slice_path = /obj/item/food/sliced/plain_cake
slices_num = 5
bitesize = 3
filling_color = "#F7EDD5"
@@ -88,13 +91,14 @@
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/plaincakeslice
/obj/item/food/sliced/plain_cake
name = "plain cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plaincake_slice"
trash = /obj/item/trash/plate
filling_color = "#F7EDD5"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -103,7 +107,7 @@
desc = "A cake with added orange."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "orangecake"
slice_path = /obj/item/food/orangecakeslice
slice_path = /obj/item/food/sliced/orange_cake
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
@@ -111,13 +115,14 @@
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/orangecakeslice
/obj/item/food/sliced/orange_cake
name = "orange cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "orangecake_slice"
trash = /obj/item/trash/plate
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -126,7 +131,7 @@
desc = "A cake with added bananas."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "bananacake"
slice_path = /obj/item/food/bananacakeslice
slice_path = /obj/item/food/sliced/banana_cake
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
@@ -134,13 +139,14 @@
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/bananacakeslice
/obj/item/food/sliced/banana_cake
name = "banana cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "bananacake_slice"
trash = /obj/item/trash/plate
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -150,20 +156,21 @@
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "limecake"
bitesize = 3
slice_path = /obj/item/food/limecakeslice
slice_path = /obj/item/food/sliced/lime_cake
slices_num = 5
filling_color = "#CBFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/limecakeslice
/obj/item/food/sliced/lime_cake
name = "lime cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "limecake_slice"
trash = /obj/item/trash/plate
filling_color = "#CBFA8E"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -172,7 +179,7 @@
desc = "A cake with added lemon."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "lemoncake"
slice_path = /obj/item/food/lemoncakeslice
slice_path = /obj/item/food/sliced/lemon_cake
slices_num = 5
bitesize = 3
filling_color = "#FAFA8E"
@@ -180,13 +187,14 @@
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/lemoncakeslice
/obj/item/food/sliced/lemon_cake
name = "lemon cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "lemoncake_slice"
trash = /obj/item/trash/plate
filling_color = "#FAFA8E"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -195,7 +203,7 @@
desc = "A cake with added chocolate."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "chocolatecake"
slice_path = /obj/item/food/chocolatecakeslice
slice_path = /obj/item/food/sliced/chocolate_cake
slices_num = 5
bitesize = 3
filling_color = "#805930"
@@ -203,13 +211,14 @@
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/chocolatecakeslice
/obj/item/food/sliced/chocolate_cake
name = "chocolate cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "chocolatecake_slice"
trash = /obj/item/trash/plate
filling_color = "#805930"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
goal_difficulty = FOOD_GOAL_EASY
@@ -218,7 +227,7 @@
desc = "Happy Birthday..."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "birthdaycake"
slice_path = /obj/item/food/birthdaycakeslice
slice_path = /obj/item/food/sliced/birthday_cake
slices_num = 5
filling_color = "#FFD6D6"
bitesize = 3
@@ -226,13 +235,14 @@
tastes = list("cake" = 5, "sweetness" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/birthdaycakeslice
/obj/item/food/sliced/birthday_cake
name = "birthday cake slice"
desc = "A slice of your birthday!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "birthdaycakeslice"
trash = /obj/item/trash/plate
filling_color = "#FFD6D6"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -241,7 +251,7 @@
desc = "A cake centered with Apple."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "applecake"
slice_path = /obj/item/food/applecakeslice
slice_path = /obj/item/food/sliced/apple_cake
slices_num = 5
bitesize = 3
filling_color = "#EBF5B8"
@@ -249,13 +259,14 @@
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/applecakeslice
/obj/item/food/sliced/apple_cake
name = "apple cake slice"
desc = "A slice of heavenly cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "applecakeslice"
trash = /obj/item/trash/plate
filling_color = "#EBF5B8"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -264,21 +275,22 @@
desc = "A cake made for angels and chaplains alike! Contains holy water."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "holy_cake"
slice_path = /obj/item/food/holy_cake_slice
slice_path = /obj/item/food/sliced/holy_cake
slices_num = 5
bitesize = 3
filling_color = "#ffffff"
list_reagents = list("nutriment" = 1, "vitamin" = 3, "holywater" = 10)
list_reagents = list("nutriment" = 5, "vitamin" = 5, "holywater" = 10)
tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/holy_cake_slice
/obj/item/food/sliced/holy_cake
name = "holy cake slice"
desc = "A slice of heavenly cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "holy_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#ffffff"
list_reagents = list("nutriment" = 1, "vitamin" = 1, "holywater" = 2)
tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -287,7 +299,7 @@
desc = "A chocolate cake with five strawberries on top. For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "liars_cake"
slice_path = /obj/item/food/liars_slice
slice_path = /obj/item/food/sliced/liars
slices_num = 5
bitesize = 3
filling_color = "#240606c7"
@@ -295,7 +307,7 @@
tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/liars_slice
/obj/item/food/sliced/liars
name = "strawberry chocolate cake slice"
desc = "Just a slice of cake with five strawberries on top. \
For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF."
@@ -303,6 +315,7 @@
icon_state = "liars_slice"
trash = /obj/item/trash/plate
filling_color = "#ffffff"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "cocoa" = 1)
tastes = list("strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3)
goal_difficulty = FOOD_GOAL_EASY
@@ -311,7 +324,7 @@
desc = "A plain cake, filled with assortment of blackberries and strawberries!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "vanilla_berry_cake"
slice_path = /obj/item/food/vanilla_berry_cake_slice
slice_path = /obj/item/food/sliced/vanilla_berry_cake
slices_num = 5
bitesize = 3
filling_color = "#f0e3e3c7"
@@ -319,13 +332,14 @@
tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/vanilla_berry_cake_slice
/obj/item/food/sliced/vanilla_berry_cake
name = "blackberry and strawberry vanilla cake slice"
desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "vanilla_berry_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#ffffff"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "vanilla" = 1)
tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
goal_difficulty = FOOD_GOAL_EASY
@@ -334,7 +348,7 @@
desc = "A \"cake\" that is made with electronic boards and leaks acid..."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "hardware_cake"
slice_path = /obj/item/food/hardware_cake_slice
slice_path = /obj/item/food/sliced/hardware_cake
slices_num = 5
bitesize = 3
filling_color = "#4ac25e"
@@ -342,13 +356,14 @@
tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/hardware_cake_slice
/obj/item/food/sliced/hardware_cake
name = "hardware cake slice"
desc = "A slice of electronic boards and some acid."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "hardware_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#4ac25e"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "sacid" = 3, "oil" = 3)
tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
goal_difficulty = FOOD_GOAL_EASY
@@ -357,7 +372,7 @@
desc = "A cake centred with Plums."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plum_cake"
slice_path = /obj/item/food/plum_cake_slice
slice_path = /obj/item/food/sliced/plum_cake
slices_num = 5
bitesize = 3
filling_color = "#a128c5"
@@ -365,13 +380,14 @@
tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/plum_cake_slice
/obj/item/food/sliced/plum_cake
name = "plum cake slice"
desc = "A slice of plum cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plum_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#a128c5"
list_reagents = list("nutriment" = 4, "vitamin" = 2)
tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -380,7 +396,7 @@
desc = "A condensed cake made for filling people up quickly."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pound_cake"
slice_path = /obj/item/food/pound_cake_slice
slice_path = /obj/item/food/sliced/pound_cake
slices_num = 5
bitesize = 3
filling_color = "#c4cab7"
@@ -388,13 +404,14 @@
tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/pound_cake_slice
/obj/item/food/sliced/pound_cake
name = "pound cake slice"
desc = "A slice of condensed cake made for filling people up quickly."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pound_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#ffffff"
list_reagents = list("nutriment" = 12, "vitamin" = 4)
tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -403,7 +420,7 @@
desc = "A hollow cake with real pumpkin."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pumpkin_spice_cake"
slice_path = /obj/item/food/pumpkin_spice_cake_slice
slice_path = /obj/item/food/sliced/pumpkin_spice_cake
slices_num = 5
bitesize = 3
filling_color = "#ee710a"
@@ -411,13 +428,14 @@
tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/pumpkin_spice_cake_slice
/obj/item/food/sliced/pumpkin_spice_cake
name = "pumpkin spice cake slice"
desc = "A spicy slice of pumpkin goodness."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pumpkin_spice_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#ee710a"
list_reagents = list("nutriment" = 4, "vitamin" = 2)
tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -426,7 +444,7 @@
desc = "A cake made of slimes. Probably not electrified."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "slime_cake"
slice_path = /obj/item/food/slime_cake_slice
slice_path = /obj/item/food/sliced/slime_cake
slices_num = 5
bitesize = 3
filling_color = "#0adfee"
@@ -434,13 +452,14 @@
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/slime_cake_slice
/obj/item/food/sliced/slime_cake
name = "slime cake slice"
desc = "A slice of slime cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "slime_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#0adfee"
list_reagents = list("nutriment" = 4, "vitamin" = 2)
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -449,7 +468,7 @@
desc = "A spaceman's trumpet frosted cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "trumpet_cake"
slice_path = /obj/item/food/spaceman_cake_slice
slice_path = /obj/item/food/sliced/spaceman_cake
slices_num = 5
bitesize = 3
filling_color = "#610977"
@@ -457,13 +476,14 @@
tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/spaceman_cake_slice
/obj/item/food/sliced/spaceman_cake
name = "spaceman's cake slice"
desc = "A slice of spaceman's trumpet frosted cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "trumpet_cake_slice"
trash = /obj/item/trash/plate
filling_color = "#610977"
list_reagents = list("nutriment" = 4, "vitamin" = 2, "cream" = 1, "berryjuice" = 1)
tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -472,7 +492,7 @@
desc = "A vanilla frosted cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "vanilla_cake"
slice_path = /obj/item/food/vanilla_cake_slice
slice_path = /obj/item/food/sliced/vanilla_cake
slices_num = 5
bitesize = 3
filling_color = "#ece7ee"
@@ -480,12 +500,13 @@
tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/vanilla_cake_slice
/obj/item/food/sliced/vanilla_cake
name = "vanilla cake slice"
desc = "A slice of vanilla frosted cake."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "vanilla_cake_slice"
filling_color = "#ece7ee"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "sugar" = 3, "vanilla" = 3)
tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
goal_difficulty = FOOD_GOAL_EASY
@@ -494,21 +515,22 @@
desc = "A light and fluffy vegan marshmallow flavoured with vanilla and rum and topped with soft chocolate. These are known to the moths as höllflöfstarkken: cloud squares." //höllflöf = cloud (höll = wind, flöf = cotton), starkken = squares
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "mothmallow_tray"
list_reagents = list("nutriment" = 20, "sugar" = 20)
slice_path = /obj/item/food/mothmallowslice
slice_path = /obj/item/food/sliced/mothmallow
slices_num = 5
bitesize = 3
filling_color = "#eebe98"
list_reagents = list("nutriment" = 20, "sugar" = 20)
tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/mothmallowslice
/obj/item/food/sliced/mothmallow
name = "mothmallow"
desc = "Fluffy little clouds of joy- in a strangely moth-like colour."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "mothmallow_slice"
filling_color = "#ece7ee"
filling_color = "#eebe98"
list_reagents = list("nutriment" = 4, "sugar" = 4)
tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -690,7 +712,7 @@
desc = "A delicious treat for the autumn months."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pumpkinpie"
slice_path = /obj/item/food/pumpkinpieslice
slice_path = /obj/item/food/sliced/pumpkinpie
slices_num = 5
bitesize = 3
filling_color = "#F5B951"
@@ -698,13 +720,14 @@
tastes = list("pie" = 1, "pumpkin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/pumpkinpieslice
/obj/item/food/sliced/pumpkinpie
name = "pumpkin pie slice"
desc = "A slice of pumpkin pie, with whipped cream on top. Perfection."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pumpkinpieslice"
trash = /obj/item/trash/plate
filling_color = "#F5B951"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("pie" = 1, "pumpkin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -723,21 +746,22 @@
desc = "An odd blue pie made with toxic blumpkin."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "blumpkin_pie"
slice_path = /obj/item/food/blumpkin_pie_slice
slice_path = /obj/item/food/sliced/blumpkin_pie
slices_num = 5
bitesize = 3
filling_color = "#102d8b"
list_reagents = list("nutriment" = 13, "vitamin" = 6, "blumpkinjuice" = 5)
list_reagents = list("nutriment" = 20, "vitamin" = 5, "blumpkinjuice" = 5)
tastes = list("pie" = 1, "a mouthful of pool water" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/blumpkin_pie_slice
/obj/item/food/sliced/blumpkin_pie
name = "blumpkin pie slice"
desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "blumpkin_pie_slice"
trash = /obj/item/trash/plate
filling_color = "#102d8b"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "blumpkinjuice" = 1)
tastes = list("pie" = 1, "a mouthful of pool water" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -746,21 +770,22 @@
desc = "A decadent pie made of a creamy chocolate mousse filling topped with a layer of whipped cream and chocolate shavings. Sliceable."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "french_silk_pie"
slice_path = /obj/item/food/french_silk_pie_slice
slice_path = /obj/item/food/sliced/french_silk_pie
slices_num = 5
bitesize = 3
filling_color = "#5e4337"
list_reagents = list("nutriment" = 12, "vitamin" = 4)
list_reagents = list("nutriment" = 15, "vitamin" = 5)
tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/french_silk_pie_slice
/obj/item/food/sliced/french_silk_pie
name = "french silk pie slice"
desc = "A slice of french silk pie, filled with a chocolate mousse and topped with a layer of whipped cream and chocolate shavings. Delicious enough to make you cry."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "french_silk_pie_slice"
trash = /obj/item/trash/plate
filling_color = "#5e4337"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -769,21 +794,22 @@
desc = "Tastes like blue and cold."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "frosty_pie"
slice_path = /obj/item/food/frosty_pie_slice
slice_path = /obj/item/food/sliced/frosty_pie
slices_num = 5
bitesize = 3
filling_color = "#5e4337"
list_reagents = list("nutriment" = 14, "vitamin" = 6)
list_reagents = list("nutriment" = 15, "vitamin" = 5)
tastes = list("mint" = 1, "pie" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frosty_pie_slice
/obj/item/food/sliced/frosty_pie
name = "frosty pie slice"
desc = "Tasty blue, like my favourite crayon!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "frosty_pie_slice"
trash = /obj/item/trash/plate
filling_color = "#338cb6"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
tastes = list("mint" = 1, "pie" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -1325,21 +1351,22 @@
desc = "A delicious jelly made with sweet potatoes."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "dulce_de_batata"
slice_path = /obj/item/food/dulce_de_batata_slice
slice_path = /obj/item/food/sliced/dulce_de_batata
slices_num = 5
bitesize = 3
filling_color = "#411b02"
list_reagents = list("nutriment" = 14, "vitamin" = 8)
list_reagents = list("nutriment" = 15, "vitamin" = 10)
tastes = list("jelly" = 1, "sweet potato" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/dulce_de_batata_slice
/obj/item/food/sliced/dulce_de_batata
name = "dulce de batata slice"
desc = "Tasty blue, like my favourite crayon!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "dulce_de_batata_slice"
trash = /obj/item/trash/plate
filling_color = "#411b02"
list_reagents = list("nutriment" = 3, "vitamin" = 2)
tastes = list("jelly" = 1, "sweet potato" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
code/modules/food_and_drinks/food/foods/bread.dm
+25 -17
View File
@@ -8,19 +8,21 @@
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "meatbread"
slice_path = /obj/item/food/meatbreadslice
slice_path = /obj/item/food/sliced/meat_bread
slices_num = 5
filling_color = "#FF7575"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "meat" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/meatbreadslice
/obj/item/food/sliced/meat_bread
name = "meatbread slice"
desc = "A slice of delicious meatbread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "meatbreadslice"
filling_color = "#FF7575"
list_reagents = list("protein" = 4, "nutriment" = 2, "vitamin" = 1)
tastes = list("bread" = 10, "meat" = 10)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/sliceable/xenomeatbread
@@ -28,19 +30,21 @@
desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "xenomeatbread"
slice_path = /obj/item/food/xenomeatbreadslice
slice_path = /obj/item/food/sliced/xeno_meat_bread
slices_num = 5
filling_color = "#8AFF75"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "acid" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/xenomeatbreadslice
/obj/item/food/sliced/xeno_meat_bread
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "xenobreadslice"
filling_color = "#8AFF75"
list_reagents = list("protein" = 4, "nutriment" = 2, "vitamin" = 1)
tastes = list("bread" = 10, "acid" = 10)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/sliceable/spidermeatbread
@@ -48,17 +52,18 @@
desc = "Reassuringly green meatloaf made from spider meat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "spidermeatbread"
slice_path = /obj/item/food/spidermeatbreadslice
slice_path = /obj/item/food/sliced/spider_meat_bread
slices_num = 5
list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5)
tastes = list("bread" = 10, "cobwebs" = 5)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/spidermeatbreadslice
/obj/item/food/sliced/spider_meat_bread
name = "spider meat bread slice"
desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "spidermeatslice"
list_reagents = list("protein" = 4, "nutriment" = 2, "toxin" = 3, "vitamin" = 1)
tastes = list("bread" = 10, "cobwebs" = 5)
list_reagents = list("toxin" = 2)
goal_difficulty = FOOD_GOAL_EXCESSIVE
@@ -68,19 +73,20 @@
desc = "A heavenly and filling treat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bananabread"
slice_path = /obj/item/food/bananabreadslice
slice_path = /obj/item/food/sliced/banana_bread
slices_num = 5
filling_color = "#EDE5AD"
list_reagents = list("banana" = 20, "nutriment" = 20)
tastes = list("bread" = 10, "banana" = 5)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/bananabreadslice
/obj/item/food/sliced/banana_bread
name = "banana-nut bread slice"
desc = "A slice of delicious banana bread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bananabreadslice"
filling_color = "#EDE5AD"
list_reagents = list("banana" = 4, "nutriment" = 4)
tastes = list("bread" = 10, "banana" = 5)
goal_difficulty = FOOD_GOAL_EASY
@@ -89,19 +95,21 @@
desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubread"
slice_path = /obj/item/food/tofubreadslice
slice_path = /obj/item/food/sliced/tofu_bread
slices_num = 5
filling_color = "#F7FFE0"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "tofu" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/tofubreadslice
/obj/item/food/sliced/tofu_bread
name = "tofubread slice"
desc = "A slice of delicious tofubread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubreadslice"
filling_color = "#F7FFE0"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("bread" = 10, "tofu" = 10)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/sliceable/bread
@@ -109,20 +117,20 @@
desc = "Some plain old Earthen bread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bread"
slice_path = /obj/item/food/breadslice
slice_path = /obj/item/food/sliced/bread
slices_num = 6
filling_color = "#FFE396"
list_reagents = list("nutriment" = 10)
tastes = list("bread" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/breadslice
/obj/item/food/sliced/bread
name = "bread slice"
desc = "A slice of home."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "breadslice"
filling_color = "#D27332"
list_reagents = list("nutriment" = 2, "bread" = 5)
list_reagents = list("nutriment" = 2, "bread" = 5) // TODO Why bread?
tastes = list("bread" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -131,14 +139,14 @@
desc = "Yum yum yum!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "creamcheesebread"
slice_path = /obj/item/food/creamcheesebreadslice
slice_path = /obj/item/food/sliced/cream_cheese_bread
slices_num = 5
filling_color = "#FFF896"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "cheese" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/creamcheesebreadslice
/obj/item/food/sliced/cream_cheese_bread
name = "cream cheese bread slice"
desc = "A slice of yum!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -153,14 +161,14 @@
desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "banarnarbread"
slice_path = /obj/item/food/banarnarbreadslice
slice_path = /obj/item/food/sliced/banarnarbread
slices_num = 5
filling_color = "#6F0000"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("heresy" = 10, "banana" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/banarnarbreadslice
/obj/item/food/sliced/banarnarbread
name = "banarnarbread slice"
desc = "A slice of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
code/modules/food_and_drinks/food/foods/ingredients.dm
+31 -24
View File
@@ -41,87 +41,92 @@
name = "cheese wheel"
desc = "A big wheel of delicious Cheddar."
icon_state = "cheesewheel"
slice_path = /obj/item/food/cheesewedge
slice_path = /obj/item/food/sliced/cheesewedge
slices_num = 5
filling_color = "#FFF700"
list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20)
list_reagents = list("nutriment" = 16, "vitamin" = 4, "cheese" = 20)
tastes = list("cheese" = 1)
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
name = "cheese wedge"
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
icon_state = "cheesewedge"
filling_color = "#FFF700"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "cheese" = 5)
tastes = list("cheese" = 1)
/obj/item/food/sliceable/cheesewheel/smoked
name = "smoked cheese wheel"
desc = "A wheel of fancy imported-style smoked cheese."
icon_state = "cheesewheel-smoked"
slice_path = /obj/item/food/cheesewedge/smoked
slice_path = /obj/item/food/sliced/cheesewedge/smoked
slices_num = 4
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15)
list_reagents = list("nutriment" = 16, "vitamin" = 4, "cheese" = 20)
tastes = list("cheese" = 1, "smoke" = 2)
/obj/item/food/cheesewedge/smoked
/obj/item/food/sliced/cheesewedge/smoked
name = "smoked cheese wedge"
desc = "A wedge of fancy smoked cheese."
icon_state = "cheesewedge-smoked"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "cheese" = 5)
tastes = list("cheese" = 1, "smoke" = 2)
/obj/item/food/sliceable/cheesewheel/edam
name = "edam cheese wheel"
desc = "A wheel of mild edam cheese."
icon_state = "cheesewheel-edam"
slice_path = /obj/item/food/cheesewedge/edam
slice_path = /obj/item/food/sliced/cheesewedge/edam
slices_num = 4
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15)
list_reagents = list("nutriment" = 16, "vitamin" = 4, "cheese" = 20)
tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2)
/obj/item/food/cheesewedge/edam
/obj/item/food/sliced/cheesewedge/edam
name = "edam cheese wedge"
desc = "A wedge of mild edam cheese. It's said to have a nutty flavor."
icon_state = "cheesewedge-edam"
list_reagents = list("nutriment" = 4, "vitamin" = 1, "cheese" = 5)
tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2)
/obj/item/food/sliceable/cheesewheel/blue
name = "blue cheese wheel"
desc = "A wheel of pungent blue cheese. It's an acquired taste..."
icon_state = "cheesewheel-blue"
slice_path = /obj/item/food/cheesewedge/blue
slices_num = 5
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 10)
slice_path = /obj/item/food/sliced/cheesewedge/blue
slices_num = 4
list_reagents = list("nutriment" = 4, "vitamin" = 4, "cheese" = 12)
tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1)
/obj/item/food/cheesewedge/blue
/obj/item/food/sliced/cheesewedge/blue
name = "blue cheese wedge"
desc = "A wedge of pungent blue cheese. The flavor is... intense."
icon_state = "cheesewedge-blue"
bitesize = 2
list_reagents = list("nutriment" = 1, "vitamin" = 1, "cheese" = 3)
tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1)
/obj/item/food/sliceable/cheesewheel/camembert
name = "camembert cheese wheel"
desc = "A miniature wheel of gooey camembert. Yum..."
icon_state = "cheesewheel-camembert"
slice_path = /obj/item/food/cheesewedge/camembert
slice_path = /obj/item/food/sliced/cheesewedge/camembert
slices_num = 2
list_reagents = list("nutriment" = 1, "vitamin" = 2, "cheese" = 6)
list_reagents = list("nutriment" = 4, "vitamin" = 4, "cheese" = 8)
tastes = list("mild cheese" = 3, "gooeyness" = 1)
/obj/item/food/cheesewedge/camembert
/obj/item/food/sliced/cheesewedge/camembert
name = "camembert cheese slice"
desc = "A piece of camembert. It's soft and gooey."
icon_state = "cheesewedge-camembert"
bitesize = 2
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 4)
tastes = list("mild cheese" = 3, "gooeyness" = 1)
/obj/item/food/cheesewedge/checkpass(passflag)
/obj/item/food/sliced/cheesewedge/checkpass(passflag)
if((passflag & PASSDOOR) && ismouse(pulledby))
return TRUE
return ..()
/obj/item/food/cheesewedge/presliced
/obj/item/food/sliced/cheesewedge/presliced
list_reagents = list("nutriment" = 3, "vitamin" = 1, "cheese" = 4)
/obj/item/food/weirdcheesewedge
@@ -151,14 +156,15 @@
list_reagents = list("plantmatter" = 3, "vitamin" = 1)
tastes = list("mushroom" = 1)
/obj/item/food/watermelonslice
/obj/item/food/sliced/watermelon
name = "watermelon slice"
desc = "A slice of watery goodness."
icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#FF3867"
list_reagents = list("plantmatter" = 1)
tastes = list("watermelon" = 1)
/obj/item/food/tomatoslice
/obj/item/food/sliced/tomato
name = "tomato slice"
desc = "A fresh slice of tomato."
icon_state = "tomatoslice"
@@ -166,11 +172,12 @@
list_reagents = list("plantmatter" = 2)
tastes = list("tomato" = 1)
/obj/item/food/pineappleslice
/obj/item/food/sliced/pineapple
name = "pineapple slices"
desc = "Rings of pineapple."
icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#e5b437"
list_reagents = list("plantmatter" = 1, "vitamin" = 1)
tastes = list("pineapple" = 1)
@@ -204,18 +211,18 @@
desc = "Some flattened dough."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flat dough"
slice_path = /obj/item/food/doughslice
slice_path = /obj/item/food/sliced/dough
slices_num = 3
list_reagents = list("nutriment" = 6)
tastes = list("dough" = 1)
/obj/item/food/doughslice
/obj/item/food/sliced/dough
name = "dough slice"
desc = "The building block of an impressive dish."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "doughslice"
list_reagents = list("nutriment" = 1)
list_reagents = list("nutriment" = 2)
tastes = list("dough" = 1)
code/modules/food_and_drinks/food/foods/meat.dm
+4 -3
View File
@@ -564,19 +564,20 @@
desc = "A traditional turkey served with stuffing."
icon = 'icons/obj/food/meat.dmi'
icon_state = "turkey"
slice_path = /obj/item/food/turkeyslice
slice_path = /obj/item/food/sliced/turkey
slices_num = 6
list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5)
list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 6)
tastes = list("turkey" = 2, "stuffing" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/turkeyslice
/obj/item/food/sliced/turkey
name = "turkey serving"
desc = "A serving of some tender and delicious turkey."
icon = 'icons/obj/food/meat.dmi'
icon_state = "turkeyslice"
trash = /obj/item/trash/plate
filling_color = "#B97A57"
list_reagents = list("protein" = 4, "nutriment" = 3, "vitamin" = 1)
tastes = list("turkey" = 1)
goal_difficulty = FOOD_GOAL_EASY
code/modules/food_and_drinks/food/foods/pizza.dm
+50 -38
View File
@@ -14,16 +14,17 @@
name = "margherita pizza"
desc = "The golden standard of pizzas."
icon_state = "margheritapizza"
slice_path = /obj/item/food/margheritapizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
slice_path = /obj/item/food/sliced/margherita_pizza
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 6)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/margheritapizzaslice
/obj/item/food/sliced/margherita_pizza
name = "margherita slice"
desc = "A slice of the classic pizza."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "margheritapizzaslice"
filling_color = "#BAA14C"
list_reagents = list("nutriment" = 5, "tomatojuice" = 1, "vitamin" = 1)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -32,17 +33,18 @@
name = "meat pizza"
desc = "A pizza with meat topping."
icon_state = "meatpizza"
slice_path = /obj/item/food/meatpizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
slice_path = /obj/item/food/sliced/meat_pizza
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 6)
tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/meatpizzaslice
/obj/item/food/sliced/meat_pizza
name = "meat pizza slice"
desc = "A slice of a meaty pizza."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "meatpizzaslice"
filling_color = "#BAA14C"
list_reagents = list("protein" = 5, "tomatojuice" = 1, "vitamin" = 1)
tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -51,17 +53,18 @@
name = "mushroom pizza"
desc = "Very special pizza."
icon_state = "mushroompizza"
slice_path = /obj/item/food/mushroompizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5)
slice_path = /obj/item/food/sliced/mushroom_pizza
list_reagents = list("plantmatter" = 30, "vitamin" = 6)
tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/mushroompizzaslice
/obj/item/food/sliced/mushroom_pizza
name = "mushroom pizza slice"
desc = "Maybe it is the last slice of pizza in your life."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "mushroompizzaslice"
filling_color = "#BAA14C"
list_reagents = list("plantmatter" = 5, "vitamin" = 1)
tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -70,17 +73,18 @@
name = "vegetable pizza"
desc = "No Tomato Sapiens were harmed during the making of this pizza."
icon_state = "vegetablepizza"
slice_path = /obj/item/food/vegetablepizzaslice
list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
slice_path = /obj/item/food/sliced/vegetable_pizza
list_reagents = list("plantmatter" = 24, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 6)
tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/vegetablepizzaslice
/obj/item/food/sliced/vegetable_pizza
name = "vegetable pizza slice"
desc = "A slice of the most green pizza of all pizzas not containing green ingredients."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "vegetablepizzaslice"
filling_color = "#BAA14C"
list_reagents = list("plantmatter" = 4, "tomatojuice" = 1, "oculine" = 2, "vitamin" = 1)
tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -89,17 +93,18 @@
name = "hawaiian pizza"
desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple."
icon_state = "hawaiianpizza"
slice_path = /obj/item/food/hawaiianpizzaslice
list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5)
slice_path = /obj/item/food/sliced/hawaiian_pizza
list_reagents = list("protein" = 18, "tomatojuice" = 6, "plantmatter" = 24, "pineapplejuice" = 6, "vitamin" = 6)
tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/hawaiianpizzaslice
/obj/item/food/sliced/hawaiian_pizza
name = "hawaiian pizza slice"
desc = "A slice of polarising pizza."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "hawaiianpizzaslice"
filling_color = "#e5b437"
list_reagents = list("protein" = 3, "tomatojuice" = 1, "plantmatter" = 4, "pineapplejuice" = 1, "vitamin" = 1)
tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -108,18 +113,19 @@
name = "mac 'n' cheese pizza"
desc = "Gastronomists have yet to classify this dish as 'pizza'."
icon_state = "macpizza"
slice_path = /obj/item/food/macpizzaslice
list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
slice_path = /obj/item/food/sliced/mac_pizza
filling_color = "#ffe45d"
list_reagents = list("nutriment" = 42, "vitamin" = 6) //More nutriment because carbs, but it's not any more vitaminicious
tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/macpizzaslice
/obj/item/food/sliced/mac_pizza
name = "mac 'n' cheese pizza slice"
desc = "A delicious slice of pizza topped with macaroni & cheese... wait, what the hell? Who would do this?!"
icon = 'icons/obj/food/pizza.dmi'
icon_state = "macpizzaslice"
filling_color = "#ffe45d"
list_reagents = list("nutriment" = 7, "vitamin" = 1)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -128,18 +134,19 @@
name = "pepperoni pizza"
desc = "What did the pepperoni say to the pizza?"
icon_state = "pepperonipizza"
slice_path = /obj/item/food/pepperonipizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
slice_path = /obj/item/food/sliced/pepperoni_pizza
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 9)
filling_color = "#ffe45d"
tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/pepperonipizzaslice
/obj/item/food/sliced/pepperoni_pizza
name = "pepperoni pizza slice"
desc = "Nice to meat you!"
icon = 'icons/obj/food/pizza.dmi'
icon_state = "pepperonipizzaslice"
filling_color = "#ffe45d"
list_reagents = list("protein" = 5, "tomatojuice" = 1, "vitamin" = 1.5)
tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -148,16 +155,17 @@
name = "cheese pizza"
desc = "Cheese, bread, cheese, tomato, and cheese."
icon_state = "cheesepizza"
slice_path = /obj/item/food/cheesepizzaslice
list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5)
slice_path = /obj/item/food/sliced/cheese_pizza
list_reagents = list("nutriment" = 42, "tomatojuice" = 6, "vitamin" = 6)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/cheesepizzaslice
/obj/item/food/sliced/cheese_pizza
name = "cheese pizza slice"
desc = "Dangerously cheesy?"
icon = 'icons/obj/food/pizza.dmi'
icon_state = "cheesepizzaslice"
filling_color = "#BAA14C"
list_reagents = list("nutriment" = 7, "tomatojuice" = 1, "vitamin" = 1)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 3)
goal_difficulty = FOOD_GOAL_EASY
@@ -166,17 +174,18 @@
name = "donk-pocket pizza"
desc = "Who thought this would be a good idea?"
icon_state = "donkpocketpizza"
slice_path = /obj/item/food/donkpocketpizzaslice
list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6)
slice_path = /obj/item/food/sliced/donk_pocket_pizza
list_reagents = list("nutriment" = 36, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6)
tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/donkpocketpizzaslice
/obj/item/food/sliced/donk_pocket_pizza
name = "donk-pocket pizza slice"
desc = "Smells like lukewarm donk-pocket."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "donkpocketpizzaslice"
filling_color = "#BAA14C"
list_reagents = list("nutriment" = 6, "tomatojuice" = 1, "vitamin" = 2/6, "weak_omnizine" = 1)
tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -185,17 +194,18 @@
name = "dank pizza"
desc = "The hippie's pizza of choice."
icon_state = "dankpizza"
slice_path = /obj/item/food/dankpizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6)
slice_path = /obj/item/food/sliced/dank_pizza
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 6, "cbd" = 6, "thc" = 6)
tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/dankpizzaslice
/obj/item/food/sliced/dank_pizza
name = "dank pizza slice"
desc = "So good, man..."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "dankpizzaslice"
filling_color = "#BAA14C"
list_reagents = list("nutriment" = 5, "tomatojuice" = 1, "vitamin" = 1, "cbd" = 1, "thc" = 1)
tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
goal_difficulty = FOOD_GOAL_EASY
@@ -204,17 +214,18 @@
name = "firecracker pizza"
desc = "Tastes HOT HOT HOT!"
icon_state = "firecrackerpizza"
slice_path = /obj/item/food/firecrackerpizzaslice
list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12)
slice_path = /obj/item/food/sliced/fire_cracker_pizza
list_reagents = list("nutriment" = 30, "vitamin" = 6, "capsaicin" = 12)
tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/firecrackerpizzaslice
/obj/item/food/sliced/fire_cracker_pizza
name = "firecracker pizza slice"
desc = "A spicy slice of something quite nice."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "firecrackerpizzaslice"
filling_color = "#BAA14C"
list_reagents = list("nutriment" = 5, "vitamin" = 1, "capsaicin" = 2)
tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -223,17 +234,18 @@
name = "\"pesto\" pizza"
desc = "Wait a second...this doesn't taste like pesto!"
icon_state = "pestopizza"
slice_path = /obj/item/food/pestopizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12)
slice_path = /obj/item/food/sliced/pesto_pizza
list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 6, "wasabi" = 12)
tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/pestopizzaslice
/obj/item/food/sliced/pesto_pizza
name = "\"pesto\" pizza slice"
desc = "Delicious and suspicious(ly green)."
icon = 'icons/obj/food/pizza.dmi'
icon_state = "pestopizzaslice"
filling_color = "#BAA14C"
list_reagents = list("nutriment" = 5, "tomatojuice" = 2, "vitamin" = 1, "wasabi" = 2)
tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
goal_difficulty = FOOD_GOAL_EASY
@@ -242,12 +254,12 @@
name = "garlic pizza"
desc = "Ahh, garlic. A universally loved ingredient, except possibly by vampires."
icon_state = "garlicpizza"
slice_path = /obj/item/food/garlicpizzaslice
slice_path = /obj/item/food/garlic_pizza
list_reagents = list("plantmatter" = 30, "vitamin" = 5, "garlic" = 12)
tastes = list("crust" = 1, "cheese" = 1, "garlic" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/garlicpizzaslice
/obj/item/food/garlic_pizza
name = "garlic pizza slice"
desc = "What's not to love?"
icon = 'icons/obj/food/pizza.dmi'
code/modules/food_and_drinks/food/foods/seafood.dm
+16 -16
View File
@@ -188,14 +188,14 @@
desc = "A large unsliced roll of Sake Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Sake_maki"
slice_path = /obj/item/food/sushi_sake
slice_path = /obj/item/food/sliced/sushi_sake
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_sake
/obj/item/food/sliced/sushi_sake
name = "sake sushi"
desc = "A simple sushi consisting of raw salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -210,14 +210,14 @@
desc = "A large unsliced roll of Smoked Salmon Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "SmokedSalmon_maki"
slice_path = /obj/item/food/sushi_smoked_salmon
slice_path = /obj/item/food/sliced/sushi_smoked_salmon
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_smoked_salmon
/obj/item/food/sliced/sushi_smoked_salmon
name = "smoked salmon sushi"
desc = "A simple sushi consisting of cooked salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -232,14 +232,14 @@
desc = "A large unsliced roll of Tamago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tamago_maki"
slice_path = /obj/item/food/sushi_tamago
slice_path = /obj/item/food/sliced/sushi_tamago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_tamago
/obj/item/food/sliced/sushi_tamago
name = "tamago sushi"
desc = "A simple sushi consisting of egg and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -254,14 +254,14 @@
desc = "A large unsliced roll of Inari Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Inari_maki"
slice_path = /obj/item/food/sushi_inari
slice_path = /obj/item/food/sliced/sushi_inari
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_inari
/obj/item/food/sliced/sushi_inari
name = "inari sushi"
desc = "A piece of fried tofu stuffed with rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -276,14 +276,14 @@
desc = "A large unsliced roll of Masago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Masago_maki"
slice_path = /obj/item/food/sushi_masago
slice_path = /obj/item/food/sliced/sushi_masago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_masago
/obj/item/food/sliced/sushi_masago
name = "masago sushi"
desc = "A simple sushi consisting of goldfish roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -298,14 +298,14 @@
desc = "A large unsliced roll of Tobkio Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tobiko_maki"
slice_path = /obj/item/food/sushi_tobiko
slice_path = /obj/item/food/sliced/sushi_tobiko
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_tobiko
/obj/item/food/sliced/sushi_tobiko
name = "tobiko sushi"
desc = "A simple sushi consisting of shark roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -320,14 +320,14 @@
desc = "A large unsliced roll of Tobkio and Egg Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "TobikoEgg_maki"
slice_path = /obj/item/food/sushi_tobiko_egg
slice_path = /obj/item/food/sliced/sushi_tobiko_egg
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_tobiko_egg
/obj/item/food/sliced/sushi_tobiko_egg
name = "tobiko and egg sushi"
desc = "A sushi consisting of shark roe and an egg."
icon = 'icons/obj/food/seafood.dmi'
@@ -342,14 +342,14 @@
desc = "A large unsliced roll of Tai Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tai_maki"
slice_path = /obj/item/food/sushi_tai
slice_path = /obj/item/food/sliced/sushi_tai
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/sushi_tai
/obj/item/food/sliced/sushi_tai
name = "tai sushi"
desc = "A simple sushi consisting of catfish and rice."
icon = 'icons/obj/food/seafood.dmi'
code/modules/food_and_drinks/food_base.dm
+26 -6
View File
@@ -4,6 +4,7 @@
#define MAX_WEIGHT_CLASS WEIGHT_CLASS_SMALL
//MARK: FOOD
/obj/item/food
name = "snack"
desc = "yummy!"
@@ -40,13 +41,13 @@
var/goal_difficulty = FOOD_GOAL_SKIP
var/bitecount = 0
var/trash = null
var/trash
var/slice_path
var/slices_num
var/dried_type = null
var/dried_type
var/dry = FALSE
var/cooktype[0]
var/cooked_type = null //for microwave cooking. path of the resulting item after microwaving
var/cooked_type //for microwave cooking. path of the resulting item after microwaving
var/total_w_class = 0 //for the total weight an item of food can carry
var/list/tastes // for example list("crisps" = 2, "salt" = 1)
@@ -273,9 +274,29 @@
W.taste(reagents)
W.consume(src)
//MARK: SLICE
/obj/item/food/sliced
/obj/item/food/sliced/Initialize(mapload, made_by_sliceable = FALSE)
if(made_by_sliceable)
return ..()
if(length(list_reagents))
return ..()
// We don't have any reagents, let's add someting
list_reagents = list("nutriment" = 5)
return ..()
//MARK: SLICEABLE
/obj/item/food/sliceable
slices_num = 2
/obj/item/food/sliceable/Initialize(mapload)
if(!ispath(slice_path, /obj/item/food/sliced))
CRASH("Invalid type assigned to slice_path: [slice_path]")
return ..()
/obj/item/food/sliceable/examine(mob/user)
. = ..()
. += "<span class='notice'>Alt-click to put something small inside.</span>"
@@ -333,7 +354,7 @@
slices_lost = rand(1, min(1, round(slices_num / 2)))
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i in 1 to (slices_num - slices_lost))
var/obj/slice = new slice_path (loc)
var/obj/slice = new slice_path (loc, TRUE)
reagents.trans_to(slice,reagents_per_slice)
slice.scatter_atom()
qdel(src)
@@ -352,8 +373,7 @@
cooktype["grilled"] = TRUE
cooktype["deep fried"] = TRUE
// MISC
//MARK: MISC
/obj/item/food/cereal
name = "box of cereal"
desc = "A box of cereal."
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+1 -1
View File
@@ -189,7 +189,7 @@
output = /obj/item/food/carrotfries
/datum/deepfryer_special/onionrings
input = /obj/item/food/onion_slice
input = /obj/item/food/sliced/onion_slice
output = /obj/item/food/onionrings
/datum/deepfryer_special/fried_vox
code/modules/food_and_drinks/kitchen_machinery/processor.dm
+1 -1
View File
@@ -105,7 +105,7 @@
output = /obj/item/food/soydope
/datum/food_processor_process/spaghetti
input = /obj/item/food/doughslice
input = /obj/item/food/sliced/dough
output = /obj/item/food/spaghetti
/datum/food_processor_process/macaroni
code/modules/food_and_drinks/recipes/recipes_candy.dm
+1 -1
View File
@@ -90,7 +90,7 @@
/datum/recipe/candy/candied_pineapple
reagents = list("sugar" = 2, "water" = 2)
items = list(
/obj/item/food/pineappleslice
/obj/item/food/sliced/pineapple
)
result = /obj/item/food/candy/candied_pineapple
code/modules/food_and_drinks/recipes/recipes_grill.dm
+14 -14
View File
@@ -75,9 +75,9 @@
/datum/recipe/grill/grilledcheese
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/cheesewedge
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread,
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/grilledcheese
@@ -112,8 +112,8 @@
items = list(
/obj/item/food/egg,
/obj/item/food/egg,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/omelette
@@ -179,7 +179,7 @@
/obj/item/food/boiledrice,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_tamago
result = /obj/item/food/sliced/sushi_tamago
/datum/recipe/grill/sushi_unagi
reagents = list("sake" = 5)
@@ -212,7 +212,7 @@
/obj/item/food/fried_tofu,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_inari
result = /obj/item/food/sliced/sushi_inari
/datum/recipe/grill/sushi_sake
items = list(
@@ -220,7 +220,7 @@
/obj/item/food/salmonmeat,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_sake
result = /obj/item/food/sliced/sushi_sake
/datum/recipe/grill/sushi_smoked_salmon
items = list(
@@ -228,7 +228,7 @@
/obj/item/food/salmonsteak,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_smoked_salmon
result = /obj/item/food/sliced/sushi_smoked_salmon
/datum/recipe/grill/sushi_masago
items = list(
@@ -236,7 +236,7 @@
/obj/item/fish_eggs/goldfish,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_masago
result = /obj/item/food/sliced/sushi_masago
/datum/recipe/grill/sushi_tobiko
items = list(
@@ -244,15 +244,15 @@
/obj/item/fish_eggs/shark,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_tobiko
result = /obj/item/food/sliced/sushi_tobiko
/datum/recipe/grill/sushi_tobiko_egg
items = list(
/obj/item/food/sushi_tobiko,
/obj/item/food/sliced/sushi_tobiko,
/obj/item/food/egg,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_tobiko_egg
result = /obj/item/food/sliced/sushi_tobiko_egg
/datum/recipe/grill/sushi_tai
items = list(
@@ -260,7 +260,7 @@
/obj/item/food/catfishmeat,
/obj/item/stack/seaweed
)
result = /obj/item/food/sushi_tai
result = /obj/item/food/sliced/sushi_tai
/datum/recipe/grill/goliath
items = list(/obj/item/food/monstermeat/goliath)
code/modules/food_and_drinks/recipes/recipes_microwave.dm
+57 -57
View File
@@ -330,7 +330,7 @@
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/burger/bigbite
@@ -340,9 +340,9 @@
/obj/item/food/burger/bigbite,
/obj/item/food/dough,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/bacon,
/obj/item/food/tomatoslice
/obj/item/food/sliced/tomato
)
result = /obj/item/food/burger/superbite
@@ -419,7 +419,7 @@
/obj/item/food/bun,
/obj/item/food/meat,
/obj/item/food/grown/lettuce,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/burger/cheese
@@ -459,7 +459,7 @@
/obj/item/food/bacon,
/obj/item/food/bacon,
/obj/item/food/grown/lettuce,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/burger/bacon
@@ -467,7 +467,7 @@
items = list(
/obj/item/food/bun,
/obj/item/food/bbqribs,
/obj/item/food/onion_slice
/obj/item/food/sliced/onion_slice
)
result = /obj/item/food/burger/mcrib
@@ -510,8 +510,8 @@
/datum/recipe/microwave/eggplantparm
items = list(
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/eggplant
)
result = /obj/item/food/eggplantparm
@@ -541,7 +541,7 @@
/datum/recipe/microwave/cheesyfries
items = list(
/obj/item/food/fries,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/cheesyfries
@@ -656,7 +656,7 @@
items = list(
/obj/item/food/cutlet,
/obj/item/food/beans,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliceable/flatdough
)
result = /obj/item/food/burrito
@@ -684,9 +684,9 @@
/datum/recipe/microwave/sandwich
items = list(
/obj/item/food/meatsteak,
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/cheesewedge
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread,
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/sandwich
@@ -713,14 +713,14 @@
/datum/recipe/microwave/slimetoast
reagents = list("slimejelly" = 5)
items = list(
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
)
result = /obj/item/food/jelliedtoast/slime
/datum/recipe/microwave/jelliedtoast
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/food/breadslice
/obj/item/food/sliced/bread
)
result = /obj/item/food/jelliedtoast/cherry
@@ -797,7 +797,7 @@
/datum/recipe/microwave/macncheese
reagents = list("water" = 5, "milk" = 5)
items = list(
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/macaroni,
)
result = /obj/item/food/macncheese
@@ -808,8 +808,8 @@
/obj/item/food/bun,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/lettuce,
/obj/item/food/grown/chili,
/obj/item/toy/crayon/green,
@@ -819,10 +819,10 @@
/datum/recipe/microwave/blt
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread,
/obj/item/food/grown/lettuce,
/obj/item/food/tomatoslice,
/obj/item/food/sliced/tomato,
/obj/item/food/bacon
)
result = /obj/item/food/blt
@@ -830,34 +830,34 @@
/datum/recipe/microwave/peanut_butter_jelly/cherry
reagents = list("cherryjelly" = 5, "peanutbutter" = 5)
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread
)
result = /obj/item/food/peanut_butter_jelly/cherry
/datum/recipe/microwave/peanut_butter_jelly/slime
reagents = list("slimejelly" = 5, "peanutbutter" = 5)
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread
)
result = /obj/item/food/peanut_butter_jelly/slime
/datum/recipe/microwave/peanut_butter_banana
reagents = list("peanutbutter" = 5)
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread,
/obj/item/food/grown/banana
)
result = /obj/item/food/peanut_butter_banana
/datum/recipe/microwave/philly_cheesesteak
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread,
/obj/item/food/cutlet,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/onion
)
result = /obj/item/food/philly_cheesesteak
@@ -967,24 +967,24 @@
/datum/recipe/microwave/twobread
reagents = list("wine" = 5)
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread
)
result = /obj/item/food/twobread
/datum/recipe/microwave/slimesandwich
reagents = list("slimejelly" = 5)
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread
)
result = /obj/item/food/jellysandwich/slime
/datum/recipe/microwave/cherrysandwich
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread
)
result = /obj/item/food/jellysandwich/cherry
@@ -1049,7 +1049,7 @@
reagents = list("water" = 10)
items = list(
/obj/item/food/grown/onion,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/soup/frenchonionsoup
@@ -1179,7 +1179,7 @@
/obj/item/food/badrecipe,
/obj/item/food/tofu,
/obj/item/food/egg,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/soup/mysterysoup
@@ -1220,7 +1220,7 @@
/obj/item/food/grown/olive,
/obj/item/food/grown/tomato,
/obj/item/food/cutlet,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/salad/antipasto
@@ -1228,9 +1228,9 @@
reagents = list("oliveoil" = 5)
items = list(
/obj/item/food/grown/lettuce,
/obj/item/food/onion_slice/red,
/obj/item/food/cheesewedge,
/obj/item/food/breadslice
/obj/item/food/sliced/onion_slice/red,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/bread
)
result = /obj/item/food/salad/caesar
@@ -1247,7 +1247,7 @@
/obj/item/food/grown/citrus/orange,
/obj/item/food/grown/apple,
/obj/item/food/grown/grapes,
/obj/item/food/watermelonslice
/obj/item/food/sliced/watermelon
)
result = /obj/item/food/salad/fruit
@@ -1256,10 +1256,10 @@
items = list(
/obj/item/food/grown/olive,
/obj/item/food/grown/tomato,
/obj/item/food/onion_slice/red,
/obj/item/food/onion_slice/red,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge
/obj/item/food/sliced/onion_slice/red,
/obj/item/food/sliced/onion_slice/red,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/salad/greek
@@ -1269,8 +1269,8 @@
/obj/item/food/grown/grapes,
/obj/item/food/grown/banana,
/obj/item/food/grown/banana,
/obj/item/food/watermelonslice,
/obj/item/food/watermelonslice
/obj/item/food/sliced/watermelon,
/obj/item/food/sliced/watermelon
)
result = /obj/item/food/salad/jungle
@@ -1279,8 +1279,8 @@
items = list(
/obj/item/food/grown/carrot,
/obj/item/food/grown/lettuce,
/obj/item/food/onion_slice/red,
/obj/item/food/onion_slice/red
/obj/item/food/sliced/onion_slice/red,
/obj/item/food/sliced/onion_slice/red
)
result = /obj/item/food/salad/kale
@@ -1365,7 +1365,7 @@
items = list(
/obj/item/food/friedegg,
/obj/item/food/meatsteak,
/obj/item/food/breadslice
/obj/item/food/sliced/bread
)
result = /obj/item/food/benedict
@@ -1474,7 +1474,7 @@
/datum/recipe/microwave/frozenpineapplepop
items = list(
/obj/item/popsicle_stick,
/obj/item/food/pineappleslice,
/obj/item/food/sliced/pineapple,
/obj/item/food/chocolatebar
)
result = /obj/item/food/frozen/popsicle/frozenpineapple
@@ -1647,8 +1647,8 @@
/datum/recipe/microwave/notasandwich
items = list(
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread,
/obj/item/clothing/mask/fakemoustache
)
result = /obj/item/food/notasandwich
@@ -1720,9 +1720,9 @@
/datum/recipe/microwave/taco
items = list(
/obj/item/food/doughslice,
/obj/item/food/sliced/dough,
/obj/item/food/cutlet,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/taco
code/modules/food_and_drinks/recipes/recipes_oven.dm
+42 -42
View File
@@ -16,9 +16,9 @@
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
)
result = /obj/item/food/sliceable/meatbread
@@ -30,9 +30,9 @@
/obj/item/food/meat/syntiflesh,
/obj/item/food/meat/syntiflesh,
/obj/item/food/meat/syntiflesh,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
)
result = /obj/item/food/sliceable/meatbread
@@ -44,9 +44,9 @@
/obj/item/food/monstermeat/xenomeat,
/obj/item/food/monstermeat/xenomeat,
/obj/item/food/monstermeat/xenomeat,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
)
result = /obj/item/food/sliceable/xenomeatbread
@@ -241,8 +241,8 @@
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
)
result = /obj/item/food/sliceable/cheesecake
@@ -444,15 +444,15 @@
/obj/item/food/tofu,
/obj/item/food/tofu,
/obj/item/food/tofu,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
)
result = /obj/item/food/sliceable/tofubread
/datum/recipe/oven/loadedbakedpotato
items = list(
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/potato
)
result = /obj/item/food/loadedbakedpotato
@@ -483,7 +483,7 @@
/datum/recipe/oven/fortunecookie
reagents = list("sugar" = 5)
items = list(
/obj/item/food/doughslice,
/obj/item/food/sliced/dough,
/obj/item/paper,
)
result = /obj/item/food/fortunecookie
@@ -505,8 +505,8 @@
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/sliceable/pizza/margheritapizza
@@ -516,7 +516,7 @@
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/tomato
)
result = /obj/item/food/sliceable/pizza/meatpizza
@@ -524,7 +524,7 @@
/datum/recipe/oven/mushroompizza
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/mushroom,
/obj/item/food/grown/mushroom,
/obj/item/food/grown/mushroom,
@@ -537,7 +537,7 @@
/datum/recipe/oven/vegetablepizza
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/eggplant,
/obj/item/food/grown/carrot,
/obj/item/food/grown/corn,
@@ -549,9 +549,9 @@
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/pineappleslice,
/obj/item/food/pineappleslice,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/pineapple,
/obj/item/food/sliced/pineapple,
/obj/item/food/meat,
)
result = /obj/item/food/sliceable/pizza/hawaiianpizza
@@ -559,8 +559,8 @@
/datum/recipe/oven/macncheesepizza
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/macncheese,
)
result = /obj/item/food/sliceable/pizza/macpizza
@@ -569,10 +569,10 @@
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/sliceable/pizza/cheesepizza
@@ -580,7 +580,7 @@
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sausage
)
result = /obj/item/food/sliceable/pizza/pepperonipizza
@@ -589,7 +589,7 @@
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/donkpocket,
/obj/item/food/donkpocket
)
@@ -599,7 +599,7 @@
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/cannabis,
/obj/item/food/grown/cannabis,
/obj/item/food/grown/cannabis,
@@ -611,7 +611,7 @@
reagents = list("capsaicin" = 5)
items = list(
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/chili,
/obj/item/food/grown/chili
)
@@ -623,7 +623,7 @@
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/sliceable/pizza/pestopizza
@@ -633,7 +633,7 @@
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/garlic,
/obj/item/food/grown/garlic,
/obj/item/food/cheesewedge
/obj/item/food/sliced/cheesewedge
)
result = /obj/item/food/sliceable/pizza/garlicpizza
@@ -662,8 +662,8 @@
items = list(
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
)
result = /obj/item/food/sliceable/creamcheesebread
@@ -814,7 +814,7 @@
/datum/recipe/oven/cracker
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/food/doughslice
/obj/item/food/sliced/dough
)
result = /obj/item/food/cracker
@@ -859,9 +859,9 @@
items = list(
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/sliced/cheesewedge,
/obj/item/food/grown/tomato,
/obj/item/food/grown/tomato,
/obj/item/food/dough
code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
+14 -14
View File
@@ -2,8 +2,8 @@
name = "Sandwich"
reqs = list(
/obj/item/food/meatsteak = 1,
/obj/item/food/breadslice = 2,
/obj/item/food/cheesewedge = 1,
/obj/item/food/sliced/bread = 2,
/obj/item/food/sliced/cheesewedge = 1,
)
result = list(/obj/item/food/sandwich)
category = CAT_FOOD
@@ -13,7 +13,7 @@
name = "Slime Jelly Sandwich"
reqs = list(
/datum/reagent/slimejelly = 5,
/obj/item/food/breadslice = 2,
/obj/item/food/sliced/bread = 2,
)
result = list(/obj/item/food/jellysandwich/slime)
category = CAT_FOOD
@@ -23,7 +23,7 @@
name = "Cherry Jelly Sandwich"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/food/breadslice = 2,
/obj/item/food/sliced/bread = 2,
)
result = list(/obj/item/food/jellysandwich/cherry)
category = CAT_FOOD
@@ -62,7 +62,7 @@
/datum/crafting_recipe/notasandwich
name = "not-a-sandwich"
reqs = list(
/obj/item/food/breadslice = 2,
/obj/item/food/sliced/bread = 2,
/obj/item/clothing/mask/fakemoustache = 1,
)
result = list(/obj/item/food/notasandwich)
@@ -122,7 +122,7 @@
/obj/item/food/fried_tofu = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/sushi_inari)
result = list(/obj/item/food/sliced/sushi_inari)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -145,7 +145,7 @@
/obj/item/food/salmonmeat = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/sushi_sake)
result = list(/obj/item/food/sliced/sushi_sake)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -168,7 +168,7 @@
/obj/item/food/salmonsteak = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/sushi_smoked_salmon)
result = list(/obj/item/food/sliced/sushi_smoked_salmon)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -191,7 +191,7 @@
/obj/item/fish_eggs/goldfish = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/sushi_masago)
result = list(/obj/item/food/sliced/sushi_masago)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -214,7 +214,7 @@
/obj/item/fish_eggs/shark = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/sushi_tobiko)
result = list(/obj/item/food/sliced/sushi_tobiko)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -233,18 +233,18 @@
/datum/crafting_recipe/sushi_tobiko_egg
name = "Tobiko and Egg Sushi"
reqs = list(
/obj/item/food/sushi_tobiko = 1,
/obj/item/food/sliced/sushi_tobiko = 1,
/obj/item/food/egg = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/sushi_tobiko_egg)
result = list(/obj/item/food/sliced/sushi_tobiko_egg)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/tobiko_egg_maki
name = "Tobiko and Egg Maki Roll"
reqs = list(
/obj/item/food/sushi_tobiko = 4,
/obj/item/food/sliced/sushi_tobiko = 4,
/obj/item/food/egg = 4,
/obj/item/stack/seaweed = 1,
)
@@ -260,7 +260,7 @@
/obj/item/food/catfishmeat = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/sushi_tai)
result = list(/obj/item/food/sliced/sushi_tai)
category = CAT_FOOD
subcategory = CAT_SUSHI
code/modules/hydroponics/grown/melon.dm
+1 -1
View File
@@ -26,7 +26,7 @@
name = "watermelon"
desc = "It's full of watery goodness."
icon_state = "watermelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
slice_path = /obj/item/food/watermelonslice
slice_path = /obj/item/food/sliced/watermelon
slices_num = 5
dried_type = null
w_class = WEIGHT_CLASS_NORMAL
code/modules/hydroponics/grown/onion.dm
+4 -4
View File
@@ -23,7 +23,7 @@
icon_state = "onion"
filling_color = "#C0C9A0"
bitesize_mod = 2
slice_path = /obj/item/food/onion_slice
slice_path = /obj/item/food/sliced/onion_slice
tastes = list("onion" = 1, "pungentness" = 1)
slices_num = 2
wine_power = 0.3
@@ -46,12 +46,12 @@
desc = "Purple despite the name."
icon_state = "onion_red"
filling_color = "#C29ACF"
slice_path = /obj/item/food/onion_slice/red
slice_path = /obj/item/food/sliced/onion_slice/red
tastes = list("red onion" = 1, "pungentness" = 3)
wine_power = 0.6
wine_flavor = "powerful pungentness"
/obj/item/food/onion_slice
/obj/item/food/sliced/onion_slice
name = "onion slices"
desc = "Rings, not for wearing."
icon_state = "onionslice"
@@ -61,7 +61,7 @@
gender = PLURAL
cooked_type = /obj/item/food/onionrings
/obj/item/food/onion_slice/red
/obj/item/food/sliced/onion_slice/red
name = "red onion slices"
desc = "They shine like exceptionally low quality amethyst."
icon_state = "onionslice_red"
code/modules/hydroponics/grown/pineapple.dm
+1 -1
View File
@@ -25,7 +25,7 @@
attack_verb = list("stung", "pined")
throw_speed = 1
throw_range = 5
slice_path = /obj/item/food/pineappleslice
slice_path = /obj/item/food/sliced/pineapple
slices_num = 3
filling_color = "#F6CB0B"
w_class = WEIGHT_CLASS_NORMAL
code/modules/hydroponics/grown/tomato.dm
+1 -1
View File
@@ -19,7 +19,7 @@
name = "tomato"
desc = "I say to-mah-to, you say tom-mae-to."
icon_state = "tomato"
slice_path = /obj/item/food/tomatoslice
slice_path = /obj/item/food/sliced/tomato
slices_num = 4
splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
code/modules/mob/living/simple_animal/friendly/cat.dm
+1 -1
View File
@@ -235,7 +235,7 @@
butcher_results = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
/obj/item/food/birthdaycakeslice = 3,
/obj/item/food/sliced/birthday_cake = 3,
/obj/item/food/meat/slab = 2
)
response_harm = "takes a bite out of"
code/modules/mob/living/simple_animal/friendly/mouse.dm
+1 -1
View File
@@ -100,7 +100,7 @@
..()
/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE)//Prevents mouse from pulling things
if(istype(AM, /obj/item/food/cheesewedge))
if(istype(AM, /obj/item/food/sliced/cheesewedge))
return ..() // Get dem
if(show_message)
to_chat(src, "<span class='warning'>You are too small to pull anything except cheese.</span>")
code/modules/projectiles/guns/chaos_bolt.dm
+2 -2
View File
@@ -148,7 +148,7 @@
explosion(get_turf(H), 1, 1, 1, cause = "staff of chaos lethal explosion effect")
if("cheese morphed")
H.visible_message("<span class='chaosverybad'>[H] transforms into cheese!</span>", "<span class='chaosverybad'>You've been transformed into cheese!</span>")
new /obj/item/food/cheesewedge(get_turf(H))
new /obj/item/food/sliced/cheesewedge(get_turf(H))
qdel(H)
if("supermattered")
var/obj/machinery/atmospherics/supermatter_crystal/supercrystal = GLOB.main_supermatter_engine
@@ -323,7 +323,7 @@
if("toy revolver")
item_to_summon = /obj/item/gun/projectile/revolver/capgun/chaosprank
if("cheese")
item_to_summon = /obj/item/food/cheesewedge
item_to_summon = /obj/item/food/sliced/cheesewedge
explosion_amount = rand(5, 10)
if("food")
target.visible_message("<span class='chaosneutral'>Food scatters around [target]!</span>", "<span class='chaosneutral'>A bunch of food scatters around you!</span>")
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+1 -1
View File
@@ -70,7 +70,7 @@
/obj/item/food/grown/citrus/orange = list("orangejuice" = 0),
/obj/item/food/grown/citrus/lime = list("limejuice" = 0),
/obj/item/food/grown/watermelon = list("watermelonjuice" = 0),
/obj/item/food/watermelonslice = list("watermelonjuice" = 0),
/obj/item/food/sliced/watermelon = list("watermelonjuice" = 0),
/obj/item/food/grown/berries/poison = list("poisonberryjuice" = 0),
/obj/item/food/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), // Order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
/obj/item/food/grown/pumpkin = list("pumpkinjuice" = 0),
code/modules/reagents/chemistry/reagents/food_reagents.dm
+2 -2
View File
@@ -635,7 +635,7 @@
/datum/reagent/consumable/cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/cheesewedge/presliced(T)
new /obj/item/food/sliced/cheesewedge/presliced(T)
/datum/reagent/consumable/fake_cheese
name = "Cheese substitute"
@@ -925,7 +925,7 @@
/datum/reagent/consumable/bread/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/food/breadslice(T)
new /obj/item/food/sliced/bread(T)
/datum/reagent/soap
name = "Soap"
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+13 -13
View File
@@ -150,21 +150,21 @@
var/list/blocked = list(
/obj/item/food,
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
/obj/item/food/sliceable,
/obj/item/food/sliceable/pizza,
/obj/item/food/margheritapizzaslice,
/obj/item/food/meatpizzaslice,
/obj/item/food/mushroompizzaslice,
/obj/item/food/vegetablepizzaslice,
/obj/item/food/cheesepizzaslice,
/obj/item/food/garlicpizzaslice,
/obj/item/food/donkpocketpizzaslice,
/obj/item/food/dankpizzaslice,
/obj/item/food/macpizzaslice,
/obj/item/food/firecrackerpizzaslice,
/obj/item/food/pestopizzaslice,
/obj/item/food/pepperonipizzaslice,
/obj/item/food/sliced/margherita_pizza,
/obj/item/food/sliced/meat_pizza,
/obj/item/food/sliced/mushroom_pizza,
/obj/item/food/sliced/vegetable_pizza,
/obj/item/food/sliced/cheese_pizza,
/obj/item/food/garlic_pizza,
/obj/item/food/sliced/donk_pocket_pizza,
/obj/item/food/sliced/dank_pizza,
/obj/item/food/sliced/mac_pizza,
/obj/item/food/sliced/fire_cracker_pizza,
/obj/item/food/sliced/pesto_pizza,
/obj/item/food/sliced/pepperoni_pizza,
/obj/item/food/meat,
/obj/item/food/meat/slab,
/obj/item/food/grown,
code/modules/station_goals/secondary/kitchen/random_bulk_food.dm
+1 -1
View File
@@ -18,7 +18,7 @@
valid_food += candidate
if(!valid_food)
food_type = /obj/item/food/cheesewedge
food_type = /obj/item/food/sliced/cheesewedge
amount = 50
return