From 196314dc1bc865f4e7237d8fda1fa3624f1b17c1 Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 20 Dec 2024 01:55:56 +0300 Subject: [PATCH 1/2] fix ChemMasterComponent - transfer reagents to container --- Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs index 02066b024d..ee464f4412 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs @@ -178,7 +178,7 @@ private void TransferReagents(Entity chemMaster, ReagentId return; } - amount = FixedPoint2.Min(amount, bufferSolution.GetReagentQuantity(id)); + amount = FixedPoint2.Min(amount, containerSolution.AvailableVolume); bufferSolution.RemoveReagent(id, amount); _solutionContainerSystem.TryAddReagent(containerSoln.Value, id, amount, out var _); From 9e4d0779bbe0c79a90f5e38f57ea58a1e3becb25 Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Fri, 20 Dec 2024 02:12:05 +0300 Subject: [PATCH 2/2] translate buttons --- .../ru-RU/chemistry/components/chem-master-component.ftl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl b/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl index 4286b414d4..1a69070490 100644 --- a/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl @@ -14,12 +14,14 @@ chem-master-window-output-tab = Выход chem-master-window-container-label = Контейнер chem-master-window-eject-button = Извлечь chem-master-window-no-container-loaded-text = Контейнер не загружен. -chem-master-window-buffer-text = Буфер +chem-master-window-buffer-text = Буфер хранения +chem-master-window-output-buffer-text = Буфер вывода chem-master-window-buffer-label = буфер: chem-master-window-buffer-all-amount = Всё chem-master-window-buffer-empty-text = Буфер пуст. chem-master-window-buffer-low-text = Недостаточно раствора в буфере -chem-master-window-transfer-button = Перенести +chem-master-window-storage-button = Хранение +chem-master-window-output-button = Вывод chem-master-window-discard-button = Уничтожить chem-master-window-packaging-text = Упаковка chem-master-current-text-label = Метка: