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	āda <ss.adasts@gmail.com>
	Thu, 15 Jan 2026 18:32:37 +0000 (12:32 -0600)
committer	GitHub <noreply@github.com>
	Thu, 15 Jan 2026 18:32:37 +0000 (18:32 +0000)
commit	fdeb5a736d0c32cc83cfef81bd01fccedab86f9c
tree	bc177ba4d86df531c631941d16b9ab1c41844f9d	tree \| snapshot
parent	610881db82f5a8c723ab5c119484fd74b725c5e4	commit \| diff

Rebase vials to DrinkBase, closeable vials, mini vials (#36132)

* .rsi

* mini vial

* try stop TryStopNukeOpsFromConstantlyFailing from failing

* slight sprite change

* mail and lathe recipe

* real test fail

* resolve arbitrage

* cleanup

* always forgetting something

* always forgetting something

* drink no more

* remove integrated vial

* initial port

* Rename the rsi states

* Rename the rsi states

* up to standards

* finish

* testfail

* minor touchup

* arby

* op

* mix meta

* small changes to the vials

* commit

* commit

* style nit

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>

37 files changed:

Resources/Prototypes/Catalog/Cargo/cargo_medical.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Boxes/medical.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Deliveries/package_rare_tables.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Chemistry/chemistry-vials.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Lathes/Packs/medical.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Lathes/chemistry.yml		diff \| blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-1.png	[moved from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-1.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-2.png	[moved from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-2.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-3.png	[moved from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-3.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-4.png	[moved from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-4.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-5.png	[moved from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-5.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/fill-6.png	[moved from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1-6.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/icon_empty.png	[moved from Resources/Textures/Objects/Specific/Chemistry/vial.rsi/vial-1.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/icon_open.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_empty.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/icon_open.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left-fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right-fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Chemistry/vial_mini.rsi/meta.json	[new file with mode: 0644]	blob
Resources/migration.yml		diff \| blob \| history

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

RSS Atom