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

Extractable items for Ghetto Chemistry #209

Merged
merged 7 commits into from
Aug 1, 2023
Merged

Extractable items for Ghetto Chemistry #209

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
006c425
god help
DjfjdfofdjfjD Jul 31, 2023
76b515a
i forgor
DjfjdfofdjfjD Jul 31, 2023
f3d5c2a
Extractable
DjfjdfofdjfjD Jul 31, 2023
57128ac
mmmhmhm solution
DjfjdfofdjfjD Jul 31, 2023
315b2f2
spacespacepcfdeokfrjmepftab
DjfjdfofdjfjD Jul 31, 2023
a3d3a96
nutriments
DjfjdfofdjfjD Aug 1, 2023
f3a0d4e
forgor
DjfjdfofdjfjD Aug 1, 2023
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@
Quantity: 4
- ReagentId: Vitamin
Quantity: 2
- ReagentId: Potassium
Quantity: 3
- type: Sprite
sprite: Objects/Specific/Hydroponics/banana.rsi
- type: Produce
Expand Down
20 changes: 19 additions & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@
- type: Sprite
state: energybar-open
- type: Item
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Sugar
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5 Сахара заменяет 10 унаследованных Нутриентов. Да и не только сахар в батончике. Сахар сейчас не утоляет голод, так что добавляй ещё 10 нутриентов. К тому же ты убрал максимальный объём, что у парента в 30. Так что чини.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5 Сахара заменяет 10 унаследованных Нутриентов. Да и не только сахар в батончике. Сахар сейчас не утоляет голод, так что добавляй ещё 10 нутриентов. К тому же ты убрал максимальный объём, что у парента в 30. Так что чини.

поправлю это

Quantity: 5
grinableSolutionName: food

- type: entity
name: popcorn
Expand Down Expand Up @@ -206,6 +213,14 @@
state: syndicakes
- type: Item
- type: Food
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Sugar
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тут тоже самое

Quantity: 5
grinableSolutionName: food
- type: Extractable
trash: FoodPacketSyndiTrash

- type: entity
Expand Down Expand Up @@ -276,10 +291,13 @@
- type: SolutionContainerManager
solutions:
food:
maxVol: 1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Верни ограничение ёмкости.

reagents:
- ReagentId: Nutriment
Quantity: 1
- ReagentId: Sugar
Quantity: 3
grinableSolutionName: food
- type: Extractable
- type: Item
sprite: Objects/Consumable/Food/snacks.rsi
heldPrefix: packet
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/paper.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,14 @@
- type: PhysicalComposition
materialComposition:
Steel: 25
- type: SolutionContainerManager
solutions:
pen:
reagents:
- ReagentId: Iodine
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Почему ручки буду состоять из Йода?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Почему ручки буду состоять из Йода?

Условно чернила, взято с ТГ, тоже для мета

Quantity: 5
- type: Extractable
grinableSolutionName: pen

- type: entity
name: Cybersun pen
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Objects/Power/lights.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@
materialComposition:
Glass: 25
- type: SpaceGarbage
- type: SolutionContainerManager
solutions:
bulb:
reagents:
- ReagentId: Nitrogen
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В лампочках нет Азота, это миф. В прошлом был, но от этого быстро отказались, в связи с быстрой изнашиваемостью. Так что там Вакуум.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В лампочках нет Азота, это миф. В прошлом был, но от этого быстро отказались, в связи с быстрой изнашиваемостью. Так что там Вакуум.

Это взято с ТГ и нужно для расширения возможностей гетто химии, без этого Мет не сделать

Quantity: 15
- type: extractable
grinableSolutionName: bulb

- type: entity
parent: BaseLightbulb
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Power/powercells.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Zinc
Quantity: 5
- ReagentId: Lithium
Quantity: 15
- type: Tag
tags:
- DroneUsable
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/atmos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,11 @@
materialComposition:
Steel: 400
Glass: 100
- type: SolutionContainerManager
solutions:
gasanalyser:
reagents:
- ReagentId: Mercury
Quantity: 15
- type: Extractable
grinableSolutionName: gasanalyser
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
startValue: 5.0
endValue: 1.5
property: Radius
- type: SolutionContainerManager
solutions:
glowstick:
reagents:
- ReagentId: Oxygen
Quantity: 10
- ReagentId: Hydrogen
Quantity: 10
- type: Extractable
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

У тебя съехал Тип влево, из-за этого ошибки.

- grindableSolutionName: glowstick

- type: entity
name: red glowstick
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/matches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@
unlitIcon: match_unlit
litIcon: match_lit
burntIcon: match_burnt
- type: SolutionContainerManager
solutions:
match:
reagents:
- ReagentId: Phosphorus
Quantity: 2
- type: Extractable
grinableSolutionName: match

- type: entity
parent: Matchstick
Expand All @@ -51,6 +59,14 @@
- state: match_burnt
- type: Matchstick
state: Burnt
- type: SolutionContainerManager
solutions:
match:
reagents:
- ReagentId: Carbon
Quantity: 5
- type: Extractable
grinableSolutionName: match

- type: entity
name: match box
Expand Down
Loading