From 106a5078debb1a76c508010113f1263411f1f61b Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Sat, 21 Aug 2021 17:35:24 -0700
Subject: [PATCH] Fixes chocolate/energy bar (#4503)

---
 .../VendingMachines/Inventories/discount.yml  |   2 +-
 .../Objects/Consumable/Food/snacks.yml        |  50 ++++++++++++++----
 .../Food/snacks.rsi/energybar-open.png        | Bin 0 -> 454 bytes
 .../Consumable/Food/snacks.rsi/meta.json      |   3 ++
 4 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/energybar-open.png

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 0000000000000000000000000000000000000000..c705ad8c7615155fac24940407444ae2b40221a1
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004vNkl<ZScUDA
zy-or_5Xb)~AGt(8;7(Ws6C<Ia5lrlS04pEBNALlB0ehdo*jm_WgBB*X7KQ|*@FM{Q
z*&J{Xf(odt**&C$E$rA|akDo!H#7g4J17(ig+ej+XtD#S6c1Q`jX*C`)cn8(@uK-S
z1otI8HmYA?kaq$XqbP)Iq&sOWMfYarUyv!@qetv@m5M@!NrdmalZKh{PR@c+4qC_t
zqr=I2|Iz>_h8?hWSg11$f=(kpdB)H29zgvW5u*_=+`*DmUbjpTS5<h)!9B<z>?6*o
zO|G24t@8+qAC^a}ML_fnB7Fi1AS$lYk($86Z5fS97s2HW&aX~{;>*)RVJ*ER*3xM?
ztKr{3{pJ{T<V4I&aWV~Dob59jx`R>efwgOhCbO_?3(o;yy;6e~iVOc>D+^DtiP(yX
z`kQ07cdw_`kXk{4bkV>60CeY`7mtJ^0Jq7k;{%{SSzw<vSoR1mT_&^S3R0=fiHhjB
w;2*phu9g#6^oeP3J8o3^H&-YWia7<qFPm7I3J({VrT_o{07*qoM6N<$f-@t-K>z>%

literal 0
HcmV?d00001

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"
     },