Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Lollipop Expansion #1088

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@
- FoodMealCornInButter
- FoodSoupStew
- FoodMealBigLollipop #impstation edit
- FoodMealFruitLollipop #imp
- FoodMealClothLollipop #imp
- FoodMealMeatLollipop #imp
chance: 0.8
offset: 0.0
#rare
Expand All @@ -95,4 +98,5 @@
- FoodSoupEyeball
- FoodSoupElectron
- FoodNoodlesCopy
- FoodMealCultLollipop #imp
rareChance: 0.05
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
id: FoodMealBigLollipop
description: Wow!!! It's as big as your head!!!
components:
- type: Tag
tags:
- FoodSnack
- type: Food
trash:
- FoodKebabSkewer
Expand All @@ -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
36 changes: 36 additions & 0 deletions Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
}

]
}