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

Food update -

Browse Source 
-Removes all the dumb weapon/syntiflesh recipes. Remove syntikebab. Cleans up commented-out stuff that'll never be readded.
-Deletes jar.dm, which I tried to delete months ago but somehow messed up.

-'Imitation' carp meat can now be made with 5 units of carpotoxin and some tofu.
-Some recipes changed slightly.
-Adds berry muffins and booberry muffins.

Cleaned up the carton-based sprites in drinks.dmi to look better.
New sprites for muffins, donut boxes, brain burgers, super big bite burgers, enchiladas, monkey delight, baguettes, fried eggs, wing fang chu, clown's tears, and mystery soup.

I also completely reorganized the food.dmi
(and made my bed and mopped the floors)
This commit is contained in:
Cheridan
2013-06-04 14:45:40 -05:00
parent e31c9ca3b2
commit df681bed40
6 changed files with 51 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/recipes_microwave.dm
+28 -88
View File
@@ -9,14 +9,6 @@
/obj/item/device/assembly/signaler
)
result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
I said no!
/datum/recipe/syntitelebacon
items = list(
/obj/item/weapon/syntiflesh,
/obj/item/device/assembly/signaler
)
result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
*/
/datum/recipe/friedegg
@@ -92,15 +84,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/human/burger
/*
/datum/recipe/monkeyburger
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
*/
/datum/recipe/plainburger
reagents = list("flour" = 5)
items = list(
@@ -108,13 +91,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
/datum/recipe/syntiburger
reagents = list("flour" = 5)
items = list(
/obj/item/weapon/syntiflesh
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
/datum/recipe/brainburger
reagents = list("flour" = 5)
items = list(
@@ -182,13 +158,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/waffles
/*
/datum/recipe/faggot
monkeymeat_amount = 1
humanmeat_amount = 1
creates = "/obj/item/weapon/reagent_containers/food/snacks/faggot"
*/
/datum/recipe/donkpocket
reagents = list("flour" = 5)
items = list(
@@ -230,26 +199,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
/datum/recipe/syntibread
reagents = list("flour" = 15)
items = list(
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
/*
/datum/recipe/meatbreadhuman
flour_amount = 3
humanmeat_amount = 3
cheese_amount = 3
creates = "/obj/item/weapon/reagent_containers/food/snacks/meatbread"
*/
/datum/recipe/xenomeatbread
reagents = list("flour" = 15)
items = list(
@@ -288,6 +237,23 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin
/datum/recipe/berrymuffin
reagents = list("milk" = 5, "flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/berries
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry
/datum/recipe/booberrymuffin
reagents = list("milk" = 5, "flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/berries,
/obj/item/weapon/ectoplasm
)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
/datum/recipe/eggplantparm
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
@@ -317,7 +283,8 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot //TODO: more carrots
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
@@ -375,15 +342,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
)
result = /obj/item/weapon/reagent_containers/food/snacks/cherrypie
/*
/datum/recipe/berrypie
reagents = list("berryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
)
result = /obj/item/weapon/reagent_containers/food/snacks/berrypie
*/
/datum/recipe/berryclafoutis
reagents = list("flour" = 10)
items = list(
@@ -421,14 +380,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
/datum/recipe/syntikabob
items = list(
/obj/item/stack/rods,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
/datum/recipe/tofukabob
items = list(
/obj/item/stack/rods,
@@ -463,6 +414,13 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries
/datum/recipe/carpmeat
reagents = list("carpotoxin" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
/datum/recipe/cubancarp
reagents = list("flour" = 5)
items = list(
@@ -506,13 +464,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
/datum/recipe/syntisteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/weapon/syntiflesh
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
/datum/recipe/pizzamargherita
reagents = list("flour" = 10)
items = list(
@@ -535,17 +486,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/syntipizza
reagents = list("flour" = 10)
items = list(
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/syntiflesh,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/mushroompizza
reagents = list("flour" = 10)
items = list(
@@ -700,7 +640,7 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
/datum/recipe/baguette
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 15)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
result = /obj/item/weapon/reagent_containers/food/snacks/baguette
/datum/recipe/fishandchips
code/modules/reagents/reagent_containers/food/drinks/jar.dm
-29
View File
@@ -1,29 +0,0 @@
///jar
/obj/item/weapon/reagent_containers/food/drinks/jar
name = "empty jar"
desc = "A jar. You're not sure what it's supposed to hold."
icon_state = "jar"
item_state = "beaker"
New()
..()
reagents.add_reagent("slime", 50)
on_reagent_change()
if (reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
if("slime")
icon_state = "jar_slime"
name = "slime jam"
desc = "A jar of slime jam. Delicious!"
else
icon_state ="jar_what"
name = "jar of something"
desc = "You can't really tell what this is."
else
icon_state = "jar"
name = "empty jar"
desc = "A jar. You're not sure what it's supposed to hold."
return
code/modules/reagents/reagent_containers/food/snacks.dm
+23 -19
View File
@@ -348,8 +348,7 @@
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("sprinkles", 1)
bitesize = 10
var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10)
switch(chaosselect)
switch(rand(1,10))
if(1)
reagents.add_reagent("nutriment", 3)
if(2)
@@ -502,13 +501,7 @@
..()
reagents.add_reagent("nutriment", 2)
/*/obj/item/weapon/reagent_containers/food/snacks/flour //Has been converted into a reagent. Use that instead of the item!
name = "flour"
desc = "Some flour"
icon_state = "flour"
New()
..()
reagents.add_reagent("nutriment", 1)*/
// /obj/item/weapon/reagent_containers/food/snacks/flour //Has been converted into a reagent. Use that instead of the item!
/obj/item/weapon/reagent_containers/food/snacks/tofu
name = "tofu"
@@ -519,7 +512,6 @@
reagents.add_reagent("nutriment", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
name = "carp fillet"
desc = "A fillet of spess carp meat"
@@ -531,6 +523,10 @@
reagents.add_reagent("carpotoxin", 3)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
name = "imitation carp fillet"
desc = "Almost just like the real thing, kinda."
/obj/item/weapon/reagent_containers/food/snacks/fishfingers
name = "fish fingers"
desc = "A finger of fish."
@@ -754,13 +750,23 @@
/obj/item/weapon/reagent_containers/food/snacks/muffin
name = "muffin"
desc = "A delicious and spongy little cake"
desc = "A delicious and spongy little cake."
icon_state = "muffin"
New()
..()
reagents.add_reagent("nutriment", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/muffin/berry
name = "berry muffin"
icon_state = "berrymuffin"
desc = "A delicious and spongy little cake, with berries."
/obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
name = "booberry muffin"
icon_state = "booberrymuffin"
desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
/obj/item/weapon/reagent_containers/food/snacks/pie
name = "banana cream pie"
desc = "Just like back home, on clown planet! HONK!"
@@ -1079,7 +1085,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatsteak
name = "meat steak"
desc = "A piece of hot spicy meat."
icon_state = "meatstake"
icon_state = "meatsteak"
trash = /obj/item/trash/plate
New()
..()
@@ -1121,7 +1127,6 @@
reagents.add_reagent("nutriment", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatballsoup
name = "meatball soup"
desc = "You've got balls kid, BALLS!"
@@ -1171,7 +1176,7 @@
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
name = "vegetable soup"
desc = "A true vegan meal" //TODO
desc = "A true vegan meal"
icon_state = "vegetablesoup"
trash = /obj/item/trash/snack_bowl
New()
@@ -1202,8 +1207,7 @@
New()
..()
eatverb = pick("slurp","sip","suck","inhale","drink")
var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
switch(mysteryselect)
switch(rand(1,10))
if(1)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("capsaicin", 3)
@@ -1361,7 +1365,6 @@
name = "enchiladas"
desc = "Viva La Mexico!"
icon_state = "enchiladas"
trash = /obj/item/trash/tray
New()
..()
reagents.add_reagent("nutriment",8)
@@ -1370,9 +1373,9 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
name = "monkey's delight"
desc = "Eeee Eee!"
desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas."
icon_state = "monkeysdelight"
trash = /obj/item/trash/tray
trash = /obj/item/trash/snack_bowl
New()
..()
reagents.add_reagent("nutriment", 10)
@@ -1460,6 +1463,7 @@
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
trash = /obj/item/trash/snack_bowl
New()
..()
eatverb = pick("slurp","sip","suck","inhale","drink")