cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 00:55:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] You can now put food on plates, and plate no longer materialize out of nowhere as you cook (#4418)

Browse Source 
* You can now put food on plates, and plate no longer materialize out of nowhere as you cook

* Update dish_drive.dm

* aaaaaaaaaaaaaaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-03-26 16:40:39 +01:00
committed by GitHub
parent ac73fd9696
commit daec7111cd
60 changed files with 140 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/lootdrop.dm
-1
View File
@@ -204,7 +204,6 @@
/obj/item/trash/chips = 1,
/obj/item/food/deadmouse = 1,
/obj/item/trash/pistachios = 1,
/obj/item/trash/plate = 1,
/obj/item/trash/popcorn = 1,
/obj/item/trash/raisins = 1,
/obj/item/trash/sosjerky = 1,
code/game/objects/items/food/cake.dm
-1
View File
@@ -12,7 +12,6 @@
/obj/item/food/cakeslice
icon = 'icons/obj/food/piecake.dmi'
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("cake" = 1)
foodtypes = GRAIN | DAIRY
code/game/objects/items/food/egg.dm
+1 -3
View File
@@ -107,7 +107,6 @@
name = "omelette du fromage"
desc = "That's all you can say!"
icon_state = "omelette"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
bite_consumption = 1
w_class = WEIGHT_CLASS_SMALL
@@ -138,7 +137,6 @@
desc = "There is only one egg on this, how rude."
icon_state = "benedict"
food_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment = 3)
trash_type = /obj/item/trash/plate
w_class = WEIGHT_CLASS_SMALL
tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
foodtypes = MEAT | BREAKFAST | GRAIN
@@ -151,4 +149,4 @@
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("custard" = 1)
foodtypes = MEAT | VEGETABLES
code/game/objects/items/food/meat.dm
+2 -10
View File
@@ -7,7 +7,6 @@
name = "\improper Cuban carp"
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
icon_state = "cubancarp"
trash_type = /obj/item/trash/plate
bite_consumption = 3
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
@@ -106,7 +105,6 @@
name = "corned beef and cabbage"
desc = "Now you can feel like a real tourist vacationing in Ireland."
icon_state = "cornedbeef"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("meat" = 1, "cabbage" = 1)
foodtypes = MEAT | VEGETABLES
@@ -116,7 +114,6 @@
name = "Filet migrawr"
desc = "Because eating bear wasn't manly enough."
icon_state = "bearsteak"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 9, /datum/reagent/consumable/ethanol/manly_dorf = 5)
tastes = list("meat" = 1, "salmon" = 1)
foodtypes = MEAT | ALCOHOL
@@ -405,7 +402,6 @@
name = "stewed soy meat"
desc = "Even non-vegetarians will LOVE this!"
icon_state = "stewedsoymeat"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("soy" = 1, "vegetables" = 1)
eatverbs = list("slurp","sip","inhale","drink")
@@ -419,7 +415,6 @@
name = "boiled spider leg"
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
icon_state = "spiderlegcooked"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/capsaicin = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("hot peppers" = 1, "cobwebs" = 1)
foodtypes = MEAT
@@ -430,7 +425,6 @@
name = "green eggs and ham"
desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
icon_state = "spidereggsham"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 3)
bite_consumption = 4
tastes = list("meat" = 1, "the colour green" = 1)
@@ -922,7 +916,7 @@
desc = "A piece of hot spicy meat."
icon_state = "meatsteak"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
trash_type = /obj/item/trash/plate
foodtypes = MEAT
tastes = list("meat" = 1)
burns_on_grill = TRUE
@@ -1207,7 +1201,7 @@
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 16, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("beef" = 3, "sour cream" = 1, "salt" = 1, "pepper" = 1)
foodtypes = MEAT | VEGETABLES | DAIRY
trash_type = /obj/item/trash/plate
w_class = WEIGHT_CLASS_SMALL
//basic ingredients, but a lot of them. just covering costs here
venue_value = FOOD_PRICE_NORMAL
@@ -1232,7 +1226,6 @@
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("beef" = 3, "mushrooms" = 1, "pancetta" = 1)
foodtypes = MEAT | VEGETABLES | GRAIN
trash_type = /obj/item/trash/plate
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_NORMAL
@@ -1243,6 +1236,5 @@
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("sausage" = 1, "bacon" = 1, "egg" = 1, "tomato" = 1, "mushrooms" = 1, "bread" = 1, "beans" = 1)
foodtypes = MEAT | VEGETABLES | GRAIN | BREAKFAST
trash_type = /obj/item/trash/plate
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_EXOTIC
code/game/objects/items/food/misc.dm
+8 -8
View File
@@ -116,7 +116,7 @@
name = "space fries"
desc = "AKA: French Fries, Freedom Fries, etc."
icon_state = "fries"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 4)
tastes = list("fries" = 3, "salt" = 1)
foodtypes = VEGETABLES | GRAIN | FRIED
@@ -144,7 +144,7 @@
name = "soy dope"
desc = "Dope from a soy."
icon_state = "soydope"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/protein = 1)
tastes = list("soy" = 1)
foodtypes = VEGETABLES
@@ -154,7 +154,7 @@
name = "cheesy fries"
desc = "Fries. Covered in cheese. Duh."
icon_state = "cheesyfries"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("fries" = 3, "cheese" = 1)
foodtypes = VEGETABLES | GRAIN | DAIRY
@@ -185,7 +185,7 @@
name = "carrot fries"
desc = "Tasty fries from fresh Carrots."
icon_state = "carrotfries"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("carrots" = 3, "salt" = 1)
foodtypes = VEGETABLES
@@ -210,7 +210,7 @@
desc = "It is only wafer thin."
icon_state = "mint"
bite_consumption = 1
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/toxin/minttoxin = 2)
foodtypes = TOXIC | SUGAR
w_class = WEIGHT_CLASS_TINY
@@ -283,7 +283,7 @@
name = "eggplant parmigiana"
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("eggplant" = 3, "cheese" = 1)
foodtypes = VEGETABLES | DAIRY
@@ -344,7 +344,7 @@
name = "yaki imo"
desc = "Made with roasted sweet potatoes!"
icon_state = "yakiimo"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("sweet potato" = 1)
foodtypes = GRAIN | VEGETABLES | SUGAR
@@ -354,7 +354,7 @@
name = "roast parsnip"
desc = "Sweet and crunchy."
icon_state = "roastparsnip"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("parsnip" = 1)
foodtypes = VEGETABLES
code/game/objects/items/food/pie.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/item/food/pie
icon = 'icons/obj/food/piecake.dmi'
trash_type = /obj/item/trash/plate
bite_consumption = 3
w_class = WEIGHT_CLASS_NORMAL
max_volume = 80
@@ -12,7 +12,7 @@
/obj/item/food/pieslice
name = "pie slice"
icon = 'icons/obj/food/piecake.dmi'
trash_type = /obj/item/trash/plate
w_class = WEIGHT_CLASS_TINY
food_reagents = list(/datum/reagent/consumable/nutriment = 2)
tastes = list("pie" = 1, "uncertainty" = 1)
code/game/objects/items/food/sandwichtoast.dm
+5 -6
View File
@@ -3,7 +3,7 @@
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "sandwich"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
foodtypes = GRAIN | VEGETABLES
@@ -14,7 +14,7 @@
desc = "A warm, melty sandwich that goes perfectly with tomato soup."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "toastedsandwich"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/carbon = 4)
tastes = list("toast" = 2, "cheese" = 3, "butter" = 1)
foodtypes = GRAIN
@@ -26,7 +26,6 @@
desc = "A light snack for a warm day. ...but what if you grilled it?"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "sandwich"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("bread" = 1, "cheese" = 1)
foodtypes = GRAIN | DAIRY
@@ -41,7 +40,7 @@
desc = "You wish you had some peanut butter to go with this..."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "jellysandwich"
trash_type = /obj/item/trash/plate
bite_consumption = 3
tastes = list("bread" = 1, "jelly" = 1)
foodtypes = GRAIN
@@ -60,7 +59,7 @@
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "notasandwich"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("nothing suspicious" = 1)
foodtypes = GRAIN | GROSS
@@ -71,7 +70,7 @@
desc = "A slice of toast covered with delicious jam."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "jellytoast"
trash_type = /obj/item/trash/plate
bite_consumption = 3
tastes = list("toast" = 1, "jelly" = 1)
foodtypes = GRAIN | BREAKFAST
code/game/objects/items/food/spaghetti.dm
+7 -7
View File
@@ -22,7 +22,7 @@
name = "boiled spaghetti"
desc = "A plain dish of noodles, this needs more ingredients."
icon_state = "spaghettiboiled"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
microwaved_type = null
@@ -34,7 +34,7 @@
name = "spaghetti"
desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
icon_state = "pastatomato"
trash_type = /obj/item/trash/plate
bite_consumption = 4
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
microwaved_type = null
@@ -45,7 +45,7 @@
name = "copypasta"
desc = "You probably shouldn't try this, you always hear people talking about how bad it is..."
icon_state = "copypasta"
trash_type = /obj/item/trash/plate
bite_consumption = 4
food_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/tomatojuice = 20, /datum/reagent/consumable/nutriment/vitamin = 8)
microwaved_type = null
@@ -56,7 +56,7 @@
name = "spaghetti and meatballs"
desc = "Now that's a nic'e meatball!"
icon_state = "meatballspaghetti"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
microwaved_type = null
tastes = list("pasta" = 1, "meat" = 1)
@@ -66,7 +66,7 @@
name = "spesslaw"
desc = "A lawyers favourite."
icon_state = "spesslaw"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 20, /datum/reagent/consumable/nutriment/vitamin = 3)
microwaved_type = null
tastes = list("pasta" = 1, "meat" = 1)
@@ -75,7 +75,7 @@
name = "chow mein"
desc = "A nice mix of noodles and fried vegetables."
icon_state = "chowmein"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
microwaved_type = null
tastes = list("noodle" = 1, "tomato" = 1)
@@ -94,7 +94,7 @@
name = "butter noodles"
desc = "Noodles covered in savory butter. Simple and slippery, but delicious."
icon_state = "butternoodles"
trash_type = /obj/item/trash/plate
food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2)
microwaved_type = null
tastes = list("noodle" = 1, "butter" = 1)
code/game/objects/items/trash.dm
-5
View File
@@ -61,11 +61,6 @@
name = "waffles tray"
icon_state = "waffles"
/obj/item/trash/plate
name = "plate"
icon_state = "plate"
resistance_flags = NONE
/obj/item/trash/pistachios
name = "pistachios pack"
icon_state = "pistachios_pack"