From e36844de47ce0d9f5f28b11b733cd998201e1b49 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Thu, 1 Feb 2024 23:27:52 +0100 Subject: [PATCH] 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 --- .../Random/Food_Drinks/donkpocketbox.yml | 1 - .../Consumable/Food/Baked/donkpocket.yml | 39 +----------------- .../Consumable/Food/Containers/box.yml | 14 ------- .../Entities/Objects/Decoration/present.yml | 2 - .../Recipes/Cooking/meal_recipes.yml | 8 ---- .../Food/Baked/donkpocket.rsi/gondola-box.png | Bin 347 -> 0 bytes .../Food/Baked/donkpocket.rsi/gondola.png | Bin 317 -> 0 bytes .../Food/Baked/donkpocket.rsi/meta.json | 6 --- Resources/migration.yml | 3 ++ 9 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png 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 98174b7a03..cf7b2a5e86 100644 --- 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 b0be8011aa..2e03405305 100644 --- 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 6b0e43fd10..bec5f3ee08 100644 --- 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 73d264f738..66065d6958 100644 --- 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 0b66658d16..5a44dd2c23 100644 --- 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 index 5bda53839e05149b73cf5b709868d688ebec2571..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyr2#%6t_KbraF7vq(NRh^SKORz zlVhWDrX$T(NyJTE+(AXuOH(q+NX|n;B1l&{!BoLQmOns8I@(As-BQU{Q@qO0w94Pq zOGB(a)au3liLdrdSlyD=5N7l2(Bv1ZyS^{&_S2H64z!q25Po|@N0W!Pld4#Rp{%K_ zP~Uu)W}pKYOM?7@862M7NCR@Fc)B=-SoFRu%}jpjm5>#VN#Qp zFT$1Ix r;xSNqP>~_aGUr$0WF}>%x}ECD&jlCRia+=VbRUDKtDnm{r-UW|^sRp9 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 index 700805e5185ded30ae6c2fad2f253d7aac8a9894..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFtT{MIEGZrNluVpU7R4&(-dfM ziBZ{dmdsX>|H;Dl>)+a)d}cT?dFRAQDu@4Nf0vw)8CaJ$hwm`EN15Rn#upC`uKv#R ze%~JjOOXhVQU+#bX6M*g8z9BZyg$&f;z=B*>@!17mB@RE{ zK3^iP{*TvufrdygUWX!%JyjL&{?CuU|6$d{psk9xVkQ+I1o9*zZtMVKyM6oGm5v`e zcJ#yB%ifdDDBol>aR2l3Yp-KORQtonud8|F`s%>q4l278pq6)BwxfoXcjop#pe{c^lSQtEA{an^L HB{Ts5J3xXd 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 8b64f3577a..bf4050e45e 100644 --- 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 557a1a767b..4d5a4cce6e 100644 --- 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 -- 2.51.2