From 449756c73058bf2623f81846730b3c67fa45547e Mon Sep 17 00:00:00 2001 From: dustylens Date: Thu, 26 Dec 2024 10:49:39 -0800 Subject: [PATCH 1/6] Adds some ramen dishes, hurrah --- .../en-US/_NF/flavors/flavor-profiles.ftl | 3 + .../VendingMachines/Inventories/chefvend.yml | 2 + .../Consumable/Food/Containers/condiments.yml | 35 ++++ .../Objects/Consumable/Food/meals.yml | 189 ++++++++++++++++++ Resources/Prototypes/_NF/Flavors/flavors.yml | 15 ++ .../_NF/Recipes/Cooking/meal_recipes.yml | 96 +++++++++ .../Food/bowl.rsi/basic-noodles.png | Bin 0 -> 303 bytes .../Consumable/Food/bowl.rsi/meta.json | 20 +- .../Consumable/Food/bowl.rsi/miso-noodles.png | Bin 0 -> 345 bytes .../Consumable/Food/bowl.rsi/shio-noodles.png | Bin 0 -> 358 bytes .../Food/bowl.rsi/shoyu-noodles.png | Bin 0 -> 375 bytes .../Food/bowl.rsi/spicy-noodles.png | Bin 0 -> 308 bytes .../Food/bowl.rsi/tonkatsu-noodles.png | Bin 0 -> 341 bytes .../Food/condiments.rsi/icon-empty.png | Bin 0 -> 293 bytes .../Food/condiments.rsi/icon-open.png | Bin 0 -> 238 bytes .../Consumable/Food/soysauce.rsi/fill-1.png | Bin 0 -> 120 bytes .../Consumable/Food/soysauce.rsi/fill-2.png | Bin 0 -> 130 bytes .../Consumable/Food/soysauce.rsi/fill-3.png | Bin 0 -> 130 bytes .../Consumable/Food/soysauce.rsi/fill-4.png | Bin 0 -> 138 bytes .../Consumable/Food/soysauce.rsi/fill-5.png | Bin 0 -> 137 bytes .../Consumable/Food/soysauce.rsi/icon.png | Bin 0 -> 289 bytes .../Food/soysauce.rsi/icon_empty.png | Bin 0 -> 274 bytes .../Food/soysauce.rsi/icon_open.png | Bin 0 -> 274 bytes .../Consumable/Food/soysauce.rsi/meta.json | 36 ++++ 24 files changed, 395 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/basic-noodles.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/miso-noodles.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shio-noodles.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/shoyu-noodles.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/spicy-noodles.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi/tonkatsu-noodles.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-open.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/fill-5.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_empty.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/icon_open.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json 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 b5eb2c20dc6..46afd1c0b27 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -17,6 +17,8 @@ FoodCondimentBottleKetchup: 2 FoodCondimentBottleBBQ: 2 FoodCondimentBottleVinegar: 5 # Frontier 2<5 + FoodCondimentBottleTableSoysauce: 5 # Frontier + FoodCondimentBottleKitchenSoysauce: 5 # Frontier # ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive OilJarOlive: 3 OilJarCorn: 3 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..b368e9be976 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,38 @@ 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: 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 + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - 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..228020e60c5 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -361,3 +361,192 @@ - 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: + 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. + 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 + 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 0000000000000000000000000000000000000000..7c3ca70dd194025bd9c5daccdc37ce0235100b08 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y} z6C_v{Cy4Yk1sZU<9b{m33ldp>wmizMXV-(y--}i}V#pDT;;!#WNk~X|@%VaD#?-&3 z4=6l8bpQxHl-(9-07S}rphoK9?u1Zw;9p{>*LrlaW5 zAT}UKDNJcsnB9I_(51Cui-x-j^L7?yAZR}Hyjx;gnEc)20bf2!9d0-G;gLV$A}O&$ zRie&r_t6cZZW9mwxp(<#N-Kj|!GgTe~DWM4fmrQr@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f5ee9aa91ae0c447649f634499e0f0d8eb147142 GIT binary patch literal 345 zcmV-f0jBPx$6G=otR9J=W(6LIxP#A{cHzHIdRB;e7U@10KXmN6?2rhvRVz(@A4r#BVgE!#f zlI*tL%E$(lJv{%Ql;qcNu!#q9(pyN7$ zzMmE`^Y`e8@^;a~v;f%3j{wjydQ?AqOy0n>i2D(}!D}#U{KtT47w(!`SXoBL#QlgQ rHps6pO-7U0;PCt*(|3gsLi}%^S*~TC5k%Cm00000NkvXXu0mjfqbijZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fea572582a04ac91de765fad23bc4014b8e19bfd GIT binary patch literal 358 zcmV-s0h#`ZP)Px$AW1|)R9J=Wlg&y3Q5ZnaWb}gxGf+mN!@#(2717EBUnGzT*FAy-J%SBlL`09_ zHgVOi2*Jz-VhBcYQe1RfjiC4oNf7s}KDgZP94=gtNF)-8$Pm_0_cVv&&n{_dApyyt(8s;|0bE+m(AOn6;#d&{6<+ z)eC5Iu8@Sl^@XKC>20+SBAS14gMmWkgKR zvLebf-)ii%59xOmBD;}+wBJ?OPMt61cS$4?iR6Fs1BP69C!&xT_y7O^07*qoM6N<$ Ef;>5#^Z)<= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eede6fab3d6314e9487f8d4d971286779a4df034 GIT binary patch literal 375 zcmV--0f_#IP)Px$F-b&0R9J=W&@oFwQ5eSY|J5idZ%GXi+#8jGQxG|aWD+z8eTi;^L_<>$^c4!b zkhd0xM!`jDvKAX0BFIrw5+WC+8qDRMCPgGop{?^9-}mJ_4+kVkk|as`W6$Zdcr;Bh z=)E%Np%6j<+!#w%=lnjfVW_&za_ZLdZ=V?-Nb)56NTJ-JG@mSl1%o@>AASxS&Vmwy2B>`j5dk@)Uq)E z>QyJcpbs&#Ni7?rUUjyMj7&dR09zNO-JyS=RRW-xIt5_XUHUP!HCxy_;PvGaP4{9e z>)h=hTD`)5Ezm7@t=`Ln2y} z6C_v{Cy4Yk1sZU<9b{m33le!>95y%8Y@_|#)8FUw*vxsu0|Lv>#iu7k7-WlWvRb}( z`{k978fwq2GM@PJ#I*XK|0X}Y)mzPD_GuGXsl3^l*?RMZvj?9m%;9s` z9Qd4IHUuU7SfAB@S#gJqV+e=G3XkQ6A3Ti=fS}_~ zZTHon88`B$z31VnnZ#o+ew$Huko<`*`Z=GOcSfCus_G&`0E70c*p00i_>zopr0A443!~g&Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a116fb024516c45d32b469416ea88bc33eaeec28 GIT binary patch literal 341 zcmV-b0jmCqP)Px$4@pEpR9J=Wld(zzK@f(&C52?gaL6elNTQHhg2YBhCHMmI71l0Dzz0a_BP4Cg z6cKy_TWzdDtkNiwgLoWxCPFx?J2+!jkP|`XtCpSF`9B601VIo4;g3M#6M>*tYq$C%1E94g3_}{G zlGN8rd*t#*0C%Xg?D`%t*jM@Wv2cE?{A9P n>Uk>opxMm)w+MnD2>+K4=C)c0vO-gE00000NkvXXu0mjf1j&#* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-empty.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-empty.png new file mode 100644 index 0000000000000000000000000000000000000000..717477edffe9035d386d940dfea6b7ef67be0479 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}_dQ)4Ln2y} z6C_v{Cy4YkF|zeM$yyUS;dj5@wLcF8Pd?i?;dR6L`}+)6oIZ8vr@6en+G&|h&JB%? zjSC%op6uV!!EyMqdA@|&o+{^Qks_84UVfMVkTK!e6NS?{YF;u2fZ)TQSE7YpUna{k zt)9R4$NC>{IPZM=9b}~Myi~=*tpAa~0+9)#OfUAeGZr~DuF3h4pQwE}maT32lNU?7 zm=hdsn###>m6z+QoOTqkY>4sJEIS~1*`cj~(XPj2!>7Z`r}OYk_B85#lM}HkUEVGB p!rMnKfd|dF+zx6;uqq1!Jv+r_THLbx6M`D4?bJyAHVqvj=Z00=((c_mut^<}aw)9U$qf2{xU zhV#y+-$6$D&P!E1%=#Y*ED)I>%JgDiJ7bYkW2+4NpXeK>3Z^$cRJE*H`G`RxpscsO z{m|XJ+$W0!T=^8P2X)C795b1q7}LP7%)92#hnK3%hf^khv_U`6)`PenLk9IC< h$_2ZK%T0}eVO^#6#tUuz96&cSc)I$ztaD0e0sxKCUSa?M literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..67507351576c8f4e89b9b31ab8bc228f22ac53a0 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}MxHK?ArY-_ z&u!#oP~c%cxFPtP^PA}lUj#cj9*q4tN!6W!;lu7it2L``MyIXYZOve_fzjQOg^7Jt R$9kY{22WQ%mvv4FO#qjCC1U^p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a3d5cdf4940ea917cad7511dac9ec3efab682b60 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Hl8kyArY-_ zFBoz$DDXI6tXh7@e@{H$(~yE~%^v?}Z(_OS0#sFEu9bS*c=M7_`{#|XSP>10V`OO9U>dn?Z}qg2ePR`dm#Z#%q~7tE coq<7IFhYR!&W?l&Kyw&8UHx3vIVCg!02kybUjP6A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0ec1498262f70456be5067d101fadaea6ca1de15 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E}kxqArY-_ zFKy%ns&WY|S$6yU4teLui4o15t^Y$!1a>5_F&udBw)E!R@GFzb(vGds`QT*L`1{uc j--V&S`L{e~XJBAgmlR<4=`WZ7G>^g4)z4*}Q$iB}$qOyY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b0ef447bdc5fab2a51e6b2ca5f2f2d604e5db660 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}&YmugArY-_ zFP-LOFyL@;oILA|{u2A{O^tIxBAD{u)kR$6VQ9GTdgSGq^(!C0tJAhFd)~bP0l+XkKyNxbL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..670629b242f8f55dc8bcfe404741e8fbe9977efc GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}w>@1PLn2y} z6C_v{Cy4YkF|zeM$yyUS;dj5@wLcF8Pd?i?;dR6L`}+)6oIZ8vr@6en+G&|h&JB%? zjSC%op6uV!!EyMqdA@|&o+{^Qks_84UVfMVkTK!e6NS?{YF;u2fMCNJ|5-|ZQ`!%_ zO4t8q-*LU|v#3~HD#z4G3O8-KoEw51!Z;TEmSa1?$+~IN!~Lymd5Zi3BaV8qrc7t% z0fPQ-y3Lz6T6R3+Q@9?~C0lUJWP;-wV-e>+p+B?O*xF92%yca?)498uf3e<+vcg3x g5~Lv>naIg-ZIkJ`RS9XlKyNa5y85}Sb4q9e01i}kG5`Po literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..65c53fa8d506e321259e24930a234b6714359801 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}XFOdTLn2y} z6C_v{Cy4YkF|zeM$yyUS;dj5@wLcF8Pd?i?;dR6L`}+)6oIZ8vr@6en+G&|h&JB%? zjSC%op6uV!!EyMqdA@|&o+{^Qks_84UVfMVkTK!e6NS?{YF;u2fI#8s!E??lB~u!& zo{#(U|Nnn`bDs5e-|3rPa^h6mf3a;wYmyRvIQ7M?vS464q@{LH z_`#|^n@ut<6PZtJostx=D_#DY35YzI+3==`V|MCYJwFlA9I(3s4U8BW4t|bXo>_FJ Q1L!XXPgg&ebxsLQ0F#_?vj6}9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..65c53fa8d506e321259e24930a234b6714359801 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}XFOdTLn2y} z6C_v{Cy4YkF|zeM$yyUS;dj5@wLcF8Pd?i?;dR6L`}+)6oIZ8vr@6en+G&|h&JB%? zjSC%op6uV!!EyMqdA@|&o+{^Qks_84UVfMVkTK!e6NS?{YF;u2fI#8s!E??lB~u!& zo{#(U|Nnn`bDs5e-|3rPa^h6mf3a;wYmyRvIQ7M?vS464q@{LH z_`#|^n@ut<6PZtJostx=D_#DY35YzI+3==`V|MCYJwFlA9I(3s4U8BW4t|bXo>_FJ Q1L!XXPgg&ebxsLQ0F#_?vj6}9 literal 0 HcmV?d00001 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..1281c577027 --- /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" + } + ] +} From 8276b29f8ed2cdb6770e1f77da12718f7f1deade Mon Sep 17 00:00:00 2001 From: dustylens Date: Thu, 26 Dec 2024 10:57:55 -0800 Subject: [PATCH 2/6] Remove legacy soy bottle from chefvend. Whoops. --- .../Catalog/VendingMachines/Inventories/chefvend.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 46afd1c0b27..f09cada8f7e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -17,8 +17,7 @@ FoodCondimentBottleKetchup: 2 FoodCondimentBottleBBQ: 2 FoodCondimentBottleVinegar: 5 # Frontier 2<5 - FoodCondimentBottleTableSoysauce: 5 # Frontier - FoodCondimentBottleKitchenSoysauce: 5 # Frontier + FoodCondimentBottleSoysauce: 5 # Frontier # ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive OilJarOlive: 3 OilJarCorn: 3 From 84ab839bd23ebf2e020de890fb23418e22508017 Mon Sep 17 00:00:00 2001 From: dustylens Date: Thu, 26 Dec 2024 11:20:11 -0800 Subject: [PATCH 3/6] Issue corrections --- .../Objects/Consumable/Food/Containers/condiments.yml | 6 ------ .../_NF/Entities/Objects/Consumable/Food/meals.yml | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) 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 b368e9be976..e609e024697 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -104,12 +104,6 @@ state: icon - type: Openable closeable: true - layers: - - state: icon - map: ["enum.OpenableVisuals.Layer"] - - state: fill-1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - 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 228020e60c5..c577aa9281d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -515,6 +515,7 @@ Quantity: 10 - ReagentId: CapsaicinOil Quantity: 3 + - type: Tag tags: - Vegetable From 2271616b2d8f7c4e49a748642601de58fcc976c3 Mon Sep 17 00:00:00 2001 From: dustylens Date: Fri, 27 Dec 2024 15:48:11 -0800 Subject: [PATCH 4/6] Fixes, hopefully. --- .../Consumable/Food/Containers/condiments.yml | 7 +++++++ .../Consumable/Food/soysauce.rsi/icon_open.png | Bin 274 -> 274 bytes 2 files changed, 7 insertions(+) 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 e609e024697..2b7ad419bb0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -85,6 +85,13 @@ 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 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 index 65c53fa8d506e321259e24930a234b6714359801..4d1a8b72d66f73fb34fe390e650f0001c2d15b85 100644 GIT binary patch delta 206 zcmV;<05SiP0+IrdOn>(I+c$;@uilVkCJVU^`26h~gSxCNoS%92JXxM$BG&;EUcF(w z`S>xzm+#*hZa#iYt}*0C0RsaA!_)6S;L#w>$wA)`fB`8Eb{SY?Kye5R2tfBeC80o8HvG4+m0=YF!xwV&QpEu<5Jy%q37!B~b>xxdAc`D7 zuB8-%(mngIrh(Eu`$$d$WEVu(EbDf0qNrdS1*2dTjDnE~0K~FnmYA{zQvd(}07*qo IM6N<$f}C(%p8x;= delta 206 zcmV;<05SiP0+IrdOn=t=;1S8@v5@P4&)>c=sLRU2`8OXwCd(YMLx6#SfuTT5 Date: Fri, 27 Dec 2024 15:51:07 -0800 Subject: [PATCH 5/6] ah ha --- .../Consumable/Food/condiments.rsi/icon-empty.png | Bin 293 -> 0 bytes .../Consumable/Food/condiments.rsi/icon-open.png | Bin 238 -> 0 bytes .../Consumable/Food/soysauce.rsi/meta.json | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-empty.png delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-open.png diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-empty.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/icon-empty.png deleted file mode 100644 index 717477edffe9035d386d940dfea6b7ef67be0479..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}_dQ)4Ln2y} z6C_v{Cy4YkF|zeM$yyUS;dj5@wLcF8Pd?i?;dR6L`}+)6oIZ8vr@6en+G&|h&JB%? zjSC%op6uV!!EyMqdA@|&o+{^Qks_84UVfMVkTK!e6NS?{YF;u2fZ)TQSE7YpUna{k zt)9R4$NC>{IPZM=9b}~Myi~=*tpAa~0+9)#OfUAeGZr~DuF3h4pQwE}maT32lNU?7 zm=hdsn###>m6z+QoOTqkY>4sJEIS~1*`cj~(XPj2!>7Z`r}OYk_B85#lM}HkUEVGB p!rMnKfd|dF+zx6;uqq1!Jv+r_THLbx6M`D4?bJyAHVqvj=Z00=((c_mut^<}aw)9U$qf2{xU zhV#y+-$6$D&P!E1%=#Y*ED)I>%JgDiJ7bYkW2+4NpXeK>3Z^$cRJE*H`G`RxpscsO z{m|XJ+$W0!T=^8P2X)C795b1q7}LP7%)92#hnK3%hf^khv_U`6)`PenLk9IC< h$_2ZK%T0}eVO^#6#tUuz96&cSc)I$ztaD0e0sxKCUSa?M diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json index 1281c577027..7dd987eaf04 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/soysauce.rsi/meta.json @@ -24,13 +24,13 @@ "name": "fill-2" }, { - "name": "fill-3" + "name": "fill-3" }, { - "name": "fill-4" + "name": "fill-4" }, { - "name": "fill-5" + "name": "fill-5" } ] } From d9d36cae8d7cee7748c5addfdc4954cd2c0d2aec Mon Sep 17 00:00:00 2001 From: dustylens Date: Fri, 27 Dec 2024 16:49:33 -0800 Subject: [PATCH 6/6] Update meals.yml --- .../Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml index c577aa9281d..1a37b7f73da 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml @@ -391,7 +391,7 @@ name: miso noodles parent: FoodBowlBase id: FoodMealMisoNoodles - description: + description: Miso, or fermented bean paste, broth with scallion and egg. Robust! components: - type: FlavorProfile flavors: @@ -424,7 +424,7 @@ name: shio noodles parent: FoodBowlBase id: FoodMealShioNoodles - description: Sea salt broth with corn and seaweed. + description: Sea salt broth with corn and seaweed. Light! components: - type: FlavorProfile flavors: