]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Pancakes Fix (#31123)
authorGoldminermac <112822310+Goldminermac@users.noreply.github.com>
Mon, 19 Aug 2024 02:42:58 +0000 (22:42 -0400)
committerGitHub <noreply@github.com>
Mon, 19 Aug 2024 02:42:58 +0000 (20:42 -0600)
commit864956c66b671cbfe3a5bbae346d2b5a07b70a2b
tree2b184d06c618360e5302cf1f62a83f2f50b08130
parent0754a0fdaf81dd9b687195bd5122ae02d8436019
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
20 files changed:
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
Resources/Prototypes/Stacks/consumable_stacks.yml
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb6.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb7.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb8.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb9.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc6.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc7.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc8.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc9.png [new file with mode: 0644]