From 6c1f71b391b95367d6e2e203913c543970a0a5ba Mon Sep 17 00:00:00 2001 From: artur Date: Thu, 25 Jun 2026 16:59:01 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=83=D1=81?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=BD=D0=B5=D1=82=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/_Forge/BsEnergy/BsReceiverEnergySystem.cs | 2 +- Content.Server/_Forge/BsEnergy/BsTransmitterEnergySystem.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/_Forge/BsEnergy/BsReceiverEnergySystem.cs b/Content.Server/_Forge/BsEnergy/BsReceiverEnergySystem.cs index d8f6d9c4f1b..b0130ae24d4 100644 --- a/Content.Server/_Forge/BsEnergy/BsReceiverEnergySystem.cs +++ b/Content.Server/_Forge/BsEnergy/BsReceiverEnergySystem.cs @@ -249,7 +249,7 @@ private void ClosePreviousConnection(EntityUid receiverUid, EntityUid transmitte private void OnWithdraw(EntityUid receiverUid, BsReceiverEnergyComponent receiverEnergyComponent, WithdrawMessage args) { - if (args.Actor is not { Valid : true } player || (int)receiverEnergyComponent.Money > 0) + if (args.Actor is not { Valid : true } player || (int)receiverEnergyComponent.Money <= 0) return; var stackPrototype = _prototypeManager.Index("Credit"); diff --git a/Content.Server/_Forge/BsEnergy/BsTransmitterEnergySystem.cs b/Content.Server/_Forge/BsEnergy/BsTransmitterEnergySystem.cs index 6705737f21c..643c26cdb03 100644 --- a/Content.Server/_Forge/BsEnergy/BsTransmitterEnergySystem.cs +++ b/Content.Server/_Forge/BsEnergy/BsTransmitterEnergySystem.cs @@ -178,7 +178,7 @@ private void OnChangePrice(EntityUid transmitterUid, BsTransmitterEnergyComponen private void OnWithdraw(EntityUid transmitterUid, BsTransmitterEnergyComponent bsTransmitterEnergyComponent, WithdrawMessage args) { - if (args.Actor is not { Valid : true } player || (int)bsTransmitterEnergyComponent.Money > 0) + if (args.Actor is not { Valid : true } player || (int)bsTransmitterEnergyComponent.Money <= 0) return; var stackPrototype = _prototypeManager.Index("Credit"); From 74e1be72efb28a42114ea704a99cb03370bc4e88 Mon Sep 17 00:00:00 2001 From: artur Date: Thu, 25 Jun 2026 16:58:44 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=95=D0=B4=D0=B8=D0=BD=D0=BE=D0=B5=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BA=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=20=D1=81=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/_Forge/bs-energy/bs-energy.ftl | 2 +- Resources/Locale/ru-RU/_Forge/bs-energy/bs-energy.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_Forge/bs-energy/bs-energy.ftl b/Resources/Locale/en-US/_Forge/bs-energy/bs-energy.ftl index 199d3e5ec79..b77455671f0 100644 --- a/Resources/Locale/en-US/_Forge/bs-energy/bs-energy.ftl +++ b/Resources/Locale/en-US/_Forge/bs-energy/bs-energy.ftl @@ -68,7 +68,7 @@ ui-bs-receiver-requested-power-label = Requested: ui-bs-receiver-money-time-label = Time Left: ui-bs-receiver-money-lost-label = Expenses: ui-bs-receiver-money-label = Balance: -ui-bs-receiver-withdraw-button = Withdraw +ui-bs-receiver-withdraw-button = Withdraw Funds ui-bs-receiver-transmitters-label = Available Energy Sellers ui-bs-receiver-draw-rate-label = Grid Load: diff --git a/Resources/Locale/ru-RU/_Forge/bs-energy/bs-energy.ftl b/Resources/Locale/ru-RU/_Forge/bs-energy/bs-energy.ftl index e4c8fa84d1b..069e00ea491 100644 --- a/Resources/Locale/ru-RU/_Forge/bs-energy/bs-energy.ftl +++ b/Resources/Locale/ru-RU/_Forge/bs-energy/bs-energy.ftl @@ -69,7 +69,7 @@ ui-bs-receiver-requested-power-label = Запрошено: ui-bs-receiver-money-time-label = Осталось: ui-bs-receiver-money-lost-label = Расход: ui-bs-receiver-money-label = Баланс: -ui-bs-receiver-withdraw-button = Вывести +ui-bs-receiver-withdraw-button = Вывести средства ui-bs-receiver-transmitters-label = Доступные продавцы энергии ui-bs-receiver-draw-rate-label = Нагрузка сети: From fd277fc7271a9b75a4baa6e5c4172c867f546716 Mon Sep 17 00:00:00 2001 From: artur Date: Thu, 25 Jun 2026 17:00:07 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BC=D0=B0?= =?UTF-8?q?=D1=88=D0=B8=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BB=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Devices/Circuitboards/Machine/bs_energy.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Devices/Circuitboards/Machine/bs_energy.yml b/Resources/Prototypes/_Forge/Entities/Objects/Devices/Circuitboards/Machine/bs_energy.yml index 69891deb485..0c590a9851b 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Devices/Circuitboards/Machine/bs_energy.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Devices/Circuitboards/Machine/bs_energy.yml @@ -7,7 +7,6 @@ components: - type: MachineBoard prototype: BsTransmitterT1 - frameSize: 1x1 componentRequirements: AmeFuelContainer: amount: 3 @@ -42,6 +41,9 @@ UraniumFissile: 3 Diamond: 2 Bluespace: 2 + - type: Tag + tags: + - MachineBoard2x2 - type: entity id: BsTransmitterCircuitboardT3 @@ -64,6 +66,9 @@ UraniumFissile: 4 Diamond: 3 Bluespace: 3 + - type: Tag + tags: + - MachineBoard3x3 #BsReceiver Board - type: entity @@ -74,7 +79,6 @@ components: - type: MachineBoard prototype: BsReceiverT1 - frameSize: 1x1 componentRequirements: AmeFuelContainer: amount: 3 @@ -109,6 +113,9 @@ UraniumFissile: 3 Diamond: 2 Bluespace: 2 + - type: Tag + tags: + - MachineBoard2x2 - type: entity id: BsReceiverCircuitboardT3 @@ -131,3 +138,6 @@ UraniumFissile: 4 Diamond: 3 Bluespace: 3 + - type: Tag + tags: + - MachineBoard3x3 From 51f1acb1403b3f41bb539add98330c2e2bd44c5c Mon Sep 17 00:00:00 2001 From: artur Date: Thu, 25 Jun 2026 17:01:35 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B8=D1=81=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9=20(=D0=BF=D0=B5=D1=80=D0=B5=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Forge/Research/BsEnergy/bs_energy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Forge/Research/BsEnergy/bs_energy.yml b/Resources/Prototypes/_Forge/Research/BsEnergy/bs_energy.yml index 7d6b20e9115..627d77320a2 100644 --- a/Resources/Prototypes/_Forge/Research/BsEnergy/bs_energy.yml +++ b/Resources/Prototypes/_Forge/Research/BsEnergy/bs_energy.yml @@ -5,7 +5,7 @@ discipline: Industrial tier: 2 cost: 20000 - position: -1, 3 + position: 0, 0 technologyPrerequisites: - PowerGeneration - SuperParts @@ -20,7 +20,7 @@ discipline: Industrial tier: 3 cost: 25000 - position: -2, 3 + position: 0, 0 technologyPrerequisites: - BsEnergyTechT1 recipeUnlocks: @@ -34,7 +34,7 @@ discipline: Industrial tier: 3 cost: 30000 - position: -3, 3 + position: 0, 0 technologyPrerequisites: - BsEnergyTechT2 recipeUnlocks: