From 45499a7b2d8a29bbee18d219251be249075334ae Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 15:35:12 -0400 Subject: [PATCH 01/29] Delete food.dmi --- modular_citadel/icons/obj/food/food.dmi | Bin 3363 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modular_citadel/icons/obj/food/food.dmi diff --git a/modular_citadel/icons/obj/food/food.dmi b/modular_citadel/icons/obj/food/food.dmi deleted file mode 100644 index ea66b3d48a3a077b4650b248bbad226947f71adc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3363 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 From f07cdc1046d152a288f8753d1b92117bd3a78718 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 15:35:45 -0400 Subject: [PATCH 02/29] Add files via upload --- modular_citadel/icons/obj/food.dmi | Bin 0 -> 4184 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modular_citadel/icons/obj/food.dmi diff --git a/modular_citadel/icons/obj/food.dmi b/modular_citadel/icons/obj/food.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d205b29b8b2969c0f7c114450a742f5329b6697d GIT binary patch literal 4184 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 Date: Fri, 5 Apr 2019 16:04:28 -0400 Subject: [PATCH 03/29] properly --- modular_citadel/icons/obj/food/food.dmi | Bin 0 -> 4184 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modular_citadel/icons/obj/food/food.dmi diff --git a/modular_citadel/icons/obj/food/food.dmi b/modular_citadel/icons/obj/food/food.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d205b29b8b2969c0f7c114450a742f5329b6697d GIT binary patch literal 4184 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 Date: Fri, 5 Apr 2019 16:05:04 -0400 Subject: [PATCH 04/29] not the correct one --- modular_citadel/icons/obj/food.dmi | Bin 4184 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modular_citadel/icons/obj/food.dmi diff --git a/modular_citadel/icons/obj/food.dmi b/modular_citadel/icons/obj/food.dmi deleted file mode 100644 index d205b29b8b2969c0f7c114450a742f5329b6697d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4184 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 Date: Fri, 5 Apr 2019 16:08:46 -0400 Subject: [PATCH 05/29] Update snacks_other.dm --- code/modules/food_and_drinks/food/snacks_other.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index af7a8c06f4..d1eb495579 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -207,6 +207,16 @@ tastes = list("cobwebs" = 1, "sugar" = 2) foodtype = JUNKFOOD | SUGAR +/obj/item/reagent_containers/food/snacks/tobiko + name = "Tobiko" + desc = "Spider eggs wrapped in a thin salted Kudzu pod" + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_egg" + list_reagents = list("nutriment" = 3, "vitamin" = 2) + filling_color = "#FF3333" // R225 G051 B051 + tastes = list("seaweed" = 1, "salty" = 2) + foodtype = MEAT | VEGETABLES + /obj/item/reagent_containers/food/snacks/chococoin name = "chocolate coin" desc = "A completely edible but nonflippable festive coin." From c79502b3e6347ed8df594d16044d8096514cefa6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 16:32:09 -0400 Subject: [PATCH 06/29] Update snacks_meat.dm --- .../food_and_drinks/food/snacks_meat.dm | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index d3466caa5e..b073e4be21 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -54,6 +54,43 @@ tastes = list("fish" = 1, "chips" = 1) foodtype = MEAT | VEGETABLES | FRIED +/obj/item/reagent_containers/food/snacks/sushie_basic // You get 8 + name = "Funa Hosomaki" + desc = "A small cylindrical filled with rice and fish." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_basic" + bonus_reagents = list("vitamin" = 2) + list_reagents = list("nutriment" = 1) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/sushie_adv // You get 3 + name = "Funa Nigiri" + desc = "A pice of carp lightly placed on some rice." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_adv" + bonus_reagents = list("vitamin" = 2) + list_reagents = list("nutriment" = 2) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/sushie_pro // You get 1! + name = "Funa Nigiri" + desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_adv" + bonus_reagents = list("nutriment" = 1, "vitamin" = 2) + list_reagents = list("nutriment" = 8, "vitamin" = 1) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + + ////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// /obj/item/reagent_containers/food/snacks/tofu From c927fd48127db424ae97753aa412b03677567e76 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 16:40:19 -0400 Subject: [PATCH 07/29] Update snacks_other.dm --- code/modules/food_and_drinks/food/snacks_other.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index d1eb495579..2daabfac17 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -579,3 +579,12 @@ filling_color = "#A0522D" tastes = list("chocolate" = 1) foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/riceball + name = "Onigiri" + desc = "A ball of rice with some light salt and a wrap of Kudzu skin." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "riceball" + list_reagents = list("nutriment" = 5, "sodiumchloride" = 2) + tastes = list("rice" = 4, "salt" = 1) + foodtype = GRAIN From 54ac2424549df203317c6b11b44fd8d8163edbbc Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 16:57:28 -0400 Subject: [PATCH 08/29] Update recipes_meat.dm --- .../recipes/tablecraft/recipes_meat.dm | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index b33d6a520b..94f9487c4b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -81,6 +81,37 @@ result = /obj/item/reagent_containers/food/snacks/sashimi subcategory = CAT_MEAT +/datum/crafting_recipe/food/sushie_basic + name = "Funa Hosomaki" + reqs = list( + /datum/reagent/consumable/soysauce = 3, + /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 2, + /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, + ) + result = /obj/item/reagent_containers/food/snacks/sushie_basic = 8 + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/sushie_adv + name = "Funa Nigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sushie_adv = 3 + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/sushie_pro + name = "Well made Funa Nigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 10, + /obj/item/reagent_containers/food/snacks/salad/ricebowl = 2, + /obj/item/reagent_containers/food/snacks/carpmeat = 5 + ) + result = /obj/item/reagent_containers/food/snacks/sushie_pro + subcategory = CAT_MEAT + ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// /datum/crafting_recipe/food/spidereggsham @@ -93,6 +124,16 @@ result = /obj/item/reagent_containers/food/snacks/spidereggsham subcategory = CAT_MEAT +/datum/crafting_recipe/food/sushie_egg + name = "Tobiko" + reqs = list( + /datum/reagent/consumable/soysauce = 6, + /obj/item/reagent_containers/food/snacks/spidereggs = 1, + /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, + ) + result = /obj/item/reagent_containers/food/snacks/sushie_egg = 3 + subcategory = CAT_MEAT + ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// /datum/crafting_recipe/food/cornedbeef From 9cb9da788e297ab11795eda2cd03e28af32b49a7 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 16:59:43 -0400 Subject: [PATCH 09/29] Update recipes_misc.dm --- .../food_and_drinks/recipes/tablecraft/recipes_misc.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 3925416560..3dd27ddd01 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -345,3 +345,13 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/ricepudding subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/riceball + name = "Onigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 1, + /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, + /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 + ) + result = /obj/item/reagent_containers/food/snacks/riceball + subcategory = CAT_MISCFOOD From 870b0d6cd8cb60d5d14cf0a938a3d7dfaca38c26 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 17:29:12 -0400 Subject: [PATCH 10/29] Update recipes_meat.dm --- .../recipes/tablecraft/recipes_meat.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 94f9487c4b..c4194ee1e6 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -89,7 +89,10 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 2, /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, ) - result = /obj/item/reagent_containers/food/snacks/sushie_basic = 8 + result = list( + /obj/item/reagent_containers/food/snacks/sushie_basic = 8 + /obj/item/reagent_containers/glass/bowl = 1 + ) subcategory = CAT_MEAT /datum/crafting_recipe/food/sushie_adv @@ -99,7 +102,10 @@ /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) - result = /obj/item/reagent_containers/food/snacks/sushie_adv = 3 + result = list( + /obj/item/reagent_containers/food/snacks/sushie_adv = 3 + /obj/item/reagent_containers/glass/bowl = 1 + ) subcategory = CAT_MEAT /datum/crafting_recipe/food/sushie_pro @@ -110,6 +116,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 5 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro + /obj/item/reagent_containers/glass/bowl subcategory = CAT_MEAT ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// @@ -131,7 +138,7 @@ /obj/item/reagent_containers/food/snacks/spidereggs = 1, /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, ) - result = /obj/item/reagent_containers/food/snacks/sushie_egg = 3 + result = =/obj/item/reagent_containers/food/snacks/tobiko = 3 subcategory = CAT_MEAT ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// From 8036f25ad9bf806e831a443c59f7cace89b2aba7 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 17:30:39 -0400 Subject: [PATCH 11/29] Update recipes_misc.dm --- .../food_and_drinks/recipes/tablecraft/recipes_misc.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 3dd27ddd01..6aab0644c6 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -353,5 +353,8 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 ) - result = /obj/item/reagent_containers/food/snacks/riceball + result = list( + /obj/item/reagent_containers/food/snacks/riceball + /obj/item/reagent_containers/glass/bowl + ) subcategory = CAT_MISCFOOD From 9a4a3151183d22cf4257879fc0f31cd625b07045 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 17:44:18 -0400 Subject: [PATCH 12/29] Update recipes_meat.dm --- .../food_and_drinks/recipes/tablecraft/recipes_meat.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index c4194ee1e6..812cdbf1ca 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -90,7 +90,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, ) result = list( - /obj/item/reagent_containers/food/snacks/sushie_basic = 8 + /obj/item/reagent_containers/food/snacks/sushie_basic = 8, /obj/item/reagent_containers/glass/bowl = 1 ) subcategory = CAT_MEAT @@ -103,7 +103,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = list( - /obj/item/reagent_containers/food/snacks/sushie_adv = 3 + /obj/item/reagent_containers/food/snacks/sushie_adv = 3, /obj/item/reagent_containers/glass/bowl = 1 ) subcategory = CAT_MEAT From 8098cd8fd79f2c8d68804cbdb03b5b685ba71c10 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 17:58:55 -0400 Subject: [PATCH 13/29] Update recipes_meat.dm --- .../food_and_drinks/recipes/tablecraft/recipes_meat.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 812cdbf1ca..0ce5f6b24b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -115,8 +115,10 @@ /obj/item/reagent_containers/food/snacks/salad/ricebowl = 2, /obj/item/reagent_containers/food/snacks/carpmeat = 5 ) - result = /obj/item/reagent_containers/food/snacks/sushie_pro - /obj/item/reagent_containers/glass/bowl + result = list( + /obj/item/reagent_containers/food/snacks/sushie_pro = 1, + /obj/item/reagent_containers/glass/bowl = 1 + ) subcategory = CAT_MEAT ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// From 78caec991a0ea0cd4a7510b3171c6024b338e4bf Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 18:08:05 -0400 Subject: [PATCH 14/29] 15 is 3 x 5 more lucky? --- code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 0ce5f6b24b..f961f3f2cc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -140,7 +140,7 @@ /obj/item/reagent_containers/food/snacks/spidereggs = 1, /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, ) - result = =/obj/item/reagent_containers/food/snacks/tobiko = 3 + result = /obj/item/reagent_containers/food/snacks/tobiko = 3 subcategory = CAT_MEAT ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// From e6ff7f811bff1b318e155b5daa50786cf5bd2564 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 18:27:59 -0400 Subject: [PATCH 15/29] Update recipes_misc.dm --- .../food_and_drinks/recipes/tablecraft/recipes_misc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 6aab0644c6..5e739ba1d1 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -354,7 +354,7 @@ /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 ) result = list( - /obj/item/reagent_containers/food/snacks/riceball - /obj/item/reagent_containers/glass/bowl + /obj/item/reagent_containers/food/snacks/riceball = 1, + /obj/item/reagent_containers/glass/bowl = 1 ) subcategory = CAT_MISCFOOD From 6b9e9e23bf6dcfd44a38df59981adad2a6b38023 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 5 Apr 2019 18:44:02 -0400 Subject: [PATCH 16/29] Update recipes_meat.dm --- .../food_and_drinks/recipes/tablecraft/recipes_meat.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index f961f3f2cc..7eff00cfa6 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -140,7 +140,9 @@ /obj/item/reagent_containers/food/snacks/spidereggs = 1, /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, ) - result = /obj/item/reagent_containers/food/snacks/tobiko = 3 + result = list( + /obj/item/reagent_containers/food/snacks/tobiko = 3 + ) subcategory = CAT_MEAT ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// From 62e711f69d4305e121efa959717cc9d6975f460a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 6 Apr 2019 13:03:01 -0400 Subject: [PATCH 17/29] Update snacks_meat.dm --- code/modules/food_and_drinks/food/snacks_meat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index b073e4be21..a66fb6973e 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -82,7 +82,7 @@ name = "Funa Nigiri" desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "sushie_adv" + icon_state = "sushie_pro" bonus_reagents = list("nutriment" = 1, "vitamin" = 2) list_reagents = list("nutriment" = 8, "vitamin" = 1) bitesize = 1 From 4bb465a7d8bea11d0cbe76574645ef4eafc8fa9c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 7 Apr 2019 19:42:27 -0400 Subject: [PATCH 18/29] reblance --- code/modules/food_and_drinks/food/snacks_meat.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index a66fb6973e..f31d9962a5 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -54,37 +54,37 @@ tastes = list("fish" = 1, "chips" = 1) foodtype = MEAT | VEGETABLES | FRIED -/obj/item/reagent_containers/food/snacks/sushie_basic // You get 8 +/obj/item/reagent_containers/food/snacks/sushie_basic name = "Funa Hosomaki" desc = "A small cylindrical filled with rice and fish." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_basic" bonus_reagents = list("vitamin" = 2) - list_reagents = list("nutriment" = 1) + list_reagents = list("nutriment" = 4) bitesize = 1 filling_color = "#F2EEEA" //rgb(242, 238, 234) tastes = list("fish" = 1, "rice" = 1, "salt" = 1) foodtype = MEAT | VEGETABLES -/obj/item/reagent_containers/food/snacks/sushie_adv // You get 3 +/obj/item/reagent_containers/food/snacks/sushie_adv name = "Funa Nigiri" desc = "A pice of carp lightly placed on some rice." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_adv" bonus_reagents = list("vitamin" = 2) - list_reagents = list("nutriment" = 2) + list_reagents = list("nutriment" = 6) bitesize = 1 filling_color = "#F2EEEA" //rgb(242, 238, 234) tastes = list("fish" = 1, "rice" = 1, "salt" = 1) foodtype = MEAT | VEGETABLES -/obj/item/reagent_containers/food/snacks/sushie_pro // You get 1! +/obj/item/reagent_containers/food/snacks/sushie_pro name = "Funa Nigiri" desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_pro" - bonus_reagents = list("nutriment" = 1, "vitamin" = 2) - list_reagents = list("nutriment" = 8, "vitamin" = 1) + bonus_reagents = list("nutriment" = 2, "vitamin" = 2) + list_reagents = list("nutriment" = 8, "vitamin" = 2) bitesize = 1 filling_color = "#F2EEEA" //rgb(242, 238, 234) tastes = list("fish" = 1, "rice" = 1, "salt" = 1) From d7b37fcf838b5263c28464f79e0a18fa85887b46 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 7 Apr 2019 19:43:59 -0400 Subject: [PATCH 19/29] reblance --- code/modules/food_and_drinks/food/snacks_other.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 2daabfac17..ac6e0bfd44 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -212,7 +212,7 @@ desc = "Spider eggs wrapped in a thin salted Kudzu pod" icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_egg" - list_reagents = list("nutriment" = 3, "vitamin" = 2) + list_reagents = list("nutriment" = 6, "vitamin" = 2) filling_color = "#FF3333" // R225 G051 B051 tastes = list("seaweed" = 1, "salty" = 2) foodtype = MEAT | VEGETABLES @@ -585,6 +585,6 @@ desc = "A ball of rice with some light salt and a wrap of Kudzu skin." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "riceball" - list_reagents = list("nutriment" = 5, "sodiumchloride" = 2) + list_reagents = list("nutriment" = 6, "sodiumchloride" = 4) tastes = list("rice" = 4, "salt" = 1) foodtype = GRAIN From b4b9e570580b561ea57870a2bb6864e7d6b6a6ad Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 7 Apr 2019 19:50:09 -0400 Subject: [PATCH 20/29] Update recipes_meat.dm --- .../recipes/tablecraft/recipes_meat.dm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 7eff00cfa6..d86d6c2e5b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -89,10 +89,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 2, /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, ) - result = list( - /obj/item/reagent_containers/food/snacks/sushie_basic = 8, - /obj/item/reagent_containers/glass/bowl = 1 - ) + result = /obj/item/reagent_containers/food/snacks/sushie_basic subcategory = CAT_MEAT /datum/crafting_recipe/food/sushie_adv @@ -102,10 +99,7 @@ /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) - result = list( - /obj/item/reagent_containers/food/snacks/sushie_adv = 3, - /obj/item/reagent_containers/glass/bowl = 1 - ) + result = /obj/item/reagent_containers/food/snacks/sushie_adv subcategory = CAT_MEAT /datum/crafting_recipe/food/sushie_pro @@ -115,10 +109,7 @@ /obj/item/reagent_containers/food/snacks/salad/ricebowl = 2, /obj/item/reagent_containers/food/snacks/carpmeat = 5 ) - result = list( - /obj/item/reagent_containers/food/snacks/sushie_pro = 1, - /obj/item/reagent_containers/glass/bowl = 1 - ) + result = /obj/item/reagent_containers/food/snacks/sushie_pro subcategory = CAT_MEAT ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// @@ -140,9 +131,7 @@ /obj/item/reagent_containers/food/snacks/spidereggs = 1, /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, ) - result = list( - /obj/item/reagent_containers/food/snacks/tobiko = 3 - ) + result = /obj/item/reagent_containers/food/snacks/tobiko subcategory = CAT_MEAT ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// From 47e0f5b94671f54bc75f00e3c20b8576fd49d0ff Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 7 Apr 2019 19:50:52 -0400 Subject: [PATCH 21/29] Update recipes_misc.dm --- .../food_and_drinks/recipes/tablecraft/recipes_misc.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 5e739ba1d1..3dd27ddd01 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -353,8 +353,5 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 ) - result = list( - /obj/item/reagent_containers/food/snacks/riceball = 1, - /obj/item/reagent_containers/glass/bowl = 1 - ) + result = /obj/item/reagent_containers/food/snacks/riceball subcategory = CAT_MISCFOOD From 4772f12d54f2d45a04a772bd8594b21a2b2d69d9 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 7 Apr 2019 19:52:48 -0400 Subject: [PATCH 22/29] Update drinnerware.dm --- code/modules/vending/drinnerware.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 151da9bc2f..1ec454c82a 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -13,7 +13,7 @@ /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5, /obj/item/reagent_containers/food/condiment/saltshaker = 5, /obj/item/reagent_containers/food/condiment/peppermill = 5, - /obj/item/reagent_containers/glass/bowl = 20) + /obj/item/reagent_containers/glass/bowl = 50) contraband = list(/obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife/butcher = 2) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) From 7d3b71938fb75d9c8a86d10eaef273aa534d9ee8 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Apr 2019 02:25:22 -0400 Subject: [PATCH 23/29] grammar and "Bitsize fix" --- .../food_and_drinks/food/snacks_meat.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index f31d9962a5..73d4598147 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -54,40 +54,40 @@ tastes = list("fish" = 1, "chips" = 1) foodtype = MEAT | VEGETABLES | FRIED -/obj/item/reagent_containers/food/snacks/sushie_basic - name = "Funa Hosomaki" +/obj/item/reagent_containers/food/snacks/sushi_basic + name = "funa hosomaki" desc = "A small cylindrical filled with rice and fish." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_basic" bonus_reagents = list("vitamin" = 2) list_reagents = list("nutriment" = 4) - bitesize = 1 + bitesize = 10 filling_color = "#F2EEEA" //rgb(242, 238, 234) tastes = list("fish" = 1, "rice" = 1, "salt" = 1) foodtype = MEAT | VEGETABLES -/obj/item/reagent_containers/food/snacks/sushie_adv - name = "Funa Nigiri" +/obj/item/reagent_containers/food/snacks/sushi_adv + name = "funa nigiri" desc = "A pice of carp lightly placed on some rice." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_adv" bonus_reagents = list("vitamin" = 2) list_reagents = list("nutriment" = 6) - bitesize = 1 + bitesize = 10 filling_color = "#F2EEEA" //rgb(242, 238, 234) tastes = list("fish" = 1, "rice" = 1, "salt" = 1) foodtype = MEAT | VEGETABLES -/obj/item/reagent_containers/food/snacks/sushie_pro - name = "Funa Nigiri" +/obj/item/reagent_containers/food/snacks/sushi_pro + name = "funa nigiri" desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_pro" bonus_reagents = list("nutriment" = 2, "vitamin" = 2) list_reagents = list("nutriment" = 8, "vitamin" = 2) - bitesize = 1 + bitesize = 10 filling_color = "#F2EEEA" //rgb(242, 238, 234) - tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + tastes = list("fish" = 3, "rice" = 2, "salt" = 1) foodtype = MEAT | VEGETABLES From e615038836cd177044fa1b1b59a4384aabbcc5a1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Apr 2019 02:35:27 -0400 Subject: [PATCH 24/29] Update snacks_other.dm Traditionally, an onigiri is filled with pickled salted salmon, katsuobushi, kombu, tarako, or any other salty or sour ingredient as a natural preservative. --- code/modules/food_and_drinks/food/snacks_other.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index ac6e0bfd44..5213cc96e1 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -208,13 +208,13 @@ foodtype = JUNKFOOD | SUGAR /obj/item/reagent_containers/food/snacks/tobiko - name = "Tobiko" + name = "tobiko" desc = "Spider eggs wrapped in a thin salted Kudzu pod" icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_egg" list_reagents = list("nutriment" = 6, "vitamin" = 2) filling_color = "#FF3333" // R225 G051 B051 - tastes = list("seaweed" = 1, "salty" = 2) + tastes = list("seaweed" = 1, "cobwebs" = 1, "salty" = 2) foodtype = MEAT | VEGETABLES /obj/item/reagent_containers/food/snacks/chococoin @@ -581,10 +581,10 @@ foodtype = JUNKFOOD | SUGAR /obj/item/reagent_containers/food/snacks/riceball - name = "Onigiri" + name = "onigiri" desc = "A ball of rice with some light salt and a wrap of Kudzu skin." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "riceball" - list_reagents = list("nutriment" = 6, "sodiumchloride" = 4) - tastes = list("rice" = 4, "salt" = 1) + list_reagents = list("nutriment" = 6, "sodiumchloride" = 2) + tastes = list("rice" = 3, "salt" = 1) foodtype = GRAIN From 7f526242c3bebfb276a1d122991cdd090cc8c690 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Apr 2019 02:39:17 -0400 Subject: [PATCH 25/29] grammar and lowering of Well made 5 -> 2 --- .../recipes/tablecraft/recipes_meat.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index d86d6c2e5b..e401e08062 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -81,7 +81,7 @@ result = /obj/item/reagent_containers/food/snacks/sashimi subcategory = CAT_MEAT -/datum/crafting_recipe/food/sushie_basic +/datum/crafting_recipe/food/sushi_basic name = "Funa Hosomaki" reqs = list( /datum/reagent/consumable/soysauce = 3, @@ -89,27 +89,27 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 2, /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, ) - result = /obj/item/reagent_containers/food/snacks/sushie_basic + result = /obj/item/reagent_containers/food/snacks/sushi_basic subcategory = CAT_MEAT -/datum/crafting_recipe/food/sushie_adv +/datum/crafting_recipe/food/sushi_adv name = "Funa Nigiri" reqs = list( /datum/reagent/consumable/soysauce = 5, /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) - result = /obj/item/reagent_containers/food/snacks/sushie_adv + result = /obj/item/reagent_containers/food/snacks/sushi_adv subcategory = CAT_MEAT -/datum/crafting_recipe/food/sushie_pro +/datum/crafting_recipe/food/sushi_pro name = "Well made Funa Nigiri" reqs = list( /datum/reagent/consumable/soysauce = 10, /obj/item/reagent_containers/food/snacks/salad/ricebowl = 2, - /obj/item/reagent_containers/food/snacks/carpmeat = 5 + /obj/item/reagent_containers/food/snacks/carpmeat = 2 ) - result = /obj/item/reagent_containers/food/snacks/sushie_pro + result = /obj/item/reagent_containers/food/snacks/sushi_pro subcategory = CAT_MEAT ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// @@ -124,7 +124,7 @@ result = /obj/item/reagent_containers/food/snacks/spidereggsham subcategory = CAT_MEAT -/datum/crafting_recipe/food/sushie_egg +/datum/crafting_recipe/food/sushi_egg name = "Tobiko" reqs = list( /datum/reagent/consumable/soysauce = 6, From f315250fc435dba6d05fa25caf8e62eb1a5f7c2e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Apr 2019 02:39:37 -0400 Subject: [PATCH 26/29] Update drinnerware.dm --- code/modules/vending/drinnerware.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 1ec454c82a..33e839c039 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -13,7 +13,7 @@ /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5, /obj/item/reagent_containers/food/condiment/saltshaker = 5, /obj/item/reagent_containers/food/condiment/peppermill = 5, - /obj/item/reagent_containers/glass/bowl = 50) + /obj/item/reagent_containers/glass/bowl = 30) contraband = list(/obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife/butcher = 2) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) From d9d2f4de7aad9abd32d80d14dd66cc6a9d465c7d Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Apr 2019 02:46:39 -0400 Subject: [PATCH 27/29] grammar and balance --- code/modules/food_and_drinks/food/snacks_meat.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index 73d4598147..2ef632350e 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -56,7 +56,7 @@ /obj/item/reagent_containers/food/snacks/sushi_basic name = "funa hosomaki" - desc = "A small cylindrical filled with rice and fish." + desc = "A small cylindrical kudzu skin, filled with rice and fish." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_basic" bonus_reagents = list("vitamin" = 2) @@ -84,7 +84,7 @@ icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_pro" bonus_reagents = list("nutriment" = 2, "vitamin" = 2) - list_reagents = list("nutriment" = 8, "vitamin" = 2) + list_reagents = list("nutriment" = 6, "vitamin" = 2) bitesize = 10 filling_color = "#F2EEEA" //rgb(242, 238, 234) tastes = list("fish" = 3, "rice" = 2, "salt" = 1) From bff53530f454f3f8f2afb4a23ce4b4c54d47c467 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Apr 2019 02:49:48 -0400 Subject: [PATCH 28/29] tastes --- code/modules/food_and_drinks/food/snacks_meat.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index 2ef632350e..78aae3f29e 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -63,7 +63,7 @@ list_reagents = list("nutriment" = 4) bitesize = 10 filling_color = "#F2EEEA" //rgb(242, 238, 234) - tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + tastes = list("fish" = 1, "rice" = 2, "salt" = 1) foodtype = MEAT | VEGETABLES /obj/item/reagent_containers/food/snacks/sushi_adv @@ -75,7 +75,7 @@ list_reagents = list("nutriment" = 6) bitesize = 10 filling_color = "#F2EEEA" //rgb(242, 238, 234) - tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + tastes = list("fish" = 2, "rice" = 2, "salt" = 1) foodtype = MEAT | VEGETABLES /obj/item/reagent_containers/food/snacks/sushi_pro From 8fec3e3d1c63f4e84cdae7b2998954cf8dab3eea Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Apr 2019 15:32:23 -0400 Subject: [PATCH 29/29] fixed more grammar --- code/modules/food_and_drinks/food/snacks_meat.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index 78aae3f29e..cf99bd78d9 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -68,7 +68,7 @@ /obj/item/reagent_containers/food/snacks/sushi_adv name = "funa nigiri" - desc = "A pice of carp lightly placed on some rice." + desc = "A peace of carp lightly placed on some rice." icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_adv" bonus_reagents = list("vitamin" = 2) @@ -80,7 +80,7 @@ /obj/item/reagent_containers/food/snacks/sushi_pro name = "funa nigiri" - desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" + desc = "A well prepared peace of the best of the carp fillet placed on rice. Looks fancy and fresh!" icon = 'modular_citadel/icons/obj/food/food.dmi' icon_state = "sushie_pro" bonus_reagents = list("nutriment" = 2, "vitamin" = 2)