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 42a71416843126551aca85e3d480085c74d5ee80..b2cdee82802e6b2d0576891482131fc88719630c 100644 (file)
--- 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 e2abbcbf0896c451fb87ccda0e505e2a10e4c3ec..971d3800b4e8200d68f29b8574b4be43f5bf07c5 100644 (file)
--- 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 56d8c81f1001ee241857c7ceb034f2bd4c1537b9..c6c435a5c9f8b5c3cb08fe350cd90e84dd0ec95d 100644 (file)
--- 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 d1a7d1debc592c75be884c561d79ef46a98e16d9..c743317223a6fb6f8cecf8aa6c75e65fa208d92a 100644 (file)
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 97d780eb37635185d96ccaf9d742675174dece1e..2068c8ba8803b94bdbb58c8e8ed440d4f77dfe57 100644 (file)
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 c5af76d8864540b5b20ca6073c9bdb1250cb1ad4..721b7c9dba3eff91e23c78f60f5d21819ca47473 100644 (file)
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 (file)
index 0000000..415334c
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 (file)
index 0000000..4865c1a
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 (file)
index 0000000..83727a7
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 (file)
index 0000000..dc30520
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 (file)
index 0000000..b4ceb82
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 (file)
index 0000000..37fc1a7
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 ef414720a67abdc9cdff10208bdf8c58b99179b6..6ecfe3d6070429a74f3b6eb6032dab2cdff8b301 100644 (file)
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 a91cbea80f608675d71e052de95d17c9b2d74f89..593a56c264aea40ef98521918b5ea8b9d4f3ee8b 100644 (file)
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 (file)
index 0000000..c05e2db
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 (file)
index 0000000..10302ea
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 (file)
index 0000000..c6ba2cd
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 (file)
index 0000000..698c7aa
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 (file)
index 0000000..d64cd01
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 (file)
index 0000000..28dd027
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/pancakescc9.png differ