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

Moth-pockets #34517

Open
wants to merge 3 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 @@ -18,5 +18,6 @@
- FoodBoxDonkpocketBerry
- FoodBoxDonkpocketHonk
- FoodBoxDonkpocketDink
- FoodBoxDonkpocketMoth
chance: 0.5
offset: 0.0
Original file line number Diff line number Diff line change
Expand Up @@ -386,3 +386,54 @@
Quantity: 1
- type: Sprite
state: dink

- type: entity
name: moth-pocket
parent: FoodDonkpocketBase
id: FoodDonkpocketMoth
description: Buzzy edition of donk-pocket that was created during mass protests ab-... Actually who cares? Just donk-pockets for moths.
components:
- type: FlavorProfile
flavors:
- cotton
- cheap
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 5
- ReagentId: Fiber
Quantity: 5
- type: Sprite
state: moth
- type: Food
requiresSpecialDigestion: true
- type: Tag
tags:
- ClothMade
- DonkPocket

- type: entity
name: warm moth-pocket
parent: FoodDonkpocketMoth
id: FoodDonkpocketMothWarm
components:
- type: FlavorProfile
flavors:
- cotton
- cheap
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Fiber
Quantity: 5
- ReagentId: Omnizine
Quantity: 2
- type: Tag
tags:
- ClothMade
- DonkPocket
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,20 @@
- id: FoodDonkpocketDink
amount: 6

- type: entity
parent: FoodBoxDonkpocket
id: FoodBoxDonkpocketMoth
name: box of moth-pockets
components:
- type: Sprite
state: moth-box
- type: Item
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- id: FoodDonkpocketMoth
amount: 6

- type: entity
id: HappyHonk
parent: [ BoxCardboard, BaseBagOpenClose ]
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Decoration/present.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@
orGroup: GiftPool
- id: FoodBoxDonkpocketHonk
orGroup: GiftPool
- id: FoodBoxDonkpocketMoth
orGroup: GiftPool
- id: ClothingHandsGlovesColorPurple
orGroup: GiftPool
- id: ClothingHandsGlovesColorYellow
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1625,6 +1625,13 @@
solids:
FoodDonkpocketCarp: 1

- type: microwaveMealRecipe
id: RecipeDonkpocketMoth
name: warm moth-pocket recipe
result: FoodDonkpocketMothWarm
time: 5
solids:
FoodDonkpocketMoth: 1

- type: microwaveMealRecipe
id: RecipeHotChili
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub).",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub). 'moth-box' and 'moth' states by kosticia on GitHub",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -64,6 +64,12 @@
{
"name": "carp"
},
{
"name": "moth-box"
},
{
"name": "moth"
},
{
"name": "inhand-left",
"directions": 4
Expand Down
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