From: mubururu_ <139181059+muburu@users.noreply.github.com>
Date: Tue, 27 May 2025 23:47:58 +0000 (-0500)
Subject: inhands for CAKE + sprite fixes (#37819)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7c9a031f993601f01dd58957e057b67f1ee9b853;p=space-station-14.git

inhands for CAKE + sprite fixes (#37819)

caek
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index d33eabed37..eb6b71212a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -85,6 +85,16 @@
     tags:
     - Cake
     - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: blue
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: blue
 
 - type: entity
   name: blueberry slice
@@ -102,6 +112,16 @@
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: blue
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: blue
 
 # Cake
 
@@ -124,6 +144,8 @@
           Quantity: 20
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Item
+    heldPrefix: plain
 
 # Added in type lines above
 
@@ -143,6 +165,8 @@
           Quantity: 4
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Item
+    heldPrefix: plain-slice
 # Tastes like sweetness, cake.
 
 - type: entity
@@ -170,6 +194,18 @@
     tags:
     - Cake
     - Vegetable
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+        color: "#f8e0af"
+      - state: alpha-filling-inhand-left
+        color: "#ffbd2f"
+      right:
+      - state: plain-inhand-right
+        color: "#f8e0af"
+      - state: alpha-filling-inhand-right
+        color: "#ffbd2f"
 
 - type: entity
   name: slice of carrot cake
@@ -195,6 +231,18 @@
     - Cake
     - Vegetable
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+        color: "#f8e0af"
+      - state: alpha-slice-filling-inhand-left
+        color: "#ffbd2f"
+      right:
+      - state: plain-slice-inhand-right
+        color: "#f8e0af"
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffbd2f"
 
 # Tastes like sweetness, cake, carrot.
 
@@ -212,6 +260,18 @@
     tags:
     - Cake
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#ff5b7a"
+      - state: alpha-filling-inhand-left
+        color: "#ff5b7a"
+      right:
+      - state: alpha-inhand-right
+        color: "#ff5b7a"
+      - state: alpha-filling-inhand-right
+        color: "#ff5b7a"
 
 - type: entity
   name: slice of brain cake
@@ -226,6 +286,18 @@
     - Cake
     - Meat
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#ff5b7a"
+      - state: alpha-slice-filling-inhand-left
+        color: "#ff5b7a"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#ff5b7a"
+      - state: alpha-slice-filling-inhand-right
+        color: "#ff5b7a"
 # Tastes like sweetness, cake, brains.
 
 - type: entity
@@ -238,6 +310,16 @@
     state: cheese
   - type: SliceableFood
     slice: FoodCakeCheeseSlice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ffffff"
 
 - type: entity
   name: slice of cheese cake
@@ -247,6 +329,16 @@
   components:
   - type: Sprite
     state: cheese-slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffffff"
 # Tastes like sweetness, cream cheese.
 
 - type: entity
@@ -256,13 +348,26 @@
   description: A cake with added orange.
   components:
   - type: Sprite
-    state: orange
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#ff9900"
   - type: SliceableFood
     slice: FoodCakeOrangeSlice
   - type: Tag
     tags:
     - Cake
     - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ff9900"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ff9900"
 
 - type: entity
   name: slice of orange cake
@@ -270,12 +375,25 @@
   id: FoodCakeOrangeSlice
   components:
   - type: Sprite
-    state: orange-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#ff9900"
   - type: Tag
     tags:
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ff9900"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ff9900"
 # Tastes like sweetness, cake, oranges.
 
 - type: entity
@@ -285,13 +403,26 @@
   description: A cake with added lime.
   components:
   - type: Sprite
-    state: lime
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#00ff00"
   - type: SliceableFood
     slice: FoodCakeLimeSlice
   - type: Tag
     tags:
     - Cake
     - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#00ff00"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#00ff00"
 
 - type: entity
   name: slice of lime cake
@@ -299,12 +430,25 @@
   id: FoodCakeLimeSlice
   components:
   - type: Sprite
-    state: lime-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#00ff00"
   - type: Tag
     tags:
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#00ff00"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#00ff00"
 # Tastes like sweetness, cake, limes.
 
 - type: entity
@@ -314,13 +458,26 @@
   description: A cake with added lemon.
   components:
   - type: Sprite
-    state: lemon
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#ffff00"
   - type: SliceableFood
     slice: FoodCakeLemonSlice
   - type: Tag
     tags:
     - Cake
     - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffff00"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ffff00"
 
 - type: entity
   name: slice of lemon cake
@@ -328,12 +485,25 @@
   id: FoodCakeLemonSlice
   components:
   - type: Sprite
-    state: lemon-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#ffff00"
   - type: Tag
     tags:
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ffff00"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffff00"
 # Tastes like sweetness, cake, lemons.
 
 - type: entity
@@ -365,6 +535,8 @@
     tags:
     - Cake
     - Fruit
+  - type: Item
+    heldPrefix: lemoon
 
 - type: entity
   name: shard of lemoon cake
@@ -394,6 +566,18 @@
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#fffead"
+      - state: alpha-slice-filling-inhand-left
+        color: "#fffead"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#fffead"
+      - state: alpha-slice-filling-inhand-right
+        color: "#fffead"
 
 - type: entity
   name: chocolate cake
@@ -402,7 +586,9 @@
   description: A cake with added chocolate.
   components:
   - type: Sprite
-    state: chocolate
+    layers:
+    - state: alpha
+      color: "#ba672e"
   - type: SliceableFood
     slice: FoodCakeChocolateSlice
   - type: SolutionContainerManager
@@ -416,6 +602,14 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#ba672e"
+      right:
+      - state: alpha-inhand-right
+        color: "#ba672e"
 
 - type: entity
   name: slice of chocolate cake
@@ -423,7 +617,9 @@
   id: FoodCakeChocolateSlice
   components:
   - type: Sprite
-    state: chocolate-slice
+    layers:
+    - state: alpha-slice
+      color: "#ba672e"
   - type: SolutionContainerManager
     solutions:
       food:
@@ -435,6 +631,14 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 2
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#ba672e"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#ba672e"
 # Tastes like sweetness, cake, chocolate.
 
 - type: entity
@@ -444,13 +648,26 @@
   description: A cake centred with apple.
   components:
   - type: Sprite
-    state: apple
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#ff4300"
   - type: SliceableFood
     slice: FoodCakeAppleSlice
   - type: Tag
     tags:
     - Cake
     - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ff4300"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ff4300"
 
 - type: entity
   name: slice of apple cake
@@ -459,12 +676,26 @@
   description: A slice of heavenly cake.
   components:
   - type: Sprite
-    state: apple-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#ff4300"
   - type: Tag
     tags:
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ff4300"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ff4300"
+
 # Tastes like sweetness, cake, slime.
 
 - type: entity
@@ -481,6 +712,18 @@
     tags:
     - Cake
     - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#00ffff"
+      - state: alpha-filling-inhand-left
+        color: "#00ffff"
+      right:
+      - state: alpha-inhand-right
+        color: "#00ffff"
+      - state: alpha-filling-inhand-right
+        color: "#00ffff"
 
 - type: entity
   name: slice of slime cake
@@ -495,6 +738,18 @@
     - Cake
     - Meat
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#00ffff"
+      - state: alpha-slice-filling-inhand-left
+        color: "#00ffff"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#00ffff"
+      - state: alpha-slice-filling-inhand-right
+        color: "#00ffff"
 # Tastes like sweetness, cake, slime.
 
 - type: entity
@@ -520,6 +775,16 @@
     tags:
     - Cake
     - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ffffff"
 
 - type: entity
   name: slice of pumpkin-spice cake
@@ -543,6 +808,16 @@
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffffff"
 # Tastes like sweetness, cake, pumpkin.
 
 - type: entity
@@ -559,6 +834,14 @@
     tags:
     - Cake
     - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#ab5012"
+      right:
+      - state: alpha-inhand-right
+        color: "#ab5012"
 
 - type: entity
   name: slice of christmas cake
@@ -572,6 +855,14 @@
     - Cake
     - Fruit
     - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#ab5012"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#ab5012"
 # Tastes like sweetness, cake, christmas.
 
 - type: entity
@@ -584,6 +875,8 @@
     state: birthday
   - type: SliceableFood
     slice: FoodCakeBirthdaySlice
+  - type: Item
+    heldPrefix: birthday
 
 - type: entity
   name: slice of birthday cake
@@ -593,6 +886,8 @@
   components:
   - type: Sprite
     state: birthday-slice
+  - type: Item
+    heldPrefix: birthday-slice
 # Tastes like sweetness, cake, christmas.
 
 - type: entity
@@ -616,6 +911,8 @@
           Quantity: 5
         - ReagentId: Sugar
           Quantity: 15
+  - type: Item
+    heldPrefix: vanilla
 
 - type: entity
   name: slice of vanilla cake
@@ -636,6 +933,14 @@
           Quantity: 2
         - ReagentId: Sugar
           Quantity: 5
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
 # Tastes like sweetness, cake, vanilla.
 
 - type: entity
@@ -659,6 +964,8 @@
           Quantity: 5
         - ReagentId: Sugar
           Quantity: 15
+  - type: Item
+    heldPrefix: clown
 
 - type: entity
   name: slice of clown cake
@@ -679,6 +986,8 @@
           Quantity: 1
         - ReagentId: Sugar
           Quantity: 5
+  - type: Item
+    heldPrefix: clown-slice
 # Tastes like sweetness, cake, clown.
 
 - type: entity
@@ -702,6 +1011,8 @@
           Quantity: 5
         - ReagentId: PolypyryliumOligomers
           Quantity: 15
+  - type: Item
+    heldPrefix: trumpet
 
 - type: entity
   name: slice of spaceman's cake
@@ -722,6 +1033,8 @@
           Quantity: 1
         - ReagentId: PolypyryliumOligomers
           Quantity: 3
+  - type: Item
+    heldPrefix: trumpet-slice
 # Tastes like sweetness, cake, jam.
 
 - type: entity
@@ -839,6 +1152,7 @@
     transferAmount: 12
   - type: Item
     size: Normal
+    heldPrefix: suppermatter
   - type: PointLight
     color: "#FFFF00"
     radius: 2
@@ -874,3 +1188,5 @@
     entries:
       Taco: Suppermatter
       Burger: SuppermatterBurger
+  - type: Item
+    heldPrefix: suppermatter-shard
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling-inhand-left.png
new file mode 100644
index 0000000000..72c39ef959
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling-inhand-right.png
new file mode 100644
index 0000000000..9bafe43838
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-filling-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-inhand-left.png
new file mode 100644
index 0000000000..59e36696cb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-inhand-right.png
new file mode 100644
index 0000000000..e7d6cf8485
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling-inhand-left.png
new file mode 100644
index 0000000000..99186ec84d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling-inhand-right.png
new file mode 100644
index 0000000000..8b741de620
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-filling-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-inhand-left.png
new file mode 100644
index 0000000000..96c71e781f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-inhand-right.png
new file mode 100644
index 0000000000..b1733f1558
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/alpha-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple-slice.png
deleted file mode 100644
index 04f13a1c9f..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple-slice.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple.png
deleted file mode 100644
index 39790cfcab..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/apple.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-inhand-left.png
new file mode 100644
index 0000000000..45616f16f3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-inhand-right.png
new file mode 100644
index 0000000000..9dbc87d8ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice-inhand-left.png
new file mode 100644
index 0000000000..e1ecdfc2ba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice-inhand-right.png
new file mode 100644
index 0000000000..e773cf1d6f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/birthday-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice.png
deleted file mode 100644
index fe49fe489c..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate.png
deleted file mode 100644
index 29886cf821..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-inhand-left.png
new file mode 100644
index 0000000000..3d36955786
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-inhand-right.png
new file mode 100644
index 0000000000..b50c4ca3aa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice-inhand-left.png
new file mode 100644
index 0000000000..9935c3ee36
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice-inhand-right.png
new file mode 100644
index 0000000000..d136789db3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/clown-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon-slice.png
deleted file mode 100644
index b58d461062..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon-slice.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon.png
deleted file mode 100644
index 446b34451f..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-inhand-left.png
new file mode 100644
index 0000000000..449b708f79
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-inhand-right.png
new file mode 100644
index 0000000000..bfa5d946cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lemoon-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime-slice.png
deleted file mode 100644
index 1b9b6b162f..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime-slice.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime.png
deleted file mode 100644
index 41d70cdab3..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/lime.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index 43a54b0fe5..f54a9cfcc9 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
@@ -1 +1,313 @@
-{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", "size": {"x": 32, "y": 32}, "states": [{"name": "alpha"}, {"name": "alpha-filling"}, {"name": "alpha-slice"}, {"name": "alpha-slice-filling"}, {"name": "apple"}, {"name": "apple-slice"}, {"name": "birthday"}, {"name": "birthday-slice"}, {"name": "brain"}, {"name": "brain-large"}, {"name": "brain-slice"}, {"name": "carrot"}, {"name": "carrot-slice"}, {"name": "cheese"}, {"name": "cheese-slice"}, {"name": "chocolate"}, {"name": "chocolate-slice"}, {"name": "lemon"}, {"name": "lemon-slice"}, {"name": "lime"}, {"name": "lime-slice"}, {"name": "orange"}, {"name": "orange-slice"}, {"name": "plain"}, {"name": "plain-slice"}, {"name": "clown"}, {"name": "clown-slice"}, {"name": "plate"}, {"name": "plate-small"}, {"name": "plate-plastic"}, {"name": "plate-small-plastic"}, {"name": "plate-slice-shading"}, {"name": "pumpkinspice"}, {"name": "pumpkinspice-slice"}, {"name": "slime"}, {"name": "slime-slice"}, {"name": "christmas"}, {"name": "christmas-slice"}, {"name": "vanilla"}, {"name": "vanilla-slice"}, {"name": "trumpet"}, {"name": "trumpet-slice"}, {"name": "suppermatter", "directions": 1, "delays": [[1.0]]}, {"name": "suppermatter-shard", "directions": 1, "delays": [[1.0]]},{"name": "lemoon","delays": [ [ 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15 ] ]},{"name": "lemoon-slice"}]}
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "alpha"
+        },
+        {
+            "name": "alpha-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "alpha-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "alpha-filling"
+        },
+        {
+            "name": "alpha-filling-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "alpha-filling-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "alpha-slice"
+        },
+        {
+            "name": "alpha-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "alpha-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "alpha-slice-filling"
+        },
+        {
+            "name": "alpha-slice-filling-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "alpha-slice-filling-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "birthday"
+        },
+        {
+            "name": "birthday-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "birthday-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "birthday-slice"
+        },
+        {
+            "name": "birthday-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "birthday-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "brain"
+        },
+        {
+            "name": "brain-large"
+        },
+        {
+            "name": "brain-slice"
+        },
+        {
+            "name": "carrot"
+        },
+        {
+            "name": "carrot-slice"
+        },
+        {
+            "name": "cheese"
+        },
+        {
+            "name": "cheese-slice"
+        },
+        {
+            "name": "plain"
+        },
+        {
+            "name": "plain-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plain-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plain-slice"
+        },
+        {
+            "name": "plain-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plain-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "clown-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "clown-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "clown-slice"
+        },
+        {
+            "name": "clown-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "clown-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plate"
+        },
+        {
+            "name": "plate-small"
+        },
+        {
+            "name": "plate-plastic"
+        },
+        {
+            "name": "plate-small-plastic"
+        },
+        {
+            "name": "plate-slice-shading"
+        },
+        {
+            "name": "pumpkinspice"
+        },
+        {
+            "name": "pumpkinspice-slice"
+        },
+        {
+            "name": "slime"
+        },
+        {
+            "name": "slime-slice"
+        },
+        {
+            "name": "christmas"
+        },
+        {
+            "name": "christmas-slice"
+        },
+        {
+            "name": "vanilla"
+        },
+        {
+            "name": "vanilla-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "vanilla-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "vanilla-slice"
+        },
+        {
+            "name": "trumpet"
+        },
+        {
+            "name": "trumpet-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "trumpet-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "trumpet-slice"
+        },
+        {
+            "name": "trumpet-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "trumpet-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "suppermatter"
+        },
+        {
+            "name": "suppermatter-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "suppermatter-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "suppermatter-shard"
+        },
+        {
+            "name": "suppermatter-shard-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "suppermatter-shard-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "lemoon",
+            "delays": [
+                [
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15,
+                    0.15
+
+                ]
+            ]
+        },
+        {
+            "name": "lemoon-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ],
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ],
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ],
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ]
+            ]
+        },
+        {
+            "name": "lemoon-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ],
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ],
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ],
+                [
+                    0.20,
+                    0.20,
+                    0.20,
+                    0.20
+                ]
+            ]
+        },
+        {
+            "name": "lemoon-slice"
+
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange-slice.png
deleted file mode 100644
index 2305db6ff9..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange-slice.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange.png
deleted file mode 100644
index f7c2b1c78b..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/orange.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-inhand-left.png
new file mode 100644
index 0000000000..fc16ad2849
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-inhand-right.png
new file mode 100644
index 0000000000..088ccc5d57
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice-inhand-left.png
new file mode 100644
index 0000000000..2e87bafb78
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice-inhand-right.png
new file mode 100644
index 0000000000..066bb5a7ff
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plain-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-inhand-left.png
new file mode 100644
index 0000000000..9647ff8298
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-inhand-right.png
new file mode 100644
index 0000000000..cd6b7f94f3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard-inhand-left.png
new file mode 100644
index 0000000000..4fc7e2b067
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard-inhand-right.png
new file mode 100644
index 0000000000..b2aab01c7a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/suppermatter-shard-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-inhand-left.png
new file mode 100644
index 0000000000..1e1b31f246
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-inhand-right.png
new file mode 100644
index 0000000000..b2faf20fa9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice-inhand-left.png
new file mode 100644
index 0000000000..2630a3b6a1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice-inhand-right.png
new file mode 100644
index 0000000000..85bdb288ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/trumpet-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-inhand-left.png
new file mode 100644
index 0000000000..a94a4b1b59
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-inhand-right.png
new file mode 100644
index 0000000000..7f6566615b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-slice.png
index a0fd4ec740..b1877707d8 100644
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-slice.png and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla.png
index 23ea9557ba..b3618871df 100644
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla.png and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/vanilla.png differ