Revert "Remove gondola donkpocket & change berry box description (#24655)"

This reverts commit e36844de47.

# Conflicts:
#	Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
#	Resources/Prototypes/Entities/Objects/Decoration/present.yml
#	Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
#	Resources/migration.yml

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml

@@ -14,6 +14,7 @@
         - FoodBoxDonkpocketSpicy
         - FoodBoxDonkpocketTeriyaki
         - FoodBoxDonkpocketPizza
+        - FoodBoxDonkpocketGondola
         - FoodBoxDonkpocketStonk
         - FoodBoxDonkpocketBerry
         - FoodBoxDonkpocketHonk

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml

@@ -292,6 +292,43 @@
         - ReagentId: Sugar
           Quantity: 2
 
+- type: entity
+  name: gondola-pocket
+  parent: FoodDonkpocketBase
+  id: FoodDonkpocketGondola
+  description: The choice to use real gondola meat in the recipe is controversial, to say the least.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - shocking
+      - cheap
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+  - type: Sprite
+    state: gondola
+
+- type: entity
+  name: warm gondola-pocket
+  parent: FoodDonkpocketGondola
+  id: FoodDonkpocketGondolaWarm
+  components:
+  - type: FlavorProfile
+    flavors:
+      - shocking
+      - cheap
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Omnizine
+          Quantity: 2
+
 - type: entity
   name: stonk-pocket
   parent: FoodDonkpocketBase

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

@@ -389,6 +389,20 @@
     - id: FoodDonkpocketPizza
       amount: 6
 
+- type: entity
+  parent: FoodBoxDonkpocket
+  id: FoodBoxDonkpocketGondola
+  name: box of gondola-flavoured donk-pockets
+  components:
+  - type: Sprite
+    state: gondola-box
+  - type: Item
+    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
+  - type: StorageFill
+    contents:
+    - id: FoodDonkpocketGondola
+      amount: 6
+
 - type: entity
   parent: FoodBoxDonkpocket
   id: FoodBoxDonkpocketStonk

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -192,6 +192,8 @@
         orGroup: GiftPool
       - id: ViolaInstrument
         orGroup: GiftPool
+      - id: ClothingNeckCloakTrans
+        orGroup: GiftPool
       - id: ClothingNeckCloakAdmin
         orGroup: GiftPool
       - id: ToySkeleton
@@ -268,6 +270,8 @@
         orGroup: GiftPool
       - id: FoodBoxDonkpocketCarp
         orGroup: GiftPool
+      - id: FoodBoxDonkpocketGondola
+        orGroup: GiftPool
       - id: FoodBoxDonkpocketBerry
         orGroup: GiftPool
       - id: FoodBoxDonkpocketHonk

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -1480,6 +1480,14 @@
   solids:
     FoodDonkpocketBerry: 1
 
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketGondola
+  name: warm gondola-pocket recipe
+  result: FoodDonkpocketGondolaWarm
+  time: 5
+  solids:
+    FoodDonkpocketGondola: 1
+
 - type: microwaveMealRecipe
   id: RecipeDonkpocketStonk
   name: warm stonk-pocket recipe
@@ -1496,7 +1504,6 @@
   solids:
     FoodDonkpocketCarp: 1
 
-
 - type: microwaveMealRecipe
   id: RecipeHotChili
   name: hot chili recipe

Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

@@ -22,6 +22,12 @@
     {
       "name": "dank"
     },
+    {
+      "name": "gondola"
+    },
+    {
+      "name": "gondola-box"
+    },
     {
       "name": "pizza"
     },

Resources/migration.yml

@@ -157,9 +157,6 @@ ClothingHeadHelmetVoidParamed: null
 # 2024-01-19
 DefaultStationBeaconTeslaEngine: null
 
-# 2024-01-28
-FoodBoxDonkpocketGondola: FoodBoxDonkpocketPizza
-
 # 2024-01-31
 SpyCrewMonitor: null
 SpyCrewMonitorEmpty: null