diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml index ac22eb989a2dd4..89f4fe4c94b8f3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml @@ -72,6 +72,9 @@ - FoodMealCornInButter - FoodSoupStew - FoodMealBigLollipop #impstation edit + - FoodMealFruitLollipop #imp + - FoodMealClothLollipop #imp + - FoodMealMeatLollipop #imp chance: 0.8 offset: 0.0 #rare @@ -95,4 +98,5 @@ - FoodSoupEyeball - FoodSoupElectron - FoodNoodlesCopy + - FoodMealCultLollipop #imp rareChance: 0.05 diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml index f19e6d08b6b631..ce08998531a27e 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumables/Food/meals.yml @@ -6,6 +6,9 @@ id: FoodMealBigLollipop description: Wow!!! It's as big as your head!!! components: + - type: Tag + tags: + - FoodSnack - type: Food trash: - FoodKebabSkewer @@ -21,9 +24,150 @@ - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 30 reagents: - ReagentId: Nutriment Quantity: 5 - ReagentId: Sugar Quantity: 10 + +- type: entity + name: cloth lollipop + parent: FoodMealBigLollipop + id: FoodMealClothLollipop + description: Woven with love. + components: + - type: Tag + tags: + - FoodSnack + - ClothMade + - type: Food + requiresSpecialDigestion: true + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - sugar + - cotton + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: cloth-lollipop + - type: Item + heldPrefix: cloth-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 10 + - ReagentId: Fiber + Quantity: 10 + +- type: entity + name: fruit lollipop + parent: FoodMealBigLollipop + id: FoodMealFruitLollipop + description: Didn't this come out of a microwave? How did the chef even do this? + components: + - type: Tag + tags: + - FoodSnack + - Fruit + - type: Food + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - fruity + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: fruit-lollipop + - type: Item + heldPrefix: fruit-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 5 + - ReagentId: JuiceOrange + Quantity: 5 + - ReagentId: JuiceApple + Quantity: 5 + - ReagentId: JuiceWatermelon + Quantity: 5 + +- type: entity + name: meat lollipop + parent: FoodMealBigLollipop + id: FoodMealMeatLollipop + description: It's still dripping... + components: + - type: Tag + tags: + - Meat + - FoodSnack + - type: Food + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - meaty + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: meat-lollipop + - type: Item + heldPrefix: meat-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 10 + - ReagentId: Blood + Quantity: 5 + +- type: entity + name: entro-pop + parent: FoodMealBigLollipop + id: FoodMealCultLollipop #no recipe yet but it is a rare spawn from meal spawners + description: It seems to flicker in and out of view, your eyes never truly focusing on it. It's cosmically delicious! + components: + - type: Tag + tags: + - FoodSnack + - type: Food + trash: + - FoodKebabSkewer + - type: FlavorProfile + flavors: + - whimsy + - strange + - type: Sprite + sprite: _Impstation/Objects/Consumable/Food/meals.rsi + state: entro-lollipop + - type: Item + heldPrefix: entro-lollipop + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sugar + Quantity: 10 + - ReagentId: Fresium + Quantity: 10 diff --git a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml index 6e580b13a23588..725d121a1e0ee6 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml @@ -7,3 +7,39 @@ Sugar: 10 solids: FoodKebabSkewer: 1 #it's healthy for microwaves + +- type: microwaveMealRecipe + id: RecipeClothLollipop + name: cloth lollipop recipe + result: FoodMealClothLollipop + time: 5 + reagents: + Sugar: 10 + Fiber: 10 + solids: + FoodKebabSkewer: 1 + +- type: microwaveMealRecipe + id: RecipeFruitLollipop + name: fruit lollipop recipe + result: FoodMealFruitLollipop + time: 5 + reagents: + Sugar: 10 + Ice: 5 #i don't KNOW!!! + JuiceOrange: 5 + JuiceApple: 5 + JuiceWatermelon: 5 + solids: + FoodKebabSkewer: 1 + +- type: microwaveMealRecipe + id: RecipeMeatLollipop + name: meat lollipop recipe + result: FoodMealMeatLollipop + time: 5 + reagents: + Sugar: 10 + solids: + FoodKebabSkewer: 1 + FoodMeat: 1 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-left.png index 723cbf77b1f1bd..9154a7fdd99a6d 100644 Binary files a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-left.png and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-right.png index 241a451ad66665..d2dc192a46228a 100644 Binary files a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-right.png and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop.png index 3513e829576301..447c407eca7296 100644 Binary files a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop.png and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/big-lollipop.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-left.png new file mode 100644 index 00000000000000..1a7e09f904ce8b Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-right.png new file mode 100644 index 00000000000000..e99cb54990cc4a Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop.png new file mode 100644 index 00000000000000..43692f2b2a143e Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/cloth-lollipop.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-left.png new file mode 100644 index 00000000000000..a81fa84bdb1295 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-right.png new file mode 100644 index 00000000000000..a55993876ad449 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop.png new file mode 100644 index 00000000000000..96400f383d706a Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/entro-lollipop.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-left.png new file mode 100644 index 00000000000000..48713bcea37038 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-right.png new file mode 100644 index 00000000000000..d3a46a6cc67aff Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop.png new file mode 100644 index 00000000000000..a56c5b55152648 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/fruit-lollipop.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-left.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-left.png new file mode 100644 index 00000000000000..1e5713a2826197 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-left.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-right.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-right.png new file mode 100644 index 00000000000000..20f570ce27a7cc Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop-inhand-right.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop.png new file mode 100644 index 00000000000000..b77db7523f9d88 Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meat-lollipop.png differ diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json index b22645ab43fefc..3fa585ec04a09c 100644 --- a/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Consumable/Food/meals.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "lollipop by Doop", + "copyright": "basic, meat, fruit, and cloth lollipop by Doop, entropic lollipop by AftrLite", "size": { "x": 32, "y": 32 @@ -17,7 +17,50 @@ { "name": "big-lollipop-inhand-left", "directions": 4 + }, + { + "name": "cloth-lollipop" + }, + { + "name": "cloth-lollipop-inhand-right", + "directions": 4 + }, + { + "name": "cloth-lollipop-inhand-left", + "directions": 4 + }, + { + "name": "fruit-lollipop" + }, + { + "name": "fruit-lollipop-inhand-right", + "directions": 4 + }, + { + "name": "fruit-lollipop-inhand-left", + "directions": 4 + }, + { + "name": "meat-lollipop" + }, + { + "name": "meat-lollipop-inhand-right", + "directions": 4 + }, + { + "name": "meat-lollipop-inhand-left", + "directions": 4 + }, + { + "name": "entro-lollipop" + }, + { + "name": "entro-lollipop-inhand-right", + "directions": 4 + }, + { + "name": "entro-lollipop-inhand-left", + "directions": 4 } - ] }