From: Goldminermac <112822310+Goldminermac@users.noreply.github.com> Date: Mon, 19 Aug 2024 02:42:58 +0000 (-0400) Subject: Pancakes Fix (#31123) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=864956c66b671cbfe3a5bbae346d2b5a07b70a2b;p=space-station-14.git 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 --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 42a7141684..b2cdee8280 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -267,6 +267,12 @@ - pancakesbb1 - pancakesbb2 - pancakesbb3 + - pancakesbb4 + - pancakesbb5 + - pancakesbb6 + - pancakesbb7 + - pancakesbb8 + - pancakesbb9 - type: Sprite state: pancakesbb1 layers: @@ -279,6 +285,24 @@ - state: pancakesbb3 map: ["pancakesbb3"] visible: false + - state: pancakesbb4 + map: ["pancakesbb4"] + visible: false + - state: pancakesbb5 + map: ["pancakesbb5"] + visible: false + - state: pancakesbb6 + map: ["pancakesbb6"] + visible: false + - state: pancakesbb7 + map: ["pancakesbb7"] + visible: false + - state: pancakesbb8 + map: ["pancakesbb8"] + visible: false + - state: pancakesbb9 + map: ["pancakesbb9"] + visible: false - type: Tag tags: - Pancake @@ -296,6 +320,12 @@ - pancakescc1 - pancakescc2 - pancakescc3 + - pancakescc4 + - pancakescc5 + - pancakescc6 + - pancakescc7 + - pancakescc8 + - pancakescc9 - type: Sprite state: pancakescc1 layers: @@ -308,6 +338,24 @@ - state: pancakescc3 map: ["pancakescc3"] visible: false + - state: pancakescc4 + map: ["pancakescc4"] + visible: false + - state: pancakescc5 + map: ["pancakescc5"] + visible: false + - state: pancakescc6 + map: ["pancakescc6"] + visible: false + - state: pancakescc7 + map: ["pancakescc7"] + visible: false + - state: pancakescc8 + map: ["pancakescc8"] + visible: false + - state: pancakescc9 + map: ["pancakescc9"] + visible: false - type: SolutionContainerManager solutions: food: @@ -626,4 +674,4 @@ - ReagentId: Butter Quantity: 2 - ReagentId: Vitamin - Quantity: 1 \ No newline at end of file + Quantity: 1 diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml index e2abbcbf08..971d3800b4 100644 --- a/Resources/Prototypes/Stacks/consumable_stacks.yml +++ b/Resources/Prototypes/Stacks/consumable_stacks.yml @@ -10,13 +10,13 @@ id: PancakeBb name: blueberry pancake spawn: FoodBakedPancakeBb - maxCount: 3 + maxCount: 9 - type: stack id: PancakeCc name: chocolate chip pancake spawn: FoodBakedPancakeCc - maxCount: 3 + maxCount: 9 # Food Containers diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json index 56d8c81f10..c6c435a5c9 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json @@ -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" - }, - { - "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" - } - ] + "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" + }, + { + "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" + } + ] } + diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png index d1a7d1debc..c743317223 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png index 97d780eb37..2068c8ba88 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png index c5af76d886..721b7c9dba 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb4.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb4.png new file mode 100644 index 0000000000..415334c3af Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb5.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb5.png new file mode 100644 index 0000000000..4865c1a950 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb6.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb6.png new file mode 100644 index 0000000000..83727a7878 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb7.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb7.png new file mode 100644 index 0000000000..dc3052034c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb7.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb8.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb8.png new file mode 100644 index 0000000000..b4ceb82f08 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb8.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb9.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb9.png new file mode 100644 index 0000000000..37fc1a7fb9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakesbb9.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png index ef414720a6..6ecfe3d607 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc2.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png index a91cbea80f..593a56c264 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc3.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc4.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc4.png new file mode 100644 index 0000000000..c05e2db726 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc4.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc5.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc5.png new file mode 100644 index 0000000000..10302ea4a1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc5.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc6.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc6.png new file mode 100644 index 0000000000..c6ba2cdc48 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc6.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc7.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc7.png new file mode 100644 index 0000000000..698c7aabf2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc7.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc8.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc8.png new file mode 100644 index 0000000000..d64cd01d0e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc8.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc9.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc9.png new file mode 100644 index 0000000000..28dd027350 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc9.png differ