diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 8ba5ffc8147..3c18374fc61 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -2057,4 +2057,4 @@ new/obj/effect/effect/sparks(A.loc) src.visible_message("The [src.name] has been squashed, causing a distortion in space-time.","You hear a smack.") del(src) - return \ No newline at end of file + return diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 1fa6ff86658..35102a1628b 100755 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -390,7 +390,8 @@ "/obj/item/seeds/carrotseed", "/obj/item/seeds/sunflowerseed", "/obj/item/seeds/chantermycelium", - "/obj/item/seeds/potatoseed") + "/obj/item/seeds/potatoseed", + "/obj/item/seeds/sugarcaneseed") cost = 10 containertype = /obj/structure/closet/crate/hydroponics containername = "Seeds crate" diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index d860ee0cc55..789705e5615 100755 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -307,7 +307,7 @@ product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/cola" // product_hideamt = "20" hidden_prices = "1" - product_ads = "What the fuck is this shit?;Why would you buy this;holy shit help;i'm stuck;in;a;universe;factory;AAAAAARGH!;HEIL... Stalin?;CAPITALIST PIGS;FUCK THE WEST" + 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." charge_type = "soda" /obj/machinery/vending/tool diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index b295e72b435..3407f714bb5 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1393,6 +1393,7 @@ name = "Metroid Sandwich" desc = "A sandwich is green stuff." icon_state = "metroidsandwich" + trash = "plate" New() ..() reagents.add_reagent("nutriment", 2) @@ -1441,6 +1442,40 @@ else reagents.add_reagent("nutriment", 5) bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/chawanmushi + name = "chawanmushi" + desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat." + icon_state = "chawanmushi" + trash = "snack_bowl" + New() + ..() + reagents.add_reagent("nutriment", 5) + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/beetsoup + name = "beet soup" + desc = "Wait, how do you spell it, again..?" + icon_state = "beetsoup" + trash = "snack_bowl" + New() + ..() + switch(rand(1,6)) + if(1) + name = "borsch" + if(2) + name = "bortsch" + if(3) + name = "borstch" + if(4) + name = "borsh" + if(5) + name = "borshch" + if(6) + name = "borscht" + reagents.add_reagent("nutriment", 8) + bitesize = 2 + /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index e97a5720a93..f89c92f4f2b 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1019,6 +1019,23 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup +/datum/recipe/chawanmushi + reagents = list("water" = 5, "soysauce" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi + +/datum/recipe/beetsoup + reagents = list("water" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet, + /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup + ////////////////////////////////////////// // bs12 food port stuff ////////////////////////////////////////// diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 6405a1e47dd..f85cf5cc396 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index 8eeca228a77..7d7134a0aa2 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index e8d9ae4daf9..cd535fc282a 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ