From dd7de0e833f1e21fd8b156ca8e456b815f2e7909 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Wed, 27 Mar 2024 21:30:32 +0700 Subject: [PATCH] Revert "Remove gondola donkpocket & change berry box description (#24655)" This reverts commit e36844de47ce0d9f5f28b11b733cd998201e1b49. # 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 --- .../Random/Food_Drinks/donkpocketbox.yml | 1 + .../Consumable/Food/Baked/donkpocket.yml | 37 ++++++++++++++++++ .../Consumable/Food/Containers/box.yml | 14 +++++++ .../Entities/Objects/Decoration/present.yml | 4 ++ .../Recipes/Cooking/meal_recipes.yml | 9 ++++- .../Food/Baked/donkpocket.rsi/gondola-box.png | Bin 0 -> 347 bytes .../Food/Baked/donkpocket.rsi/gondola.png | Bin 0 -> 317 bytes .../Food/Baked/donkpocket.rsi/meta.json | 6 +++ Resources/migration.yml | 3 -- 9 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png create 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 fb52cd1c40..8c0089c7a9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml @@ -14,6 +14,7 @@ - FoodBoxDonkpocketSpicy - FoodBoxDonkpocketTeriyaki - FoodBoxDonkpocketPizza + - FoodBoxDonkpocketGondola - FoodBoxDonkpocketStonk - FoodBoxDonkpocketBerry - FoodBoxDonkpocketHonk diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index e8efb19435..6147d0dcb9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index ce41be49f1..01b9ba2ab6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 7707d11500..fce9dd3b6f 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a5620fd8ef..a8016f55b3 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/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 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 new file mode 100644 index 0000000000000000000000000000000000000000..5bda53839e05149b73cf5b709868d688ebec2571 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png new file mode 100644 index 0000000000000000000000000000000000000000..700805e5185ded30ae6c2fad2f253d7aac8a9894 GIT binary patch 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 literal 0 HcmV?d00001 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 a2228b340e..276290726b 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json @@ -22,6 +22,12 @@ { "name": "dank" }, + { + "name": "gondola" + }, + { + "name": "gondola-box" + }, { "name": "pizza" }, diff --git a/Resources/migration.yml b/Resources/migration.yml index 3b3d78c8af..481f04c784 100644 --- a/Resources/migration.yml +++ b/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