From: korczoczek Date: Sat, 20 Dec 2025 18:21:49 +0000 (+0100) Subject: Added sprites for openable ingredients (#41923) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=77036e8cdde1878d396a24ac45c74a81d2787a01;p=space-station-14.git Added sprites for openable ingredients (#41923) * dont you hate it when you open your bag, but it stays closed? * linting my yml --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 28dfe41ba8..d9a06b89ef 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -84,8 +84,17 @@ name: flour bag description: A big bag of flour. Good for baking! components: - - type: Sprite - state: flour-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "flour-big_open"} # open + False: {state: "flour-big"} # closed + - type: Sprite + layers: + - state: flour-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -116,8 +125,17 @@ name: cornmeal bag description: A big bag of cornmeal. Good for cooking! components: - - type: Sprite - state: cornmeal-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "cornmeal-big_open"} # open + False: {state: "cornmeal-big"} # closed + - type: Sprite + layers: + - state: cornmeal-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -147,8 +165,17 @@ name: rice bag description: A big bag of rice. Good for cooking! components: - - type: Sprite - state: rice-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "rice-big_open"} # open + False: {state: "rice-big"} # closed + - type: Sprite + layers: + - state: rice-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -178,8 +205,17 @@ name: sugar bag description: A big bag of tasty spacey sugar. components: - - type: Sprite - state: sugar-big + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "sugar-big_open"} # open + False: {state: "sugar-big"} # closed + - type: Sprite + layers: + - state: sugar-big + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -211,8 +247,17 @@ name: olive oil description: Olive oil. From space olives presumably. components: - - type: Sprite - state: oliveoil + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "oliveoil_open"} # open + False: {state: "oliveoil"} # closed + - type: Sprite + layers: + - state: oliveoil + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: @@ -229,8 +274,17 @@ name: mayonnaise description: Bottle of mayonnaise. components: - - type: Sprite - state: mayo + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "mayo_open"} # open + False: {state: "mayo"} # closed + - type: Sprite + layers: + - state: mayo + map: ["enum.OpenableVisuals.Layer"] - type: SolutionContainerManager solutions: food: diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png new file mode 100644 index 0000000000..411d9e9ede Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png new file mode 100644 index 0000000000..93ad77d556 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png new file mode 100644 index 0000000000..cfe6bb408e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index e076f72f17..9d16a6bcd6 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill 2024. Cheese wedge inhand by Orsoniks.", + "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill 2024. Cheese wedge inhand by Orsoniks. Opened variants of olive oil, mayo and cornmeal, flour, rice and sugar bags by korczoczek, based on the unopened sprites", "size": { "x": 32, "y": 32 @@ -42,6 +42,9 @@ { "name": "cornmeal-big" }, + { + "name": "cornmeal-big_open" + }, { "name": "cornmealdough" }, @@ -84,21 +87,33 @@ { "name": "flour-big" }, + { + "name": "flour-big_open" + }, { "name": "flour-small" }, { "name": "mayo" }, + { + "name": "mayo_open" + }, { "name": "oliveoil" }, + { + "name": "oliveoil_open" + }, { "name": "pizzabread" }, { "name": "rice-big" }, + { + "name": "rice-big_open" + }, { "name": "rice-small" }, @@ -114,6 +129,9 @@ { "name": "sugar-big" }, + { + "name": "sugar-big_open" + }, { "name": "sugar-small" }, diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png new file mode 100644 index 0000000000..d833c0bc85 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png index 7a89c3361b..7b6e1b942b 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png new file mode 100644 index 0000000000..fb3994f981 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png index fc467656be..fe544e3a1f 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png new file mode 100644 index 0000000000..a05391340c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png differ