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

* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
index 98174b7a03fdb64a32cf96252478454825bb900d..cf7b2a5e86944042112db791c221bf0766288545 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
@@ -14,7 +14,6 @@
         - FoodBoxDonkpocketSpicy
         - FoodBoxDonkpocketTeriyaki
         - FoodBoxDonkpocketPizza
-        - FoodBoxDonkpocketGondola
         - FoodBoxDonkpocketBerry
         - FoodBoxDonkpocketHonk
         - FoodBoxDonkpocketDink

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index b0be8011aa429302df34755401befaddbf697d3c..2e0340530513704f33a55099d520d408b0566412 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -256,7 +256,7 @@
   name: berry-pocket
   parent: FoodDonkpocketBase
   id: FoodDonkpocketBerry
-  description: A relentlessly sweet donk-pocket first created for use in Operation Iraqi Freedom.
+  description: A relentlessly sweet donk-pocket. Made with 100% artificial flavoring.
   components:
   - type: FlavorProfile
     flavors:
@@ -292,43 +292,6 @@
         - 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: dink-pocket
   parent: FoodDonkpocketBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 6b0e43fd1044af35e8dbfaae55e11e605e25fb1f..bec5f3ee08c16d373be3d98aa14665051ac9a4a9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -387,20 +387,6 @@
     - 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: FoodBoxDonkpocketBerry

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 73d264f7380c3e390571209172147d9f9d858c40..66065d6958700ae9bf3c1d053fae76f7fc2f2d42 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -260,8 +260,6 @@
         orGroup: GiftPool
       - id: FoodBoxDonkpocketPizza
         orGroup: GiftPool
-      - id: FoodBoxDonkpocketGondola
-        orGroup: GiftPool
       - id: FoodBoxDonkpocketBerry
         orGroup: GiftPool
       - id: FoodBoxDonkpocketHonk

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 0b66658d163f8d50b68c4907bd7162ac46611874..5a44dd2c23185665fddd6bed1fc8df8dc89bb9df 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1480,14 +1480,6 @@
   solids:
     FoodDonkpocketBerry: 1
 
-- type: microwaveMealRecipe
-  id: RecipeDonkpocketGondola
-  name: warm gondola-pocket recipe
-  result: FoodDonkpocketGondolaWarm
-  time: 5
-  solids:
-    FoodDonkpocketGondola: 1
-
 - type: microwaveMealRecipe
   id: RecipeHotChili
   name: hot chili recipe

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png
deleted file mode 100644 (file)
index 5bda538..0000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png
deleted file mode 100644 (file)
index 700805e..0000000
Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
index 8b64f3577a78f2a13b48a0402e70ec126c95d251..bf4050e45ecfdd66d15e27cb0b040c19e743de8d 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json
@@ -22,12 +22,6 @@
     {
       "name": "dank"
     },
-    {
-      "name": "gondola"
-    },
-    {
-      "name": "gondola-box"
-    },
     {
       "name": "pizza"
     },

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 557a1a767b297ec7b8f94b615f5343993556f10a..4d5a4cce6e220b28ea4fc7c00ecd8c1baca61b9d 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -171,6 +171,9 @@ ClothingBackpackSecurityFilledDetective: ClothingBackpackFilledDetective
 ClothingBackpackDuffelSecurityFilledDetective: ClothingBackpackDuffelFilledDetective
 ClothingBackpackSatchelSecurityFilledDetective: ClothingBackpackSatchelFilledDetective
 
+# 2024-01-28
+FoodBoxDonkpocketGondola: FoodBoxDonkpocketPizza
+
 # 2024-01-31
 HandheldCrewMonitorEmpty: null
 HandheldCrewMonitor: null