Pancakes Fix (#31123)
* Edited blueberry pancake textures to seem more blueberry-stained * Added new blueberry pancake sprites to allow stacking up to 9 * Added more sprites for chocolate pancakes so they can stack up to 9 * Fixed up the blueberry pancake sprites to be more consistent * Updated the stack components of blueberry and chocolate pancakes in the yml prototype file. * Updates the stack size in the consumable stacks yaml file. * Added the new pancake sprites to the sprite meta json file. * Removed an unnecessary space from the baked food YAML file * Updated branch and fully resolved merge conflict * Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive * Diversified the textures some more for good measure. * Fixed some missing rims around the pancakes because I'm bored
@@ -1,131 +1,168 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "cannoli"
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
{
|
||||
"name": "dumplings"
|
||||
},
|
||||
{
|
||||
"name": "honeybar"
|
||||
},
|
||||
{
|
||||
"name": "onionrings"
|
||||
},
|
||||
{
|
||||
"name": "pretzel"
|
||||
},
|
||||
{
|
||||
"name": "muffin-bluecherry"
|
||||
},
|
||||
{
|
||||
"name": "muffin-cherry"
|
||||
},
|
||||
{
|
||||
"name": "bun-honey"
|
||||
},
|
||||
{
|
||||
"name": "bun-hotcross"
|
||||
},
|
||||
{
|
||||
"name": "bun-meat"
|
||||
},
|
||||
{
|
||||
"name": "muffin"
|
||||
},
|
||||
{
|
||||
"name": "muffin-berry"
|
||||
},
|
||||
{
|
||||
"name": "COOKIE!!!"
|
||||
},
|
||||
{
|
||||
"name": "cookie-oatmeal"
|
||||
},
|
||||
{
|
||||
"name": "cookie-raisin"
|
||||
},
|
||||
{
|
||||
"name": "cookie-sugar"
|
||||
},
|
||||
{
|
||||
"name": "pancakes1"
|
||||
},
|
||||
{
|
||||
"name": "pancakes2"
|
||||
},
|
||||
{
|
||||
"name": "pancakes3"
|
||||
},
|
||||
{
|
||||
"name": "pancakes4"
|
||||
},
|
||||
{
|
||||
"name": "pancakes5"
|
||||
},
|
||||
{
|
||||
"name": "pancakes6"
|
||||
},
|
||||
{
|
||||
"name": "pancakes7"
|
||||
},
|
||||
{
|
||||
"name": "pancakes8"
|
||||
},
|
||||
{
|
||||
"name": "pancakes9"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb1"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb2"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb3"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc1"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc2"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc3"
|
||||
},
|
||||
{
|
||||
"name": "pigblanket"
|
||||
},
|
||||
{
|
||||
"name": "plate-small"
|
||||
},
|
||||
{
|
||||
"name": "waffles"
|
||||
},
|
||||
{
|
||||
"name": "waffles-roffle"
|
||||
},
|
||||
{
|
||||
"name": "waffles-soy"
|
||||
},
|
||||
{
|
||||
"name": "waffles-soylent"
|
||||
},
|
||||
{
|
||||
"name": "tray"
|
||||
},
|
||||
{
|
||||
"name": "chevrechaud"
|
||||
},
|
||||
{
|
||||
"name": "croissant"
|
||||
}
|
||||
]
|
||||
"states": [
|
||||
{
|
||||
"name": "cannoli"
|
||||
},
|
||||
{
|
||||
"name": "dumplings"
|
||||
},
|
||||
{
|
||||
"name": "honeybar"
|
||||
},
|
||||
{
|
||||
"name": "onionrings"
|
||||
},
|
||||
{
|
||||
"name": "pretzel"
|
||||
},
|
||||
{
|
||||
"name": "muffin-bluecherry"
|
||||
},
|
||||
{
|
||||
"name": "muffin-cherry"
|
||||
},
|
||||
{
|
||||
"name": "bun-honey"
|
||||
},
|
||||
{
|
||||
"name": "bun-hotcross"
|
||||
},
|
||||
{
|
||||
"name": "bun-meat"
|
||||
},
|
||||
{
|
||||
"name": "muffin"
|
||||
},
|
||||
{
|
||||
"name": "muffin-berry"
|
||||
},
|
||||
{
|
||||
"name": "COOKIE!!!"
|
||||
},
|
||||
{
|
||||
"name": "cookie-oatmeal"
|
||||
},
|
||||
{
|
||||
"name": "cookie-raisin"
|
||||
},
|
||||
{
|
||||
"name": "cookie-sugar"
|
||||
},
|
||||
{
|
||||
"name": "pancakes1"
|
||||
},
|
||||
{
|
||||
"name": "pancakes2"
|
||||
},
|
||||
{
|
||||
"name": "pancakes3"
|
||||
},
|
||||
{
|
||||
"name": "pancakes4"
|
||||
},
|
||||
{
|
||||
"name": "pancakes5"
|
||||
},
|
||||
{
|
||||
"name": "pancakes6"
|
||||
},
|
||||
{
|
||||
"name": "pancakes7"
|
||||
},
|
||||
{
|
||||
"name": "pancakes8"
|
||||
},
|
||||
{
|
||||
"name": "pancakes9"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb1"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb2"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb3"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb4"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb5"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb6"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb7"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb8"
|
||||
},
|
||||
{
|
||||
"name": "pancakesbb9"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc1"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc2"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc3"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc4"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc5"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc6"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc7"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc8"
|
||||
},
|
||||
{
|
||||
"name": "pancakescc9"
|
||||
},
|
||||
{
|
||||
"name": "pigblanket"
|
||||
},
|
||||
{
|
||||
"name": "plate-small"
|
||||
},
|
||||
{
|
||||
"name": "waffles"
|
||||
},
|
||||
{
|
||||
"name": "waffles-roffle"
|
||||
},
|
||||
{
|
||||
"name": "waffles-soy"
|
||||
},
|
||||
{
|
||||
"name": "waffles-soylent"
|
||||
},
|
||||
{
|
||||
"name": "tray"
|
||||
},
|
||||
{
|
||||
"name": "chevrechaud"
|
||||
},
|
||||
{
|
||||
"name": "croissant"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 4.4 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 4.4 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 4.4 KiB |