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

Изменение кувшинов #283

Merged
merged 6 commits into from
Nov 21, 2024
Merged
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 @@ -2,6 +2,7 @@
id: ChemVendInventory
startingInventory:
Jug: 4
BigJug: 4 # Stories
JugAluminium: 2
JugCarbon: 4
JugChlorine: 1
Expand Down Expand Up @@ -29,6 +30,7 @@
id: ChemVendInventorySyndicate
startingInventory:
Jug: 4
BigJugSyndie: 4 # Stories
JugAluminium: 2
JugCarbon: 4
JugChlorine: 1
Expand All @@ -55,4 +57,4 @@
MuteToxinChemistryBottle: 3
LeadChemistryBottle: 2
ToxinChemistryBottle: 1

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 300 # 200 # Stories
maxVol: 200
- type: Sprite
sprite: Objects/Specific/Chemistry/jug.rsi
layers:
Expand Down Expand Up @@ -97,7 +97,7 @@
beaker:
reagents:
- ReagentId: Carbon
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -112,7 +112,7 @@
beaker:
reagents:
- ReagentId: Iodine
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -127,7 +127,7 @@
beaker:
reagents:
- ReagentId: Fluorine
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -142,7 +142,7 @@
beaker:
reagents:
- ReagentId: Chlorine
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -157,7 +157,7 @@
beaker:
reagents:
- ReagentId: Aluminium
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -172,7 +172,7 @@
beaker:
reagents:
- ReagentId: Phosphorus
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -187,7 +187,7 @@
beaker:
reagents:
- ReagentId: Sulfur
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -202,7 +202,7 @@
beaker:
reagents:
- ReagentId: Silicon
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -217,7 +217,7 @@
beaker:
reagents:
- ReagentId: Hydrogen
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -232,7 +232,7 @@
beaker:
reagents:
- ReagentId: Lithium
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -247,7 +247,7 @@
beaker:
reagents:
- ReagentId: Sodium
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -262,7 +262,7 @@
beaker:
reagents:
- ReagentId: Potassium
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -277,7 +277,7 @@
beaker:
reagents:
- ReagentId: Radium
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -292,7 +292,7 @@
beaker:
reagents:
- ReagentId: Iron
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -307,7 +307,7 @@
beaker:
reagents:
- ReagentId: Copper
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -322,7 +322,7 @@
beaker:
reagents:
- ReagentId: Gold
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -337,7 +337,7 @@
beaker:
reagents:
- ReagentId: Mercury
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -352,7 +352,7 @@
beaker:
reagents:
- ReagentId: Silver
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -367,7 +367,7 @@
beaker:
reagents:
- ReagentId: Ethanol
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -382,7 +382,7 @@
beaker:
reagents:
- ReagentId: Sugar
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -397,7 +397,7 @@
beaker:
reagents:
- ReagentId: Nitrogen
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -412,7 +412,7 @@
beaker:
reagents:
- ReagentId: Oxygen
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -427,7 +427,7 @@
beaker:
reagents:
- ReagentId: PlantBGone
Quantity: 300 # 200 # Stories
Quantity: 200

- type: entity
parent: Jug
Expand All @@ -442,4 +442,4 @@
beaker:
reagents:
- ReagentId: WeldingFuel
Quantity: 300 # 200 # Stories
Quantity: 200
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,7 @@
- LargeBeaker
- Dropper
- Jug
- BigJug # Stories
- Syringe
- Implanter
- PillCanister
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
- type: entity
name: Вместительный кувшин
parent: Jug
id: BigJug
description: Используется для хранения очень большого количества химических веществ или растворов. Работает на экспериментальной блюспейс технологии.
components:
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 300
- type: Sprite
sprite: Stories/Objects/Specific/Chemistry/big_jug.rsi
layers:
- state: jug
- state: jug1
map: [ "enum.SolutionContainerLayers.Fill" ]
visible: false
- state: unlit
shader: unshaded
- type: Item
size: Normal
shape:
- 0,0,1,2
sprite: Stories/Objects/Specific/Chemistry/big_jug.rsi
- type: SolutionContainerVisuals
maxFillLevels: 9

- type: entity
name: Красный вместительный кувшин
parent: BigJug
id: BigJugSyndie
description: Используется для хранения очень большого количества химических веществ или растворов. Работает на экспериментальной блюспейс технологии.
components:
- type: Sprite
sprite: Stories/Objects/Specific/Chemistry/big_jug_syndicate.rsi
- type: Item
sprite: Stories/Objects/Specific/Chemistry/big_jug_syndicate.rsi
6 changes: 6 additions & 0 deletions Resources/Prototypes/Stories/Recipes/Lathes/medical.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: latheRecipe
id: BigJug
result: BigJug
completetime: 4
materials:
Plastic: 500
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.
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
Loading