From 0a90f145bc7d919b783f5cd0d1085e568becbfc0 Mon Sep 17 00:00:00 2001
From: EmoGarbage404 <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 11 Jun 2022 21:06:51 -0400
Subject: [PATCH] Fix wrapped foods (chocolate bars, brownies, nutribrick)
 (#8735)

* wrappables fix

* Update snacks.yml

* Update snacks.yml
---
 .../Objects/Consumable/Food/snacks.yml        | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 4ae08470c6..58ae892d56 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -66,29 +66,23 @@
 
 - type: entity
   name: chocolate bar
-  parent: FoodSnackBase
+  parent: BaseItem
   id: FoodSnackChocolate
   description: Tastes like cardboard.
   components:
   - type: Sprite
+    sprite: Objects/Consumable/Food/snacks.rsi
     state: chocolatebar
+    netsync: false
   - type: Item
     HeldPrefix: chocolatebar
+    size: 3
   - type: SpawnItemsOnUse
     items:
       - id: FoodPacketChocolateTrash
       - id: FoodSnackChocolateBar
     sound:
       path: /Audio/Effects/unwrap.ogg
-  - type: SolutionContainerManager #seems like you can eat it unwrapped
-    solutions:
-      food:
-        maxVol: 30
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-        - ReagentId: Theobromine
-          Quantity: 3
 
 - type: entity
   name: chocolate bar
@@ -258,21 +252,35 @@
     trash: FoodCookieFortune
 
 - type: entity
-  name: nutribrick
-  parent: FoodSnackBase
   id: FoodSnackNutribrick
+  parent: BaseItem
+  name: nutribrick
   description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit.
   components:
   - type: Item
     size: 10
   - type: Sprite
+    sprite: Objects/Consumable/Food/snacks.rsi
     state: nutribrick
+    netsync: false
   - type: SpawnItemsOnUse
     items:
       - id: FoodPacketMRETrash
       - id: FoodSnackNutribrickOpen
     sound:
       path: /Audio/Effects/unwrap.ogg
+
+- type: entity
+  id: FoodSnackNutribrickOpen
+  parent: FoodSnackBase
+  name: nutribrick
+  description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit.
+  components:
+  - type: Item
+    size: 10
+  - type: Sprite
+    state: nutribrick-open
+  - type: Food
   - type: SolutionContainerManager
     solutions:
       food:
@@ -282,30 +290,32 @@
           Quantity: 25
 
 - type: entity
-  name: nutribrick
-  parent: FoodSnackNutribrick
-  id: FoodSnackNutribrickOpen
-  components:
-  - type: Sprite
-    state: nutribrick-open
-  - type: Food
-
-- type: entity
-  name: brownie
-  parent: FoodSnackBase
   id: FoodSnackMREBrownie
+  parent: BaseItem  
+  name: brownie
   description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit.
   components:
-  - type: Item
-    size: 10
   - type: Sprite
+    sprite: Objects/Consumable/Food/snacks.rsi
     state: mre-brownie
+    netsync: false
   - type: SpawnItemsOnUse
     items:
       - id: FoodPacketMRETrash
       - id: FoodSnackMREBrownieOpen
     sound:
       path: /Audio/Effects/unwrap.ogg
+  
+
+- type: entity
+  id: FoodSnackMREBrownieOpen
+  parent: FoodSnackBase
+  name: brownie
+  description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit.
+  components:
+  - type: Sprite
+    state: mre-brownie-open
+  - type: Food
   - type: SolutionContainerManager
     solutions:
       food:
@@ -316,15 +326,6 @@
         - ReagentId: Theobromine
           Quantity: 3
 
-- type: entity
-  name: brownie
-  parent: FoodSnackMREBrownie
-  id: FoodSnackMREBrownieOpen
-  components:
-  - type: Sprite
-    state: mre-brownie-open
-  - type: Food
-
 # Trash
 
 - type: entity