diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl index bd350a7b5bb..6d23ac9e55e 100644 --- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl @@ -10,3 +10,6 @@ flavor-complex-blast = like jungle warfare flavor-complex-torpedo = like convoy raiding flavor-complex-bees = like buzzing and honey flavor-complex-wassail = warm and comforting +flavor-complex-fine-noodles = like fine noodles +flavor-complex-rich-broth = rich broth +flavor-complex-tangy = tangy diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 7a1d8763ce2..74692516bbe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -15,6 +15,7 @@ FoodCondimentBottleKetchup: 2 FoodCondimentBottleBBQ: 2 FoodCondimentBottleVinegar: 5 # Frontier 2<5 + FoodCondimentBottleSoysauce: 5 # Frontier # ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive ReagentContainerMayo: 2 OilJarOlive: 1 # Frontier diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml index 0ee74d535de..2b7ad419bb0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -78,3 +78,39 @@ state: squeeze-bottle-mustard - type: Icon state: squeeze-bottle-mustard + +- type: entity + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] + id: FoodCondimentBottleSoysauce + name: soy sauce bottle + description: Used to season dishes to umami perfection. With extra sodium! + components: + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon_empty"} + - type: Item + size: Small + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Soysauce + Quantity: 30 + - type: SolutionTransfer + playTransferSound: false + canChangeTransferAmount: true + minTransferAmount: 1 + maxTransferAmount: 5 + - type: Sprite + sprite: _NF/Objects/Consumable/Food/soysauce.rsi + state: icon + - type: Openable + closeable: true + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml index 2a16a535a9c..1a37b7f73da 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -361,3 +361,193 @@ - type: Tag tags: - Fruit + +- type: entity + name: basic noodles + parent: FoodBowlBase + id: FoodMealBasicNoodles + description: A simple ramen bowl of noodles and broth. Yum! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: basic-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Flavorol + Quantity: 10 + +- type: entity + name: miso noodles + parent: FoodBowlBase + id: FoodMealMisoNoodles + description: Miso, or fermented bean paste, broth with scallion and egg. Robust! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - tangy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: miso-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Meat + +- type: entity + name: shio noodles + parent: FoodBowlBase + id: FoodMealShioNoodles + description: Sea salt broth with corn and seaweed. Light! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: shio-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Vegetable + +- type: entity + name: shoyu noodles + parent: FoodBowlBase + id: FoodMealShoyuNoodles + description: Soy sauce broth with corn, egg, and pork. Salty! + components: + - type: FlavorProfile + flavors: + - finenoodles + - richbroth + - savory + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: shoyu-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Vegetable + - Meat + +- type: entity + name: spicy noodles + parent: FoodBowlBase + id: FoodMealSpicyNoodles + description: A not-so-simple ramen bowl of noodles, broth, and tofu. Hot! + components: + - type: FlavorProfile + flavors: + - finenoodles + - tofu + - spicy + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: spicy-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: CapsaicinOil + Quantity: 3 + - type: Tag + tags: + - Vegetable + +- type: entity + name: tonkatsu noodles + parent: FoodBowlBase + id: FoodMealTonkatsuNoodles + description: Pork bone broth with garlic and pork. Rich! + components: + - type: FlavorProfile + flavors: + - finenoodles + - savory + - garlic + - type: Sprite + sprite: _NF/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: tonkatsu-noodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Flavorol + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - Meat diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml index 3178c09951e..567e44f6e7a 100644 --- a/Resources/Prototypes/_NF/Flavors/flavors.yml +++ b/Resources/Prototypes/_NF/Flavors/flavors.yml @@ -52,3 +52,18 @@ id: wassail flavorType: Complex description: flavor-complex-wassail + +- type: flavor + id: finenoodles + flavorType: Complex + description: flavor-complex-fine-noodles + +- type: flavor + id: richbroth + flavorType: Complex + description: flavor-complex-rich-broth + +- type: flavor + id: tangy + flavorType: Complex + description: flavor-complex-tangy diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index 7be8a8bf2ab..389a2876679 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -663,3 +663,99 @@ recipeType: - Oven - Microwave + +# ramen + +- type: microwaveMealRecipe + id: RecipeBasicNoodles + name: basic noodles + result: FoodMealBasicNoodles + time: 10 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeMisoNoodles + name: miso noodles + result: FoodMealMisoNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodSoybeans: 1 + FoodEgg: 1 + FoodButterSlice: 1 + reagents: + Water: 20 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeShioNoodles + name: shio noodles + result: FoodMealShioNoodles + time: 15 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodCorn: 1 + reagents: + Water: 20 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeShoyuNoodles + name: shoyunoodles + result: FoodMealShoyuNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodEgg: 1 + FoodCorn: 1 + FoodMeatBacon: 1 + reagents: + Soysauce: 10 + Water: 10 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeSpicyNoodles + name: spicynoodles + result: FoodMealSpicyNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodTofuSlice: 1 + FoodChiliPepper: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: RecipeTonkatsuNoodles + name: tonkatsu noodles + result: FoodMealTonkatsuNoodles + time: 20 + solids: + FoodBowlBig: 1 + FoodNoodlesBoiled: 1 + FoodSoybeans: 1 + FoodGarlic: 1 + FoodMeatBacon: 1 + reagents: + Soysauce: 5 + Water: 15 + recipeType: + - Oven diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png new file mode 100644 index 00000000000..7c3ca70dd19 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json index 0a3b323861d..2ceb8176a6a 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x, edited by Dusty Lens", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x, pears, avocado, greek by Dusty Lens, -noodles by wallfloweghost (discord)", "size": { "x": 32, "y": 32 @@ -16,6 +16,24 @@ { "name": "avocado" }, + { + "name": "basic-noodles" + }, + { + "name": "miso-noodles" + }, + { + "name": "shio-noodles" + }, + { + "name": "shoyu-noodles" + }, + { + "name": "spicy-noodles" + }, + { + "name": "tonkatsu-noodles" + }, { "name": "poachedpear" }, diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png new file mode 100644 index 00000000000..f5ee9aa91ae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png new file mode 100644 index 00000000000..fea572582a0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png new file mode 100644 index 00000000000..eede6fab3d6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png new file mode 100644 index 00000000000..fd597a3abf7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png new file mode 100644 index 00000000000..a116fb02451 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png new file mode 100644 index 00000000000..67507351576 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png new file mode 100644 index 00000000000..a3d5cdf4940 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png new file mode 100644 index 00000000000..ed62bd33dae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png new file mode 100644 index 00000000000..0ec1498262f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png new file mode 100644 index 00000000000..b0ef447bdc5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png new file mode 100644 index 00000000000..670629b242f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png new file mode 100644 index 00000000000..65c53fa8d50 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png new file mode 100644 index 00000000000..4d1a8b72d66 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json new file mode 100644 index 00000000000..7dd987eaf04 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "soysauce by wallflowerghost (discord), edited by DustyLens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +}