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.

Sign up for GitHub

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

Jump to bottom

tobacco pouches error fixes #2290

Merged
merged 1 commit into from
Oct 19, 2024
Merged

tobacco pouches error fixes #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions Resources/Prototypes/_NF/Entities/Objects/Consumable/Smokables/Pipes/tobacco_pouch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: tobacco pouch
parent: [ BaseStorageItem, BaseBagOpenClose, RecyclableItemClothSmall ]
description: A synth-leather pouch for safe storing pipe tobacco.
#abstract: true
suffix: Empty
components:
- type: Sprite
sprite: _NF/Objects/Consumable/Smokeables/Pipes/tobacco_pouch.rsi
Expand Down Expand Up @@ -42,10 +42,6 @@
maxItemSize: Small
grid:
- 0,0,1,1
- type: StorageFill
contents:
- id: GroundTobacco
amount: 10 # 2 stacks of 5, leaves 2 slots for pipe and lighter
- type: StaticPrice
price: 50

Expand All @@ -60,8 +56,8 @@
components:
- type: StorageFill
contents:
- id: GroundTobacco
amount: 10
- id: NFGroundTobacco5
amount: 2 # 2 stacks of 5, leaves 2 slots for pipe and lighter

- type: entity
id: TobaccoPouchBlueFilled
Expand Down Expand Up @@ -96,8 +92,8 @@
color: "#00d7ff"
- type: StorageFill
contents:
- id: GroundTobaccoStonecut
amount: 10
- id: GroundTobaccoStonecut5
amount: 2

- type: entity
id: TobaccoPouchRedFilled
Expand Down Expand Up @@ -132,8 +128,8 @@
color: "#07ff00"
- type: StorageFill
contents:
- id: GroundTobaccoShrooms
amount: 10
- id: GroundTobaccoShrooms5
amount: 2

- type: entity
id: TobaccoPouchPurpleFilled
Expand Down Expand Up @@ -168,5 +164,5 @@
color: "#bd66bd"
- type: StorageFill
contents:
- id: GroundTobaccoDrowsy
amount: 10
- id: GroundTobaccoDrowsy5
amount: 2
47 changes: 47 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@
state: powderpile
color: "#5f4d2e"

- type: entity
parent: GroundTobaccoStonecut
id: GroundTobaccoStonecut5
suffix: 5
components:
- type: Stack
stackType: GroundTobaccoStonecut
count: 5

# Shrooms
- type: entity
name: dried shrooms
Expand Down Expand Up @@ -54,6 +63,15 @@
graph: smokeableGroundTobaccoShrooms
node: ground

- type: entity
parent: ShroomsDried
id: ShroomsDried5
suffix: 5
components:
- type: Stack
stackType: ShroomsDried
count: 5

- type: entity
id: GroundTobaccoShrooms
name: fungal whiff tobacco
Expand Down Expand Up @@ -83,6 +101,15 @@
offset: 0.0,-0.1
color: "#748eaf"

- type: entity
parent: GroundTobaccoShrooms
id: GroundTobaccoShrooms5
suffix: 5
components:
- type: Stack
stackType: GroundTobaccoShrooms
count: 5

# Sweet dreams
- type: entity
id: GroundTobaccoDrowsy
Expand All @@ -107,3 +134,23 @@
sprite: Objects/Misc/reagent_fillings.rsi
state: powderpile
color: "#a865a0"

- type: entity
parent: GroundTobaccoDrowsy
id: GroundTobaccoDrowsy5
suffix: 5
components:
- type: Stack
stackType: GroundTobaccoDrowsy
count: 5

# Missing from upstream

- type: entity
parent: GroundTobacco
id: NFGroundTobacco5
suffix: 5
components:
- type: Stack
stackType: GroundTobacco
count: 5
Loading