forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 32
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
Extractable items for Ghetto Chemistry #209
Merged
Mr0maks
merged 7 commits into
Workbench-Team:arumoon-server
from
DjfjdfofdjfjD:ghetto-chemistry-v3
Aug 1, 2023
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
006c425
god help
DjfjdfofdjfjD 76b515a
i forgor
DjfjdfofdjfjD f3d5c2a
Extractable
DjfjdfofdjfjD 57128ac
mmmhmhm solution
DjfjdfofdjfjD 315b2f2
spacespacepcfdeokfrjmepftab
DjfjdfofdjfjD a3d3a96
nutriments
DjfjdfofdjfjD f3a0d4e
forgor
DjfjdfofdjfjD File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -144,6 +144,17 @@ | |
- type: Sprite | ||
state: energybar-open | ||
- type: Item | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: Sugar | ||
Quantity: 5 | ||
- ReagentId: Nutriment | ||
Quantity: 10 | ||
- type: Extractable | ||
grinableSolutionName: food | ||
|
||
- type: entity | ||
name: popcorn | ||
|
@@ -206,6 +217,17 @@ | |
state: syndicakes | ||
- type: Item | ||
- type: Food | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: Sugar | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Тут тоже самое |
||
Quantity: 5 | ||
- ReagentId: Nutriment | ||
Quantity: 10 | ||
- type: Extractable | ||
grinableSolutionName: food | ||
trash: FoodPacketSyndiTrash | ||
|
||
- type: entity | ||
|
@@ -276,10 +298,13 @@ | |
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 1 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Верни ограничение ёмкости. |
||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 1 | ||
- ReagentId: Sugar | ||
Quantity: 3 | ||
- type: Extractable | ||
grinableSolutionName: food | ||
- type: Item | ||
sprite: Objects/Consumable/Food/snacks.rsi | ||
heldPrefix: packet | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
5 Сахара заменяет 10 унаследованных Нутриентов. Да и не только сахар в батончике. Сахар сейчас не утоляет голод, так что добавляй ещё 10 нутриентов. К тому же ты убрал максимальный объём, что у парента в 30. Так что чини.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
поправлю это