cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-19 04:05:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8203 from Cerebulon/food2021

Browse Source 
Food Expansion
This commit is contained in:
MistakeNot4892
2021-09-03 11:55:26 +10:00
committed by GitHub
parent c501391a22 81229b1fab
commit f14907cdb9
35 changed files with 1022 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc.dm
+7 -1
View File
@@ -489,4 +489,10 @@
/obj/item/clothing/head/beret/corp/xion
name = "\improper Xion beret"
desc = "An orange beret denoting employment with Xion Manufacturing. For personnel that are more inclined towards style than safety."
icon_state = "beret_orange"
icon_state = "beret_orange"
/obj/item/clothing/head/fish
name = "fish skull"
desc = "You... you're not actually going to wear that, right?"
icon_state = "fishskull"
flags_inv = HIDEEARS|BLOCKHAIR
code/modules/economy/vending_machines.dm
+28 -9
View File
@@ -152,6 +152,7 @@
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 12,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 12,
/obj/item/weapon/reagent_containers/food/snacks/semki = 12,
@@ -182,6 +183,7 @@
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 1,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 1,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 1,
/obj/item/weapon/reagent_containers/food/snacks/semki = 1,
@@ -838,6 +840,7 @@
/obj/machinery/vending/hotfood
name = "\improper Hot Foods!"
desc = "An old vending machine promising 'hot foods'. You doubt any of its contents are still edible."
description_fluff = "The Galaksi 'Toasty-Fresh' vendor line was discontinued decades ago after a brief run due to the need for twice-daily restocking."
vend_delay = 40
icon_state = "hotfood"
products = list(/obj/item/weapon/reagent_containers/food/snacks/old/pizza = 3,
@@ -852,10 +855,11 @@
/obj/machinery/vending/weeb
name = "\improper Nippon-tan!"
desc = "A distressingly ethnic vending machine loaded with high sucrose low calorie for lack of better words snacks."
desc = "A distressingly cutesy vending machine loaded with high sucrose low calorie - for lack of a better word - 'snacks'."
description_fluff = "Nippon-tan branding remains competitive in the face of its much larger competitors due to their willingness to offer more variety than the absolute most basic faux-corn snacks to the massive 'long shelf life' market."
vend_delay = 30
vend_reply = "Dōmo arigatō!"
product_slogans = "Tanoshī! ;Itadakimasu!"
vend_reply = "Domo arigato!"
product_slogans = "Tanosho! ;Itadakimasu!"
icon_state = "weeb"
products = list(/obj/item/weapon/reagent_containers/food/snacks/weebonuts = 8,
/obj/item/weapon/reagent_containers/food/snacks/ricecake = 8,
@@ -866,7 +870,8 @@
/obj/item/weapon/storage/box/pocky = 6,
/obj/item/weapon/reagent_containers/food/snacks/chocobanana = 6,
/obj/item/weapon/reagent_containers/food/snacks/dorayaki = 6,
/obj/item/weapon/reagent_containers/food/snacks/daifuku = 6
/obj/item/weapon/reagent_containers/food/snacks/daifuku = 6,
/obj/item/weapon/reagent_containers/food/snacks/packaged/mochicake = 6
)
prices = list(/obj/item/weapon/reagent_containers/food/snacks/weebonuts = 5,
@@ -878,7 +883,8 @@
/obj/item/weapon/storage/box/pocky = 8,
/obj/item/weapon/reagent_containers/food/snacks/chocobanana = 10,
/obj/item/weapon/reagent_containers/food/snacks/dorayaki = 5,
/obj/item/weapon/reagent_containers/food/snacks/daifuku = 5
/obj/item/weapon/reagent_containers/food/snacks/daifuku = 5,
/obj/item/weapon/reagent_containers/food/snacks/packaged/mochicake = 10
)
////////////////////sol_vend (Mars Mart) (ADDED 04/11/2021)////////////////////////////////////////////////////
@@ -886,6 +892,7 @@
/obj/machinery/vending/sol
name = "\improper Sol-Snacks"
desc = "A SolCentric vending machine dispensing a number of Sol-themed snacks, along with other foods."
description_fluff = "Sol-Snacks is a cash-bloated Catalonian startup convinced that the rest of the galaxy loves Sol as much as Sol does. Their ongoing vending contract with NanoTrasen has annoyed certain multinational factions."
vend_delay = 30
product_slogans = "A taste of Sol!"
icon_state = "solsnack"
@@ -898,6 +905,8 @@
/obj/item/weapon/reagent_containers/food/snacks/oort = 8,
/obj/item/weapon/reagent_containers/food/snacks/sun_snax = 8,
/obj/item/weapon/reagent_containers/food/snacks/canned/appleberry = 6,
/obj/item/weapon/reagent_containers/food/snacks/packaged/lunacake = 6,
/obj/item/weapon/reagent_containers/food/snacks/packaged/darklunacake = 6,
/obj/item/weapon/storage/box/gum = 8,
/obj/item/weapon/storage/box/admints = 8
)
@@ -911,6 +920,8 @@
/obj/item/weapon/reagent_containers/food/snacks/oort = 5,
/obj/item/weapon/reagent_containers/food/snacks/sun_snax = 5,
/obj/item/weapon/reagent_containers/food/snacks/canned/appleberry = 8,
/obj/item/weapon/reagent_containers/food/snacks/packaged/lunacake = 10,
/obj/item/weapon/reagent_containers/food/snacks/packaged/darklunacake = 10,
/obj/item/weapon/storage/box/gum = 2,
/obj/item/weapon/storage/box/admints = 2
)
@@ -922,6 +933,7 @@
/obj/machinery/vending/snix
name = "\improper Snix"
desc = "A snack vending machine, offering a selection of slavic beer snacks."
description_fluff = "Snix is a Centauri Provisions brand marketed directly to the surprisingly widespread population of spacer slavs."
vend_delay = 30
product_slogans = "Snix!"
icon_state = "snix"
@@ -962,6 +974,7 @@
/obj/machinery/vending/snlvend
name = "\improper Shop-n-Large Snacks!"
desc = "A Shop-n-Large brand vending machine! Enjoy all your favorites!"
description_fluff = "Shop-n-Large is Centauri Provisions' own generic low-cost retail brand, rumoured to sell genuinely lower-grade versions of its product line. Efforts to prove this have been widely denied publication on dubious grounds."
vend_delay = 30
product_slogans = "Shop Shop-n-Large!, Buy! Buy! Buy!, Try our new Bread Tube! Now with 10% less sawdust!"
icon = 'icons/obj/vending.dmi'
@@ -979,6 +992,7 @@
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips = 8,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 8,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 8
@@ -997,6 +1011,7 @@
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 5,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips/snv = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 5,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 5,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 5
@@ -1007,6 +1022,7 @@
/obj/machinery/vending/sovietsoda
name = "BODA"
desc = "An old sweet water vending machine,how did this end up here?"
description_fluff = "Originally the product of a genuine rim-world commune, BODA vendors have been produced by the Gilthari Exports luxury vending division for almost two centuries."
icon_state = "sovietsoda"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, //ADDITION 04/03/2021
@@ -1017,20 +1033,23 @@
/obj/machinery/vending/sovietvend //ADDITION 04/20/2021
name = "Ration Station"
desc = "An old ration vendor unit. How it even still functional?"
desc = "A corporate ration vendor unit. Extremely functional."
description_fluff = "Designed for use on remote, utilitarian corporate facilities. Perfect for extracting a little extra back from indentured miners. Often modified to accept only company scrip."
icon = 'icons/obj/vending.dmi'
icon_state = "sovietvend"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
product_ads = "Hunger may affect productivity.;Purchase sustinence here.;The company offers only the best for your continued survival.;Remember to obey corporate regulations when purchasing daily rations!;One per customer."
products = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/genration = 8,
/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration = 8,
/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration = 8)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2,
/obj/item/weapon/reagent_containers/food/snacks/canned/ntbeans = 2)
///////////////////////Radical Renard///////////////////////////////////////
/obj/machinery/vending/radren
name = "Radical Renard Sodas"
desc = "A softdrink vendor owned by a frontier based soda company that's been contracted by NanoTrasen"
desc = "A softdrink vendor owned by a frontier based soda company that's been contracted by NanoTrasen."
description_fluff = "New Singapore's most popular chilled drink vending operation has been franchised all over the galaxy at dubiously low prices. How can you hate a mascot like Renard?"
icon_state = "radren"
product_slogans = "Enjoy the rad refreshing taste of Radical Renard brand soda!"
product_ads = "Radically Refreshing!;Get Cool!;Have you tried our new Andromeda Apple?;Enjoy a cold one with Renard!"
code/modules/food/food/condiment.dm
+37 -10
View File
@@ -61,6 +61,11 @@
desc = "You feel more American already."
icon_state = "ketchup"
center_of_mass = list("x"=16, "y"=6)
if("mustard")
name = "Mustard"
desc = "A somewhat bitter topping."
icon_state = "mustard"
center_of_mass = list("x"=16, "y"=6)
if("capsaicin")
name = "Hotsauce"
desc = "You can almost TASTE the stomach ulcers now!"
@@ -76,6 +81,11 @@
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
center_of_mass = list("x"=16, "y"=6)
if("vinegar")
name = "Vinegar"
desc = "An acetic acid used in various dishes."
icon_state = "vinegar"
center_of_mass = list("x"=16, "y"=6)
if("frostoil")
name = "Coldsauce"
desc = "Leaves the tongue numb in its passage."
@@ -87,7 +97,7 @@
icon_state = "saltshaker"
center_of_mass = list("x"=17, "y"=11)
if("blackpepper")
name = "Pepper Mill"
name = "Pepper Shaker"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
center_of_mass = list("x"=17, "y"=11)
@@ -118,7 +128,6 @@
if("spacespice")
name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. Definitely not worms."
icon = 'icons/obj/food_syn.dmi'
icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=6)
if("barbecue")
@@ -158,6 +167,10 @@
. = ..()
reagents.add_reagent("ketchup", 50)
/obj/item/weapon/reagent_containers/food/condiment/mustard/Initialize()
. = ..()
reagents.add_reagent("mustard", 50)
/obj/item/weapon/reagent_containers/food/condiment/hotsauce/Initialize()
. = ..()
reagents.add_reagent("capsaicin", 50)
@@ -177,6 +190,10 @@
. = ..()
reagents.add_reagent("soysauce", 50)
/obj/item/weapon/reagent_containers/food/condiment/vinegar/Initialize()
. = ..()
reagents.add_reagent("vinegar", 50)
/obj/item/weapon/reagent_containers/food/condiment/yeast
name = "Yeast"
@@ -193,8 +210,8 @@
/obj/item/weapon/reagent_containers/food/condiment/small/on_reagent_change()
return
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker //Seperate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker //Seperate from above since it's a small shaker rather than a large one
name = "salt shaker"
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
center_of_mass = list("x"=17, "y"=11)
@@ -203,16 +220,26 @@
. = ..()
reagents.add_reagent("sodiumchloride", 20)
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill
name = "pepper mill"
/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker
name = "pepper shaker"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
icon_state = "peppershakersmall"
center_of_mass = list("x"=17, "y"=11)
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill/Initialize()
/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 20)
/obj/item/weapon/reagent_containers/food/condiment/small/peppergrinder
name = "pepper mill"
desc = "Fancy way to season a dish or make people sneeze."
icon_state = "peppermill"
center_of_mass = list("x"=17, "y"=11)
/obj/item/weapon/reagent_containers/food/condiment/small/peppergrinder/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 30)
/obj/item/weapon/reagent_containers/food/condiment/small/sugar
name = "sugar"
desc = "Sweetness in a bottle"
@@ -429,11 +456,11 @@
. = ..()
reagents.add_reagent("flour", 200)
randpixel_xy()
/obj/item/weapon/reagent_containers/food/condiment/spacespice
name = "space spices"
desc = "An exotic blend of spices for cooking. Definitely not worms."
icon = 'icons/obj/food_syn.dmi'
icon = 'icons/obj/food.dmi'
icon_state = "spacespicebottle"
possible_transfer_amounts = list(1,40) //for clown turning the lid off
amount_per_transfer_from_this = 1
code/modules/food/food/snacks.dm
+661 -118
View File
File diff suppressed because it is too large Load Diff
code/modules/food/food/snacks/meat.dm
+1 -1
View File
@@ -46,7 +46,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat"
desc = "Tastes like... well, you know."
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
name = "chicken"
icon = 'icons/obj/food_syn.dmi'
code/modules/food/recipes_fryer.dm
+26
View File
@@ -177,3 +177,29 @@
result = /obj/item/weapon/reagent_containers/food/snacks/pisanggoreng
coating = /datum/reagent/nutriment/coating/batter
/datum/recipe/generalschicken
appliance = FRYER
reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/generalschicken
/datum/recipe/chickenwings
appliance = FRYER
reagents = list("capsaicin" = 5, "batter" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.
/datum/recipe/locust
items = list(
/obj/item/weapon/reagent_containers/food/snacks/locust
)
coating = /datum/reagent/nutriment/coating/batter
result = /obj/item/weapon/reagent_containers/food/snacks/locust_cooked
code/modules/food/recipes_grill.dm
+1 -1
View File
@@ -252,7 +252,7 @@
/datum/recipe/omurice/face
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 5, "egg" = 3)
reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 1, "egg" = 3)
result = /obj/item/weapon/reagent_containers/food/snacks/omurice/face
/datum/recipe/meatsteak
code/modules/food/recipes_microwave.dm
+102 -1
View File
@@ -333,6 +333,11 @@ I said no!
reagents = list("water" = 5, "sugar" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
/datum/recipe/caramelapple
fruit = list("apple" = 1)
reagents = list("milk" = 5, "sugar" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread
reagents = list("redwine" = 5)
items = list(
@@ -1078,4 +1083,100 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
/datum/recipe/sushi
fruit = list("cabbage" = 1)
reagents = list("rice" = 20)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi
/datum/recipe/goulash
fruit = list("tomato" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/spagetti
)
result = /obj/item/weapon/reagent_containers/food/snacks/goulash
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
/datum/recipe/roastbeef
fruit = list("carrot" = 2, "potato" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/roastbeef
/datum/recipe/reishicup
reagents = list("psilocybin" = 3, "sugar" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/weapon/reagent_containers/food/snacks/reishicup
/datum/recipe/hotandsoursoup
fruit = list("cabbage" = 1, "mushroom" = 1)
reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
/datum/recipe/kitsuneudon
reagents = list("egg" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon
/datum/recipe/mammi
fruit = list("orange" = 1)
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/mammi
/datum/recipe/carpsushi
fruit = list("cabbage" = 1)
reagents = list("rice" = 20)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi
/datum/recipe/sharkdip
reagents = list("sodiumchloride" = 1)
fruit = list("chili" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip
/datum/recipe/sharkcubes
reagents = list("soysauce" = 5, "sodiumchloride" = 1)
fruit = list("potato" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes
//// food cubes
/datum/recipe/foodcubes
reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive
items = list()
result = /obj/item/weapon/storage/box/wings/tray
code/modules/food/recipes_oven.dm
+38 -3
View File
@@ -21,7 +21,7 @@
fruit = list("banana" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
/obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
reagent_mix = RECIPE_REAGENT_REPLACE
@@ -512,13 +512,17 @@
/datum/recipe/pancakes
appliance = OVEN
fruit = list("berries" = 2)
reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/pancakes
/datum/recipe/pancakes/berry
fruit = list("berries" = 2)
result = /obj/item/weapon/reagent_containers/food/snacks/pancakes/berry
/datum/recipe/lasagna
appliance = OVEN
fruit = list("tomato" = 2, "eggplant" = 1)
@@ -689,4 +693,35 @@
/obj/item/weapon/reagent_containers/food/snacks/doughslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here
result = /obj/item/weapon/reagent_containers/food/snacks/veggiemomo
result = /obj/item/weapon/reagent_containers/food/snacks/veggiemomo
/datum/recipe/lobster
appliance = OVEN
fruit = list("lemon" = 1, "cabbage" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/lobster
)
result = /obj/item/weapon/reagent_containers/food/snacks/lobstercooked
/datum/recipe/cuttlefish
appliance = OVEN
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish
)
result = /obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked
/datum/recipe/monkfish
appliance = OVEN
fruit = list("chili" = 1, "onion" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked
/datum/recipe/sharksteak
appliance = OVEN
reagents = list("blackpepper"= 1, "sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked
code/modules/mob/living/silicon/robot/drone/drone_items.dm
+1 -1
View File
@@ -123,7 +123,7 @@
/obj/item/weapon/disposable_teleporter/slime,
/obj/item/slimepotion,
/obj/item/slime_extract,
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
/obj/item/weapon/reagent_containers/food/snacks/cube
)
code/modules/reagents/reactions/instant/instant.dm
+15
View File
@@ -1092,6 +1092,21 @@
required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1)
result_amount = 1 // Roughly 20u per phoron sheet
//Cube Food Colonies
/decl/chemical_reaction/instant/meatcolony
name = "protein"
id = "meatcolony"
result = "protein"
required_reagents = list("meatcolony" = 5, "virusfood" = 5)
result_amount = 60
/decl/chemical_reaction/instant/plantcolony
name = "nutriment"
id = "plantcolony"
result = "nutriment"
required_reagents = list("plantcolony" = 5, "virusfood" = 5)
result_amount = 60
// Neutralization.
/decl/chemical_reaction/instant/neutralize_neurotoxic_protein
code/modules/reagents/reagents/core.dm
+2 -2
View File
@@ -182,8 +182,8 @@
T.wet_floor(1)
/datum/reagent/water/touch_obj(var/obj/O, var/amount)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/cube))
var/obj/item/weapon/reagent_containers/food/snacks/cube/cube = O
if(!cube.wrapped)
cube.Expand()
else
code/modules/reagents/reagents/food_drinks.dm
+35 -1
View File
@@ -433,6 +433,14 @@
color = "#792300"
allergen_type = ALLERGEN_BEANS //Soy (beans)
/datum/reagent/nutriment/vinegar
name = "Vinegar"
id = "vinegar"
description = "Vinegar, great for fish and pickles."
taste_description = "vinegar"
reagent_state = LIQUID
nutriment_factor = 5
color = "#54410C"
/datum/reagent/nutriment/ketchup
name = "Ketchup"
@@ -444,6 +452,15 @@
color = "#731008"
allergen_type = ALLERGEN_FRUIT //Tomatoes are a fruit.
/datum/reagent/nutriment/mustard
name = "Mustard"
id = "mustard"
description = "Delicious mustard. Good on Hot Dogs."
taste_description = "mustard"
reagent_state = LIQUID
nutriment_factor = 5
color = "#E3BD00"
/datum/reagent/nutriment/barbecue
name = "Barbeque Sauce"
id = "barbecue"
@@ -834,7 +851,6 @@
M.apply_effect(4, AGONY, 0)
if(prob(5))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>", "<span class='danger'>You feel like your insides are burning!</span>")
holder.remove_reagent("frostoil", 5)
/* Drinks */
@@ -1030,6 +1046,24 @@
glass_name = "poison berry juice"
glass_desc = "A glass of deadly juice."
/datum/reagent/toxin/meatcolony
name = "A colony of meat cells"
id = "meatcolony"
description = "Specialised cells designed to produce a large amount of meat once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous."
taste_description = "a fibrous mess"
reagent_state = LIQUID
color = "#ff2424"
strength = 10
/datum/reagent/toxin/plantcolony
name = "A colony of plant cells"
id = "plantcolony"
description = "Specialised cells designed to produce a large amount of nutriment once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous."
taste_description = "a fibrous mess"
reagent_state = LIQUID
color = "#7ce01f"
strength = 10
/datum/reagent/drink/juice/potato
name = "Potato Juice"
id = "potatojuice"
code/modules/xenobio/items/extracts.dm
+1 -1
View File
@@ -90,7 +90,7 @@
/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder)
for(var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom))
new /obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube(get_turf(holder.my_atom))
..()
/decl/chemical_reaction/instant/slime/grey_slimejelly
code/modules/xenobio/machinery/processor.dm
+1 -1
View File
@@ -70,7 +70,7 @@
sleep(1 SECONDS)
while(monkeys_recycled >= 4)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(src))
new /obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube(get_turf(src))
playsound(src, 'sound/effects/splat.ogg', 50, 1)
monkeys_recycled -= 4
sleep(1 SECOND)