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 0000000000..5bda53839e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola-box.png 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 new file mode 100644 index 0000000000..700805e518 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/gondola.png 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 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