diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index 069911606e..da6e153da5 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -156,3 +156,13 @@ contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0} = 3) access = access_hydroponics +/datum/supply_pack/hydro/fish + name = "Seafood supply crate" + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/lobster = 6, + /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 1 + ) + cost = 20 + containertype = /obj/structure/closet/crate/freezer/centauri + containername = "Fresh fish crate" \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8636b5b606..cdde7331ea 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -484,4 +484,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" \ No newline at end of file + 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 \ No newline at end of file diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index e7cfac1cb0..47190cb732 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1042,7 +1042,7 @@ /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, - /obj/item/weapon/reagent_containers/food/snacks/canned/ntbeans = 2)) + /obj/item/weapon/reagent_containers/food/snacks/canned/ntbeans = 2) ///////////////////////Radical Renard/////////////////////////////////////// diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 395cd23253..2925697f05 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -5562,10 +5562,6 @@ center_of_mass = list("x"=16, "y"=11) bitesize = 6 -/obj/item/weapon/reagent_containers/food/snacks/custardbun/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/weapon/reagent_containers/food/snacks/chickenmomo name = "chicken momo" gender = PLURAL @@ -6859,7 +6855,7 @@ desc = "A can of premium preserved vat-grown holstein beef. Now 99.9% bone free!" trash = /obj/item/trash/beef filling_color = "#663300" - enter_of_mass = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("beef" = 1) bitesize = 2 @@ -6874,7 +6870,7 @@ desc = "Luna Colony beans. Carefully synthethized from soy." trash = /obj/item/trash/beans filling_color = "#ff6633" - enter_of_mass = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("beans" = 1, "tomato sauce" = 1) nutriment_amt = 15 bitesize = 2 @@ -6904,7 +6900,7 @@ desc = "I-Yam Brand canned spinach. Toot toot!" trash = /obj/item/trash/spinach filling_color = "#003300" - enter_of_mass = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) nutriment_amt = 5 nutriment_desc = list("soggy" = 1, "vegetable" = 1) bitesize = 5 @@ -6923,7 +6919,7 @@ desc = "Soyuz Caviar, or space carp eggs. Carefully treated to eliminate those pesky toxins, though it does lack that delicious signature numbness." trash = /obj/item/trash/fishegg filling_color = "#000000" - enter_of_mass = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("fish" = 1, "salt" = 1) nutriment_amt = 6 bitesize = 1 @@ -6938,7 +6934,7 @@ desc = "Soyuz caviar, or space carp eggs. Banned by the Vir Food Health Administration for exceeding the legally set amount of carpotoxins in food stuffs." trash = /obj/item/trash/carpegg filling_color = "#330066" - enter_of_mass = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("fish" = 1, "salt" = 1, "a numbing sensation" = 1) nutriment_amt = 6 bitesize = 1 @@ -6954,7 +6950,7 @@ desc = "A re-branding of a classic Terran snack! Contains mostly edible ingredients." trash = /obj/item/trash/maps filling_color = "#330066" - enter_of_mass = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("meat" = 1, "salt" = 1) nutriment_amt = 8 bitesize = 2 @@ -6970,7 +6966,7 @@ desc = "A classic snack favored by Sol astronauts. Made from dried apple-hybidized berries grown on the lunar colonies." trash = /obj/item/trash/appleberry filling_color = "#FFFFFF" - enter_of_mass = list("x"=15, "y"=9) + center_of_mass = list("x"=15, "y"=9) nutriment_desc = list("apple" = 1, "sweetness" = 1) nutriment_amt = 8 bitesize = 2 @@ -7046,8 +7042,8 @@ icon_state = "spacer_cake" desc = "Guaranteed to survive longer than you will." description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been statistically proven to lower survival rates on all missions where it is present." - package_trash = /obj/item/trash/spacercake_wrap - package_open_state = "spacercake_open" + package_trash = /obj/item/trash/spacer_cake_wrap + package_open_state = "spacer_cake_open" filling_color = "#FFE591" center_of_mass = list("x"=15, "y"=11) nutriment_amt = 4 @@ -7158,7 +7154,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi name = "sushi roll" desc = "A whole sushi roll! Slice it up and enjoy with some soy sauce and wasabi." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "sushi" slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/sushi/filled slices_num = 5 @@ -7173,7 +7169,7 @@ /obj/item/weapon/reagent_containers/food/snacks/slice/sushi/filled name = "piece of sushi" desc = "A slice of a larger sushi roll, ready to devour." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "sushi_s" bitesize = 5 whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi @@ -7183,8 +7179,8 @@ /obj/item/weapon/reagent_containers/food/snacks/goulash name = "goulash" - desc = "Paprika put to good use, finally, in a soup of meat and vegetables." - icon = 'icons/obj/food_vr.dmi' + desc = "Hope you're Hungary!" + icon = 'icons/obj/food_syn.dmi' icon_state = "goulash" trash = /obj/item/trash/snack_bowl nutriment_amt = 6 @@ -7198,8 +7194,8 @@ /obj/item/weapon/reagent_containers/food/snacks/donerkebab name = "doner kebab" - desc = "A delicious sandwich-like food from ancient Earth. The meat is typically cooked on a vertical rotisserie." - icon = 'icons/obj/food_vr.dmi' + desc = "Traditional food of the very drunk. The meat is typically cooked on a vertical rotisserie." + icon = 'icons/obj/food_syn.dmi' icon_state = "doner_kebab" nutriment_amt = 5 nutriment_desc = list("vegetables" = 2, "seasoned meat" = 5) @@ -7212,7 +7208,7 @@ /obj/item/weapon/reagent_containers/food/snacks/roastbeef name = "roast beef" desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "roastbeef" trash = /obj/item/trash/plate nutriment_amt = 8 @@ -7227,7 +7223,7 @@ /obj/item/weapon/reagent_containers/food/snacks/reishicup name = "reishi's cup" desc = "A chocolate treat with an odd flavor." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "reishiscup" nutriment_amt = 3 nutriment_desc = list("chocolate" = 4, "colors" = 2) @@ -7240,7 +7236,7 @@ /obj/item/weapon/storage/box/wings //This is kinda like the donut box. name = "wing basket" desc = "A basket of chicken wings! Get some before they're all gone! Or maybe you're too late..." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "wings5" var/icon_base = "wings" var/startswith = 5 @@ -7265,7 +7261,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chickenwing name = "chicken wing" desc = "What flavor even is this? Buffalo? Barbecue? Or something more exotic?" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "wing" nutriment_amt = 2 nutriment_desc = list("chicken" = 2, "unplacable flavor sauce" = 4) @@ -7278,8 +7274,8 @@ /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup name = "hot & sour soup" - desc = "A soup both spicy and sour from ancient Earth cooking traditions. This one is made with tofu." - icon = 'icons/obj/food_vr.dmi' + desc = "A soup both spicy and sour from ancient Chinese cooking traditions. This one is made with tofu." + icon = 'icons/obj/food_syn.dmi' icon_state = "hotandsoursoup" trash = /obj/item/trash/asian_bowl nutriment_amt = 6 @@ -7293,7 +7289,7 @@ /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon name = "kitsune udon" desc = "A purported favorite of kitsunes in ancient japanese myth: udon noodles, fried egg, and tofu." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "kitsuneudon" trash = /obj/item/trash/asian_bowl nutriment_amt = 6 @@ -7306,7 +7302,7 @@ /obj/item/weapon/reagent_containers/food/snacks/generalschicken name = "general's chicken" desc = "Sweet, spicy, and fried. General's Chicken has been around for more than five-hundred years now, and still tastes good." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "generaltso" trash = /obj/item/trash/asian_bowl nutriment_amt = 6 @@ -7317,69 +7313,10 @@ reagents.add_reagent("protein", 4) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat - name = "grub meat" - desc = "A slab of grub meat, it gives a gentle shock if you touch it" - icon = 'icons/obj/food.dmi' - icon_state = "grubmeat" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - reagents.add_reagent("shockchem", 6) - bitesize = 6 - -/obj/item/weapon/reagent_containers/food/snacks/bugball - name = "bugball" - desc = "A hard piece of chitin, don't chip a tooth!" - icon = 'icons/obj/food_vr.dmi' - icon_state = "pillbugball" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/pillbug - slices_num = 1 - trash = /obj/item/weapon/reagent_containers/food/snacks/pillbug - nutriment_amt = 1 - nutriment_desc = list("crunchy shell bits" = 5) - -/obj/item/weapon/reagent_containers/food/snacks/bugball/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - reagents.add_reagent("carbon", 5) - bitesize = 7 - -/obj/item/weapon/reagent_containers/food/snacks/pillbug - name = "pillbug" - desc = "A delicacy discovered and popularized by a famous restaurant called Mudca's Meat Hut." - icon = 'icons/obj/food_vr.dmi' - icon_state = "pillbug" - trash = /obj/item/weapon/reagent_containers/food/snacks/pillbugempty - nutriment_amt = 3 - nutriment_desc = list("sparkles" = 5, "ancient inca culture" =3) - -/obj/item/weapon/reagent_containers/food/snacks/pillbug/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("shockchem", 6) - bitesize = 6 - -/obj/item/weapon/reagent_containers/food/snacks/pillbugempty - name = "pillbug shell" - desc = "Waste not, want not." - icon = 'icons/obj/food_vr.dmi' - icon_state = "pillbugempty" - nutriment_amt = 1 - nutriment_desc = list("crunchy shell bits" = 5) - -/obj/item/weapon/reagent_containers/food/snacks/pillbug/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - reagents.add_reagent("carbon", 5) - bitesize = 3 - /obj/item/weapon/reagent_containers/food/snacks/mammi name = "mämmi" desc = "Traditional finnish desert, some like it, others don't. It's drifting in some milk, add sugar!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "mammi" trash = /obj/item/trash/plate nutriment_amt = 3 @@ -7389,25 +7326,10 @@ . = ..() bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/makaroni - name = "makaronilaatikko" - desc = "A special kind of macaroni, it's a big dish, and this one has special meat in it." - icon = 'icons/obj/food_vr.dmi' - icon_state = "makaroni" - trash = /obj/item/trash/plate - nutriment_amt = 15 - nutriment_desc = list("Cheese" = 5, "eggs" = 3, "pasta" = 4, "sparkles" = 3) - -/obj/item/weapon/reagent_containers/food/snacks/makaroni/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - reagents.add_reagent("shockchem", 6) - bitesize = 7 - /obj/item/weapon/reagent_containers/food/snacks/lobster name = "raw lobster" desc = "A shifty lobster. You can try eating it, but its shell is extremely tough." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "lobster_raw" nutriment_amt = 5 @@ -7418,7 +7340,7 @@ /obj/item/weapon/reagent_containers/food/snacks/lobstercooked name = "cooked lobster" desc = "A luxurious plate of cooked lobster, its taste accentuated by lemon juice. Reinvigorating!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "lobster_cooked" trash = /obj/item/trash/plate nutriment_amt = 20 @@ -7434,7 +7356,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cuttlefish name = "raw cuttlefish" desc = "It's an adorable squid! You couldn't possibly be thinking about eating this, right?" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "cuttlefish_raw" nutriment_amt = 5 @@ -7445,7 +7367,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked name = "cooked cuttlefish" desc = "It's a roasted cuttlefish. Rubbery, squishy, an acquired taste." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "cuttlefish_cooked" nutriment_amt = 20 nutriment_desc = list("cuttlefish" = 5, "rubber" = 5, "grease" = 1) @@ -7458,7 +7380,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish name = "extra large monkfish" desc = "It's a huge monkfish. Better clean it first, you can't possibly eat it like this." - icon = 'icons/obj/food48x48_vr.dmi' + icon = 'icons/obj/food48x48.dmi' icon_state = "monkfish_raw" nutriment_amt = 30 w_class = ITEMSIZE_HUGE //Is that a monkfish in your pocket, or are you just happy to see me? @@ -7473,7 +7395,7 @@ /obj/item/weapon/reagent_containers/food/snacks/monkfishfillet name = "monkfish fillet" desc = "It's a fillet sliced from a monkfish." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "monkfish_fillet" nutriment_amt = 5 @@ -7485,11 +7407,10 @@ /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked name = "seasoned monkfish" desc = "A delicious slice of monkfish prepared with sweet chili and spring onion." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "monkfish_cooked" nutriment_amt = 10 nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2) - trash = /obj/item/trash/fancyplate /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked/Initialize() . = ..() @@ -7498,7 +7419,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfishremains name = "monkfish remains" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "monkfish_remains" desc = "The work of a madman." w_class = ITEMSIZE_LARGE @@ -7514,7 +7435,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk name = "chunk of shark meat" desc = "Still rough, needs to be cut into even smaller chunks." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "sharkmeat_chunk" nutriment_amt = 15 w_class = ITEMSIZE_LARGE @@ -7529,7 +7450,7 @@ /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat name = "slice of sharkmeat" desc = "Now it's small enough to cook with." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "sharkmeat" nutriment_amt = 2 toxin_amount = null @@ -7542,7 +7463,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked name = "shark steak" desc = "Finally, some food for real men." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "sharkmeat_cooked" trash = /obj/item/trash/small_bowl nutriment_amt = 5 @@ -7557,7 +7478,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip name = "hot shark shank" desc = "A shank of shark meat dipped in hot sauce." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "sharkmeat_dip" nutriment_amt = 5 trash = /obj/item/trash/snack_bowl @@ -7572,7 +7493,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes name = "shark cubes" desc = "Foul scented fermented shark cubes, it's said to make men fly, or just make them really fat." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "sharkmeat_cubes" nutriment_amt = 8 trash = /obj/item/trash/plate @@ -7583,43 +7504,11 @@ bitesize = 10 reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST. -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube - name = "sobaka cube" - monkey_type = "Sobaka" - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube - name = "sobaka cube" - monkey_type = "Sobaka" - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube - name = "saru cube" - monkey_type = "Saru" - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube - name = "saru cube" - monkey_type = "Saru" - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube - name = "sparra cube" - monkey_type = "Sparra" - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube - name = "sparra cube" - monkey_type = "Sparra" - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube - name = "wolpin cube" - monkey_type = "Wolpin" - -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube - name = "wolpin cube" - monkey_type = "Wolpin" - // food cubes /obj/item/weapon/reagent_containers/food/snacks/cube name = "protein cube" desc = "A colony of meat cells, Just add water!" - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "proteincube" w_class = ITEMSIZE_TINY flags = OPENCONTAINER @@ -7650,7 +7539,7 @@ /obj/item/weapon/reagent_containers/food/snacks/proteinslab name = "Protein slab" desc = "A slab of near pure protein, extremely artificial, and thoroughly disgusting." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "proteinslab" bitesize = 10 nutriment_amt = 5 @@ -7673,7 +7562,7 @@ /obj/item/weapon/reagent_containers/food/snacks/nutrimentslab name = "Nutriment slab" desc = "A slab of near pure plant-based nutrients, extremely artificial, and thoroughly disgusting." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "nutrimentslab" bitesize = 10 nutriment_amt = 20 @@ -7694,220 +7583,10 @@ can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/cube/protein, /obj/item/weapon/reagent_containers/food/snacks/cube/nutriment) -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif //Making fish meat non-toxic! As advised by Ascian! - toxin_type = null - toxin_amount = null - -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish - toxin_type = null - -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish - toxin_type = null - toxin_amount = null - -/obj/item/weapon/reagent_containers/food/snacks/honeybun - name = "Honeybun" - desc = "A delicious and sweet treat made with honey instead of sugar. On the sticky side." - icon = 'icons/obj/food_vr.dmi' - icon_state = "honeybun" - bitesize = 2 - nutriment_amt = 4 - nutriment_desc = list("honey" = 2, "pastry" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/bun/Initialize() - . = ..() - -//Readded Polaris Foods -/obj/item/weapon/reagent_containers/food/snacks/nachos - name = "nachos" - desc = "Chips from Old Mexico." - icon_state = "nachos" - nutriment_amt = 2 - nutriment_desc = list("salt" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/nachos/Initialize() - . = ..() - reagents.add_reagent("nutriment", 1) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/cheesenachos - name = "cheesy nachos" - desc = "The delicious combination of nachos and melting cheese." - icon_state = "cheesenachos" - nutriment_amt = 5 - nutriment_desc = list("salt" = 2, "cheese" = 3) - -/obj/item/weapon/reagent_containers/food/snacks/cheesenachos/Initialize() - . = ..() - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("protein", 2) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/milosoup - name = "Miso soup" - desc = "The universes best soup! Yum!!!" - icon_state = "milosoup" - trash = /obj/item/trash/snack_bowl - center_of_mass = list("x"=16, "y"=7) - nutriment_amt = 8 - nutriment_desc = list("soy" = 8) - bitesize = 4 - -/obj/item/weapon/reagent_containers/food/snacks/milosoup/Initialize() - . = ..() - reagents.add_reagent("water", 5) - -/obj/item/weapon/reagent_containers/food/snacks/onionsoup - name = "Onion Soup" - desc = "A soup with layers." - icon_state = "onionsoup" - trash = /obj/item/trash/snack_bowl - filling_color = "#E0C367" - center_of_mass = list("x"=16, "y"=7) - nutriment_amt = 5 - nutriment_desc = list("onion" = 2, "soup" = 2) - -/obj/item/weapon/reagent_containers/food/snacks/onionsoup/Initialize() - . = ..() - bitesize = 3 - -//Fennec foods -/obj/item/weapon/storage/box/wings/bucket - name = "Bucket o' grubs" - desc = "A bucket full of writhing grubs." - icon_state = "bucket6" - icon_base = "bucket" - startswith = 6 - w_class = ITEMSIZE_LARGE - max_storage_space = ITEMSIZE_COST_SMALL * 6 - starts_with = list( - /obj/item/weapon/reagent_containers/food/snacks/grub = 6 - ) - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grub) - -/obj/item/weapon/reagent_containers/food/snacks/grub - name = "grub" - desc = "A still writhing grub, soft and squishy." - icon = 'icons/obj/food_vr.dmi' - icon_state = "grub" - nutriment_amt = 3 - nutriment_desc = list("goo" = 1, "slime" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/grub/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/grub_pink - name = "pink candy grub" - desc = "A thoroughly candied grub, it smells of raspberry." - icon = 'icons/obj/food_vr.dmi' - icon_state = "grub_pink" - nutriment_amt = 5 - nutriment_desc = list("raspberry" = 4, "goo" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/grub_pink/Initialize() - . = ..() - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/grub_purple - name = "pink candy grub" - desc = "A thoroughly candied grub, it smells of grape." - icon = 'icons/obj/food_vr.dmi' - icon_state = "grub_purple" - nutriment_amt = 5 - nutriment_desc = list("grape" = 4, "goo" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/grub_purple/Initialize() - . = ..() - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/grub_blue - name = "pink candy grub" - desc = "A thoroughly candied grub, it smells of blueberry." - icon = 'icons/obj/food_vr.dmi' - icon_state = "grub_blue" - nutriment_amt = 5 - nutriment_desc = list("blueberry" = 4, "goo" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/grub_blue/Initialize() - . = ..() - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/scorpion - name = "scorpion" - desc = "A scorpion from the sandy deserts, don't get stung!" - icon = 'icons/obj/food_vr.dmi' - icon_state = "scorpion" - nutriment_amt = 8 - nutriment_desc = list("crunchy" = 4, "shell bits" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/scorpion/Initialize() - . = ..() - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/scorpion_cooked - name = "cooked scorpion" - desc = "A scorpion. Baked nice and crispy." - icon = 'icons/obj/food_vr.dmi' - icon_state = "scorpion_cooked" - nutriment_amt = 6 - nutriment_desc = list("crispy" = 4, "exotic meat" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/scorpion_cooked/Initialize() - . = ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("protein", 4) - bitesize = 4 - -/obj/item/weapon/reagent_containers/food/snacks/ant - name = "giant honey ant" - desc = "A sweetly scented honey ant. It has a huge swollen abdomen full of yummy." - icon = 'icons/obj/food_vr.dmi' - icon_state = "honeyant" - nutriment_amt = 2 - nutriment_desc = list("crunchy" = 1, "goo" = 1) - slice_path = /obj/item/weapon/reagent_containers/food/snacks/antball - slices_num = 1 - -/obj/item/weapon/reagent_containers/food/snacks/ant/Initialize() - . = ..() - reagents.add_reagent("honey", 2) - reagents.add_reagent("protein", 3) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/antball - name = "giant honey ball" - desc = "A sweetly scented honey ball, minus the ant. For those who don't like bug bits between their teeth." - icon = 'icons/obj/food_vr.dmi' - icon_state = "honeyant_clean" - nutriment_amt = 4 - nutriment_desc = list("goo" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/antball/Initialize() - . = ..() - reagents.add_reagent("honey", 2) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/honey_candy - name = "honey candy" - desc = "A clever mimicry of a honey ant abdomen, but it's just a piece of candy. Does not contain actual honey!" - icon = 'icons/obj/food_vr.dmi' - icon_state = "candy_honey" - nutriment_amt = 4 - nutriment_desc = list("goo" = 1, "honey" = 1) - slice_path = /obj/item/weapon/reagent_containers/food/snacks/antball - slices_num = 1 - -/obj/item/weapon/reagent_containers/food/snacks/honey_candy/Initialize() - . = ..() - reagents.add_reagent("sugar", 2) - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/locust name = "yellow jacket locust" desc = "A vibrant bug that looks like a wasp, but is in fact a locust. Crunchy." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "locust" nutriment_amt = 4 nutriment_desc = list("crunchy" = 1, "goo" = 1) @@ -7920,7 +7599,7 @@ /obj/item/weapon/reagent_containers/food/snacks/locust_cooked name = "fried locust" desc = "A fried locust, extremely crunchy." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "locust_cooked" nutriment_amt = 2 nutriment_desc = list("crunchy" = 4) diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index 949a275d4d..6542572d93 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -51,7 +51,7 @@ name = "chicken" icon = 'icons/obj/food_syn.dmi' icon_state = "chickenbreast" - cooked_icon = "chickensteak" + cooked_icon = "chickenbreast_cooked" filling_color = "#BBBBAA" /obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize() diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index 8df0da2b96..f7c117c65d 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -177,3 +177,39 @@ 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/chickenwings + appliance = FRYER + 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/reagent_containers/food/snacks/generalschicken + +/datum/recipe/locust + reagents = list("batter" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/locust + ) + result = /obj/item/weapon/reagent_containers/food/snacks/locust_cooked \ No newline at end of file diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index 3ece25a755..6a05f1dd26 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -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 diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index f3119ca9cb..56dd783d27 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1083,4 +1083,127 @@ 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 \ No newline at end of file + 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/lobster + 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 + items = list( + /obj/item/weapon/reagent_containers/food/snacks/cuttlefish + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked + +/datum/recipe/monkfish + 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 + 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 + +/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 \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 1290983bfe..495d30d4f8 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4951bf32ad..c3b58f06b1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 31166e2205..daa29e29bd 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food48x48.dmi b/icons/obj/food48x48.dmi new file mode 100644 index 0000000000..91d4307b37 Binary files /dev/null and b/icons/obj/food48x48.dmi differ diff --git a/icons/obj/food_canned.dmi b/icons/obj/food_canned.dmi index 78177169de..77839ea738 100644 Binary files a/icons/obj/food_canned.dmi and b/icons/obj/food_canned.dmi differ diff --git a/icons/obj/food_custom.dmi b/icons/obj/food_custom.dmi index ee26eb7777..76ce920648 100644 Binary files a/icons/obj/food_custom.dmi and b/icons/obj/food_custom.dmi differ diff --git a/icons/obj/food_package.dmi b/icons/obj/food_package.dmi new file mode 100644 index 0000000000..f5f73aa9e4 Binary files /dev/null and b/icons/obj/food_package.dmi differ diff --git a/icons/obj/food_snacks.dmi b/icons/obj/food_snacks.dmi index f9d4b247f2..c0dd05367d 100644 Binary files a/icons/obj/food_snacks.dmi and b/icons/obj/food_snacks.dmi differ diff --git a/icons/obj/food_syn.dmi b/icons/obj/food_syn.dmi index d76d214357..51661fd956 100644 Binary files a/icons/obj/food_syn.dmi and b/icons/obj/food_syn.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 76f60a84ce..ca116e7779 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ