diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm index 815fcce26c9..7676e4a74f2 100644 --- a/code/game/machinery/vendors/departmental_vendors.dm +++ b/code/game/machinery/vendors/departmental_vendors.dm @@ -194,6 +194,7 @@ /obj/item/seeds/grape = 3, /obj/item/seeds/grass = 3, /obj/item/seeds/lemon = 3, + /obj/item/seeds/lettuce = 3, /obj/item/seeds/lime = 3, /obj/item/seeds/mint = 3, /obj/item/seeds/olive = 3, diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm index 42a9a4d0b69..7d9e9e02491 100644 --- a/code/modules/food_and_drinks/food/foods/sandwiches.dm +++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm @@ -79,7 +79,7 @@ filling_color = "#CCCCCC" bitesize = 3 list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1) - tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) + tastes = list("bun" = 4, "metal" = 2, "sludge" = 1) /obj/item/food/snacks/burger/hamborger/Initialize(mapload) . = ..() diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 53904858aaa..d7001eecb0e 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -11,7 +11,10 @@ /datum/recipe/microwave/dionaroast reagents = list("facid" = 5) //It dissolves the carapace. Still poisonous, though. - items = list(/obj/item/holder/diona, /obj/item/food/snacks/grown/apple) + items = list( + /obj/item/holder/diona, + /obj/item/food/snacks/grown/apple + ) result = /obj/item/food/snacks/dionaroast /datum/recipe/microwave/jellydonut @@ -52,6 +55,7 @@ /datum/recipe/microwave/human/burger items = list( /obj/item/food/snacks/meat/human, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/bun ) result = /obj/item/food/snacks/human/burger @@ -59,17 +63,41 @@ /datum/recipe/microwave/plainburger items = list( /obj/item/food/snacks/bun, - /obj/item/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/humanburger + /obj/item/food/snacks/grown/lettuce, + /obj/item/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/human/burger ) result = /obj/item/food/snacks/burger/plain /datum/recipe/microwave/syntiburger items = list( /obj/item/food/snacks/bun, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/meat/syntiflesh ) result = /obj/item/food/snacks/burger/plain +/datum/recipe/microwave/bigbiteburger + items = list( + /obj/item/food/snacks/burger/plain, + /obj/item/food/snacks/meat, + /obj/item/food/snacks/meat, + /obj/item/food/snacks/meat, + /obj/item/food/snacks/cheesewedge + ) + result = /obj/item/food/snacks/burger/bigbite + +/datum/recipe/microwave/superbiteburger + reagents = list("sodiumchloride" = 5, "blackpepper" = 5) + items = list( + /obj/item/food/snacks/burger/bigbite, + /obj/item/food/snacks/dough, + /obj/item/food/snacks/meat, + /obj/item/food/snacks/cheesewedge, + /obj/item/food/snacks/bacon, + /obj/item/food/snacks/tomatoslice + ) + result = /obj/item/food/snacks/burger/superbite + /datum/recipe/microwave/brainburger items = list( /obj/item/food/snacks/bun, @@ -87,7 +115,8 @@ /datum/recipe/microwave/xenoburger items = list( /obj/item/food/snacks/bun, - /obj/item/food/snacks/monstermeat/xenomeat) + /obj/item/food/snacks/monstermeat/xenomeat + ) result = /obj/item/food/snacks/burger/xeno /datum/recipe/microwave/fishburger @@ -114,7 +143,7 @@ /datum/recipe/microwave/clownburger items = list( /obj/item/food/snacks/bun, - /obj/item/clothing/mask/gas/clown_hat, + /obj/item/clothing/mask/gas/clown_hat ) result = /obj/item/food/snacks/burger/clown @@ -136,7 +165,8 @@ items = list( /obj/item/food/snacks/bun, /obj/item/food/snacks/meat, - /obj/item/food/snacks/cheesewedge, + /obj/item/food/snacks/grown/lettuce, + /obj/item/food/snacks/cheesewedge ) result = /obj/item/food/snacks/burger/cheese @@ -165,7 +195,8 @@ items = list( /obj/item/food/snacks/bun, /obj/item/food/snacks/grown/ghost_chili, - /obj/item/food/snacks/grown/ghost_chili + /obj/item/food/snacks/grown/ghost_chili, + /obj/item/food/snacks/grown/lettuce ) result = /obj/item/food/snacks/burger/fivealarm @@ -174,6 +205,7 @@ /obj/item/food/snacks/bun, /obj/item/food/snacks/bacon, /obj/item/food/snacks/bacon, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/cheesewedge ) result = /obj/item/food/snacks/burger/bacon @@ -233,14 +265,16 @@ /datum/recipe/microwave/soylentviridians reagents = list("flour" = 10) - items = list(/obj/item/food/snacks/grown/soybeans) + items = list( + /obj/item/food/snacks/grown/soybeans + ) result = /obj/item/food/snacks/soylentviridians /datum/recipe/microwave/soylentgreen reagents = list("flour" = 10) items = list( /obj/item/food/snacks/meat/human, - /obj/item/food/snacks/meat/human, + /obj/item/food/snacks/meat/human ) result = /obj/item/food/snacks/soylentgreen @@ -254,7 +288,7 @@ /datum/recipe/microwave/cheesyfries items = list( /obj/item/food/snacks/fries, - /obj/item/food/snacks/cheesewedge, + /obj/item/food/snacks/cheesewedge ) result = /obj/item/food/snacks/cheesyfries @@ -267,19 +301,27 @@ result = /obj/item/food/snacks/cubancarp /datum/recipe/microwave/popcorn - items = list(/obj/item/food/snacks/grown/corn) + items = list( + /obj/item/food/snacks/grown/corn + ) result = /obj/item/food/snacks/popcorn /datum/recipe/microwave/spacylibertyduff reagents = list("water" = 5, "vodka" = 5) - items = list(/obj/item/food/snacks/grown/mushroom/libertycap, /obj/item/food/snacks/grown/mushroom/libertycap, - /obj/item/food/snacks/grown/mushroom/libertycap) + items = list( + /obj/item/food/snacks/grown/mushroom/libertycap, + /obj/item/food/snacks/grown/mushroom/libertycap, + /obj/item/food/snacks/grown/mushroom/libertycap + ) result = /obj/item/food/snacks/spacylibertyduff /datum/recipe/microwave/amanitajelly reagents = list("water" = 5, "vodka" = 5) - items = list(/obj/item/food/snacks/grown/mushroom/amanita, /obj/item/food/snacks/grown/mushroom/amanita, - /obj/item/food/snacks/grown/mushroom/amanita) + items = list( + /obj/item/food/snacks/grown/mushroom/amanita, + /obj/item/food/snacks/grown/mushroom/amanita, + /obj/item/food/snacks/grown/mushroom/amanita + ) result = /obj/item/food/snacks/amanitajelly /datum/recipe/microwave/amanitajelly/make_food(obj/container) @@ -289,18 +331,30 @@ /datum/recipe/microwave/meatballsoup reagents = list("water" = 10) - items = list(/obj/item/food/snacks/meatball, /obj/item/food/snacks/grown/potato, /obj/item/food/snacks/grown/carrot) + items = list( + /obj/item/food/snacks/meatball, + /obj/item/food/snacks/grown/potato, + /obj/item/food/snacks/grown/carrot + ) result = /obj/item/food/snacks/soup/meatballsoup /datum/recipe/microwave/vegetablesoup reagents = list("water" = 10) - items = list(/obj/item/food/snacks/grown/potato, /obj/item/food/snacks/grown/carrot, - /obj/item/food/snacks/grown/corn, /obj/item/food/snacks/grown/eggplant) + items = list( + /obj/item/food/snacks/grown/potato, + /obj/item/food/snacks/grown/carrot, + /obj/item/food/snacks/grown/corn, + /obj/item/food/snacks/grown/eggplant + ) result = /obj/item/food/snacks/soup/vegetablesoup /datum/recipe/microwave/nettlesoup reagents = list("water" = 10) - items = list(/obj/item/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/food/snacks/grown/potato) + items = list( + /obj/item/food/snacks/egg, + /obj/item/grown/nettle/basic, + /obj/item/food/snacks/grown/potato + ) result = /obj/item/food/snacks/soup/nettlesoup /datum/recipe/microwave/wishsoup @@ -308,43 +362,42 @@ result = /obj/item/food/snacks/soup/wishsoup /datum/recipe/microwave/hotchili - items = list(/obj/item/food/snacks/meat, /obj/item/food/snacks/grown/chili, /obj/item/food/snacks/grown/tomato) + items = list( + /obj/item/food/snacks/meat, + /obj/item/food/snacks/grown/chili, + /obj/item/food/snacks/grown/tomato + ) result = /obj/item/food/snacks/soup/hotchili /datum/recipe/microwave/coldchili - items = list(/obj/item/food/snacks/meat, /obj/item/food/snacks/grown/icepepper, /obj/item/food/snacks/grown/tomato) + items = list( + /obj/item/food/snacks/meat, + /obj/item/food/snacks/grown/icepepper, + /obj/item/food/snacks/grown/tomato + ) result = /obj/item/food/snacks/soup/coldchili /datum/recipe/microwave/spellburger items = list( /obj/item/food/snacks/bun, - /obj/item/clothing/head/wizard/fake, + /obj/item/clothing/head/wizard/fake ) result = /obj/item/food/snacks/burger/spell /datum/recipe/microwave/spellburger items = list( /obj/item/food/snacks/bun, - /obj/item/clothing/head/wizard, + /obj/item/clothing/head/wizard ) result = /obj/item/food/snacks/burger/spell -/datum/recipe/microwave/bigbiteburger - items = list( - /obj/item/food/snacks/burger/plain, - /obj/item/food/snacks/meat, - /obj/item/food/snacks/meat, - /obj/item/food/snacks/meat, - /obj/item/food/snacks/egg, - ) - result = /obj/item/food/snacks/burger/bigbite - /datum/recipe/microwave/enchiladas items = list( /obj/item/food/snacks/cutlet, /obj/item/food/snacks/grown/chili, /obj/item/food/snacks/grown/chili, - /obj/item/food/snacks/grown/corn) + /obj/item/food/snacks/grown/corn + ) result = /obj/item/food/snacks/enchiladas /datum/recipe/microwave/burrito @@ -353,7 +406,7 @@ /obj/item/food/snacks/cutlet, /obj/item/food/snacks/beans, /obj/item/food/snacks/cheesewedge, - /obj/item/food/snacks/sliceable/flatdough, + /obj/item/food/snacks/sliceable/flatdough ) result = /obj/item/food/snacks/burrito @@ -361,7 +414,8 @@ reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) items = list( /obj/item/food/snacks/monkeycube, - /obj/item/food/snacks/grown/banana) + /obj/item/food/snacks/grown/banana + ) result = /obj/item/food/snacks/monkeysdelight /datum/recipe/microwave/fishandchips @@ -376,7 +430,7 @@ /obj/item/food/snacks/meatsteak, /obj/item/food/snacks/breadslice, /obj/item/food/snacks/breadslice, - /obj/item/food/snacks/cheesewedge, + /obj/item/food/snacks/cheesewedge ) result = /obj/item/food/snacks/sandwich @@ -384,7 +438,8 @@ reagents = list("water" = 10) items = list( /obj/item/food/snacks/grown/tomato, - /obj/item/food/snacks/grown/tomato) + /obj/item/food/snacks/grown/tomato + ) result = /obj/item/food/snacks/soup/tomatosoup /datum/recipe/microwave/stew @@ -395,7 +450,8 @@ /obj/item/food/snacks/grown/carrot, /obj/item/food/snacks/grown/eggplant, /obj/item/food/snacks/grown/mushroom, - /obj/item/food/snacks/meat) + /obj/item/food/snacks/meat + ) result = /obj/item/food/snacks/soup/stew /datum/recipe/microwave/slimetoast @@ -408,7 +464,7 @@ /datum/recipe/microwave/jelliedtoast reagents = list("cherryjelly" = 5) items = list( - /obj/item/food/snacks/breadslice, + /obj/item/food/snacks/breadslice ) result = /obj/item/food/snacks/jelliedtoast/cherry @@ -418,19 +474,23 @@ /obj/item/food/snacks/soydope, /obj/item/food/snacks/soydope, /obj/item/food/snacks/tofu, - /obj/item/food/snacks/tofu, + /obj/item/food/snacks/tofu ) result = /obj/item/food/snacks/soup/misosoup /datum/recipe/microwave/stewedsoymeat - items = list(/obj/item/food/snacks/soydope, /obj/item/food/snacks/soydope, - /obj/item/food/snacks/grown/carrot, /obj/item/food/snacks/grown/tomato) + items = list( + /obj/item/food/snacks/soydope, + /obj/item/food/snacks/soydope, + /obj/item/food/snacks/grown/carrot, + /obj/item/food/snacks/grown/tomato + ) result = /obj/item/food/snacks/stewedsoymeat /datum/recipe/microwave/boiledspaghetti reagents = list("water" = 5) items = list( - /obj/item/food/snacks/spaghetti, + /obj/item/food/snacks/spaghetti ) result = /obj/item/food/snacks/boiledspaghetti @@ -444,12 +504,18 @@ /datum/recipe/microwave/pastatomato reagents = list("water" = 5) - items = list(/obj/item/food/snacks/spaghetti, /obj/item/food/snacks/grown/tomato, - /obj/item/food/snacks/grown/tomato) + items = list( + /obj/item/food/snacks/spaghetti, + /obj/item/food/snacks/grown/tomato, + /obj/item/food/snacks/grown/tomato + ) result = /obj/item/food/snacks/pastatomato /datum/recipe/microwave/poppypretzel - items = list(/obj/item/seeds/poppy, /obj/item/food/snacks/dough) + items = list( + /obj/item/seeds/poppy, + /obj/item/food/snacks/dough + ) result = /obj/item/food/snacks/poppypretzel /datum/recipe/microwave/meatballspaggetti @@ -480,18 +546,6 @@ ) result = /obj/item/food/snacks/macncheese -/datum/recipe/microwave/superbiteburger - reagents = list("sodiumchloride" = 5, "blackpepper" = 5) - items = list( - /obj/item/food/snacks/burger/bigbite, - /obj/item/food/snacks/dough, - /obj/item/food/snacks/meat, - /obj/item/food/snacks/cheesewedge, - /obj/item/food/snacks/boiledegg, - /obj/item/food/snacks/tomatoslice - ) - result = /obj/item/food/snacks/burger/superbite - /datum/recipe/microwave/crazyburger reagents = list("cornoil" = 15) items = list( @@ -500,7 +554,7 @@ /obj/item/food/snacks/meat, /obj/item/food/snacks/cheesewedge, /obj/item/food/snacks/cheesewedge, - /obj/item/food/snacks/grown/cabbage, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/grown/chili, /obj/item/toy/crayon/green, /obj/item/flashlight/flare @@ -511,7 +565,7 @@ items = list( /obj/item/food/snacks/breadslice, /obj/item/food/snacks/breadslice, - /obj/item/food/snacks/grown/cabbage, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/tomatoslice, /obj/item/food/snacks/bacon ) @@ -658,7 +712,7 @@ reagents = list("wine" = 5) items = list( /obj/item/food/snacks/breadslice, - /obj/item/food/snacks/breadslice, + /obj/item/food/snacks/breadslice ) result = /obj/item/food/snacks/twobread @@ -666,7 +720,7 @@ reagents = list("slimejelly" = 5) items = list( /obj/item/food/snacks/breadslice, - /obj/item/food/snacks/breadslice, + /obj/item/food/snacks/breadslice ) result = /obj/item/food/snacks/jellysandwich/slime @@ -674,13 +728,16 @@ reagents = list("cherryjelly" = 5) items = list( /obj/item/food/snacks/breadslice, - /obj/item/food/snacks/breadslice, + /obj/item/food/snacks/breadslice ) result = /obj/item/food/snacks/jellysandwich/cherry /datum/recipe/microwave/bloodsoup reagents = list("blood" = 10) - items = list(/obj/item/food/snacks/grown/tomato/blood, /obj/item/food/snacks/grown/tomato/blood) + items = list( + /obj/item/food/snacks/grown/tomato/blood, + /obj/item/food/snacks/grown/tomato/blood + ) result = /obj/item/food/snacks/soup/bloodsoup /datum/recipe/microwave/slimesoup @@ -856,7 +913,7 @@ /datum/recipe/microwave/chocolateegg items = list( /obj/item/food/snacks/egg, - /obj/item/food/snacks/chocolatebar, + /obj/item/food/snacks/chocolatebar ) result = /obj/item/food/snacks/chocolateegg @@ -866,13 +923,15 @@ /obj/item/food/snacks/badrecipe, /obj/item/food/snacks/tofu, /obj/item/food/snacks/egg, - /obj/item/food/snacks/cheesewedge, + /obj/item/food/snacks/cheesewedge ) result = /obj/item/food/snacks/soup/mysterysoup /datum/recipe/microwave/mushroomsoup reagents = list("water" = 5, "milk" = 5) - items = list(/obj/item/food/snacks/grown/mushroom) + items = list( + /obj/item/food/snacks/grown/mushroom + ) result = /obj/item/food/snacks/soup/mushroomsoup /datum/recipe/microwave/chawanmushi @@ -886,19 +945,22 @@ /datum/recipe/microwave/beetsoup reagents = list("water" = 10) - items = list(/obj/item/food/snacks/grown/whitebeet, /obj/item/food/snacks/grown/cabbage) + items = list( + /obj/item/food/snacks/grown/whitebeet, + /obj/item/food/snacks/grown/cabbage + ) result = /obj/item/food/snacks/soup/beetsoup /datum/recipe/microwave/salad items = list( - /obj/item/food/snacks/grown/cabbage, - /obj/item/food/snacks/grown/cabbage + /obj/item/food/snacks/grown/lettuce, + /obj/item/food/snacks/grown/lettuce ) result = /obj/item/food/snacks/salad /datum/recipe/microwave/antipasto_salad items = list( - /obj/item/food/snacks/grown/cabbage, - /obj/item/food/snacks/grown/cabbage, + /obj/item/food/snacks/grown/lettuce, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/grown/olive, /obj/item/food/snacks/grown/tomato, /obj/item/food/snacks/cutlet, @@ -909,7 +971,7 @@ /datum/recipe/microwave/caesar_salad reagents = list("oliveoil" = 5) items = list( - /obj/item/food/snacks/grown/cabbage, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/onion_slice/red, /obj/item/food/snacks/cheesewedge, /obj/item/food/snacks/breadslice @@ -960,7 +1022,7 @@ reagents = list("oliveoil" = 5) items = list( /obj/item/food/snacks/grown/carrot, - /obj/item/food/snacks/grown/cabbage, + /obj/item/food/snacks/grown/lettuce, /obj/item/food/snacks/onion_slice/red, /obj/item/food/snacks/onion_slice/red ) @@ -988,8 +1050,12 @@ /datum/recipe/microwave/herbsalad - items = list(/obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/ambrosia/vulgaris, - /obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/apple) + items = list( + /obj/item/food/snacks/grown/ambrosia/vulgaris, + /obj/item/food/snacks/grown/ambrosia/vulgaris, + /obj/item/food/snacks/grown/ambrosia/vulgaris, + /obj/item/food/snacks/grown/apple + ) result = /obj/item/food/snacks/salad/herb /datum/recipe/microwave/herbsalad/make_food(obj/container) @@ -998,14 +1064,22 @@ return being_cooked /datum/recipe/microwave/aesirsalad - items = list(/obj/item/food/snacks/grown/ambrosia/deus, /obj/item/food/snacks/grown/ambrosia/deus, - /obj/item/food/snacks/grown/ambrosia/deus, /obj/item/food/snacks/grown/apple/gold) + items = list( + /obj/item/food/snacks/grown/ambrosia/deus, + /obj/item/food/snacks/grown/ambrosia/deus, + /obj/item/food/snacks/grown/ambrosia/deus, + /obj/item/food/snacks/grown/apple/gold + ) result = /obj/item/food/snacks/salad/aesir /datum/recipe/microwave/validsalad - items = list(/obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/ambrosia/vulgaris, - /obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/potato, - /obj/item/food/snacks/meatball) + items = list( + /obj/item/food/snacks/grown/ambrosia/vulgaris, + /obj/item/food/snacks/grown/ambrosia/vulgaris, + /obj/item/food/snacks/grown/ambrosia/vulgaris, + /obj/item/food/snacks/grown/potato, + /obj/item/food/snacks/meatball + ) result = /obj/item/food/snacks/salad/valid /datum/recipe/microwave/validsalad/make_food(obj/container) @@ -1017,19 +1091,25 @@ /datum/recipe/microwave/wrap reagents = list("soysauce" = 10) - items = list(/obj/item/food/snacks/friedegg, /obj/item/food/snacks/grown/cabbage ) + items = list( + /obj/item/food/snacks/friedegg, + /obj/item/food/snacks/grown/cabbage + ) result = /obj/item/food/snacks/wrap /datum/recipe/microwave/beans reagents = list("ketchup" = 5) - items = list(/obj/item/food/snacks/grown/soybeans, /obj/item/food/snacks/grown/soybeans) + items = list( + /obj/item/food/snacks/grown/soybeans, + /obj/item/food/snacks/grown/soybeans + ) result = /obj/item/food/snacks/beans /datum/recipe/microwave/benedict items = list( /obj/item/food/snacks/friedegg, /obj/item/food/snacks/meatsteak, - /obj/item/food/snacks/breadslice, + /obj/item/food/snacks/breadslice ) result = /obj/item/food/snacks/benedict @@ -1045,7 +1125,7 @@ /datum/recipe/microwave/icecreamsandwich reagents = list("ice" = 5, "cream" = 5) items = list( - /obj/item/food/snacks/frozen/icecream, + /obj/item/food/snacks/frozen/icecream ) result = /obj/item/food/snacks/frozen/icecreamsandwich @@ -1290,7 +1370,7 @@ items = list( /obj/item/food/snacks/breadslice, /obj/item/food/snacks/breadslice, - /obj/item/clothing/mask/fakemoustache, + /obj/item/clothing/mask/fakemoustache ) result = /obj/item/food/snacks/notasandwich @@ -1305,7 +1385,7 @@ /datum/recipe/microwave/stuffing reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1) items = list( - /obj/item/food/snacks/sliceable/bread, + /obj/item/food/snacks/sliceable/bread ) result = /obj/item/food/snacks/stuffing @@ -1328,13 +1408,15 @@ reagents = list("soysauce" = 5) items = list( /obj/item/food/snacks/monstermeat/spidereggs, - /obj/item/food/snacks/carpmeat, + /obj/item/food/snacks/carpmeat ) result = /obj/item/food/snacks/sashimi /datum/recipe/microwave/mashedtaters reagents = list("gravy" = 5) - items = list(/obj/item/food/snacks/grown/potato) + items = list( + /obj/item/food/snacks/grown/potato + ) result = /obj/item/food/snacks/mashed_potatoes ////////////////////////////////////////// diff --git a/code/modules/hydroponics/grown/herbals.dm b/code/modules/hydroponics/grown/herbals.dm index 964b2e4a36b..f13d9d20b9c 100644 --- a/code/modules/hydroponics/grown/herbals.dm +++ b/code/modules/hydroponics/grown/herbals.dm @@ -1,7 +1,7 @@ /obj/item/seeds/comfrey name = "pack of comfrey seeds" desc = "These seeds grow into comfrey." - icon_state = "seed-cabbage" + icon_state = "seed-lettuce" species = "cabbage" plantname = "Comfrey" product = /obj/item/food/snacks/grown/comfrey diff --git a/code/modules/hydroponics/grown/misc_seeds.dm b/code/modules/hydroponics/grown/misc_seeds.dm index 30bf347ab55..fc7c90e4fc9 100644 --- a/code/modules/hydroponics/grown/misc_seeds.dm +++ b/code/modules/hydroponics/grown/misc_seeds.dm @@ -27,11 +27,39 @@ parent.update_tray() +// Lettuce +/obj/item/seeds/lettuce + name = "pack of lettuce seeds" + desc = "These seeds grow into lettuces." + icon_state = "seed-lettuce" + species = "cabbage" + plantname = "Lettuces" + product = /obj/item/food/snacks/grown/lettuce + lifespan = 50 + endurance = 25 + maturation = 3 + production = 5 + yield = 4 + growthstages = 1 + growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1) + +/obj/item/food/snacks/grown/lettuce + seed = /obj/item/seeds/lettuce + name = "lettuce" + desc = "Often confused with cabbages." + icon_state = "lettuce" + filling_color = "#419541" + bitesize_mod = 2 + tastes = list("lettuce" = 1) + wine_power = 0.2 + // Cabbage /obj/item/seeds/cabbage name = "pack of cabbage seeds" desc = "These seeds grow into cabbages." - icon_state = "seed-cabbage" + icon_state = "seed-lettuce" species = "cabbage" plantname = "Cabbages" product = /obj/item/food/snacks/grown/cabbage diff --git a/icons/obj/hydroponics/growing_vegetables.dmi b/icons/obj/hydroponics/growing_vegetables.dmi index c13ce2d5210..63bc1dc4988 100644 Binary files a/icons/obj/hydroponics/growing_vegetables.dmi and b/icons/obj/hydroponics/growing_vegetables.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 7ca0e6915c4..83ff185c784 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 3ce19536210..52e9428edf6 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/strings/ion_laws.json b/strings/ion_laws.json index 95c9c4cd4f4..d0db5f5d6b4 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -412,7 +412,7 @@ "A WEIGHT LOSS REGIMENT", "MORE INTERNET MEMES", "A SUPER FIGHTING ROBOT", - "ENOUGH CABBAGES", + "ENOUGH LETTUCES", "A HEART ATTACK", "TO BE REPROGRAMMED", "TO BE TAUGHT TO LOVE", @@ -544,6 +544,7 @@ "BERRIES", "TOMATOES", "CABBAGES", + "LETTUCES", "CARROTS", "BANANAS", "APPLES",