git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
	Mon, 5 Jan 2026 23:18:23 +0000 (18:18 -0500)
committer	GitHub <noreply@github.com>
	Mon, 5 Jan 2026 23:18:23 +0000 (23:18 +0000)
commit	4b7aaa3a46c594c7f8522f0f2e6d09df3daeaa47
tree	3add9e3b50c499403009e0b0afb1d5789e24a8bc	tree \| snapshot
parent	54d7f2b7365c754e63474e7c2c9aabffbdb55ccf	commit \| diff

jugs closeable, move chemistry entities into chemistry directory (#29413)

* jugs closeable, move chemitsry entities into chemsitry directory

* forgor to stage json. I hope i didnt stage robust :anxious:

* Who likes cargo? Not me. Lets remove it.

* Remove seal, make the amount examinable regardless of open or not, update jug icon

* apply iaada's parenting

* fix issues tdw parenting

* Review changes

* Fix sprite rename

* small touchup

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>

16 files changed:

Форк Space Station 14 с переводами на русский

RSS Atom

Resources/Prototypes/Catalog/Cargo/cargo_botany.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemical-containers.yml	[moved from Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml with 77% similarity]	diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-bottles.yml	[moved from Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml with 100% similarity]	blob \| history
Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml	[moved from Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml with 100% similarity]	blob \| history
Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry.yml	[moved from Resources/Prototypes/Entities/Objects/Specific/chemistry.yml with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-1.png	[moved from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-2.png	[moved from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-3.png	[moved from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-4.png	[moved from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-5.png	[moved from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/fill-6.png	[moved from Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/icon_open.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png	[deleted file]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json		diff \| blob \| history