diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
index b746727ae9..0c1aedf420 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
@@ -7,4 +7,4 @@
     FoodSnackChips: 3
     FoodSnackBoritos: 2
     FoodSnackPopcorn: 1
-    FoodSnackEnergybar: 2
+    FoodSnackEnergy: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 1b2606d3ba..47c990e5ce 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -70,26 +70,56 @@
   description: Tastes like cardboard.
   components:
   - type: Sprite
-    layers:
-      - state: chocolatebar-open
-      - state: chocolatebar
+    state: chocolatebar
   - type: Item
-    color: red
-  - type: Food
-    trash: FoodPacketChocolateTrash
+    HeldPrefix: chocolatebar
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodPacketChocolateTrash
+      - id: FoodSnackChocolateBar
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
+- type: entity
+  name: chocolate bar
+  parent: FoodSnackBase
+  id: FoodSnackChocolateBar
+  description: Tastes like cardboard.
+  abstract: true
+  components:
+  - type: Sprite
+    state: chocolatebar-open
+  - type: Item
+    color: brown
 
 - type: entity
   name: energy bar
   parent: FoodSnackBase
-  id: FoodSnackEnergybar
+  id: FoodSnackEnergy
   description: An energy bar with a lot of punch.
   components:
   - type: Sprite
     state: energybar
   - type: Item
-    color: green
-  - type: Food
-    trash: FoodPacketEnergyTrash
+    color: lime
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodPacketEnergyTrash
+      - id: FoodSnackEnergyBar
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+
+- type: entity
+  name: energy bar
+  parent: FoodSnackBase
+  id: FoodSnackEnergyBar
+  description: An energy bar with a lot of punch.
+  abstract: true
+  components:
+  - type: Sprite
+    state: energybar-open
+  - type: Item
+    color: yellow
 
 - type: entity
   name: popcorn
diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar-open.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar-open.png
new file mode 100644
index 0000000000..c705ad8c76
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar-open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
index 7e4a9dadbb..32becb77d6 100644
--- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
@@ -54,6 +54,9 @@
     {
       "name": "energybar"
     },
+    {
+      "name": "energybar-open"
+    },
     {
       "name": "energybar-trash"
     },