From e02bb988c6ee422efeb1e6ea21e2887b080a0c92 Mon Sep 17 00:00:00 2001
From: ErosAa2 <113437785+ErosAa2@users.noreply.github.com>
Date: Sat, 4 Nov 2023 21:12:21 +0800
Subject: [PATCH 1/3] Slight adjusment (#9231)

---
 core/src/mindustry/content/UnitTypes.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index f35ae0d9f9..bcb04b2fda 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -197,7 +197,7 @@ public class UnitTypes{
             singleTarget = true;
             drownTimeMultiplier = 4f;
 
-            abilities.add(new ShieldRegenFieldAbility(25f, 500f, 60f * 1, 60f));
+            abilities.add(new ShieldRegenFieldAbility(25f, 250f, 60f * 1, 60f));
 
             BulletType smallBullet = new BasicBulletType(3f, 10){{
                 width = 7f;

From b4f01742cc8ccf5fa03c7f01160c5cf58e888717 Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Sat, 4 Nov 2023 18:56:24 +0400
Subject: [PATCH 2/3] overdrivable meltdown (#9234)

---
 core/src/mindustry/content/Blocks.java                     | 1 +
 .../mindustry/entities/bullet/ContinuousBulletType.java    | 7 +++++++
 .../world/blocks/defense/turrets/LaserTurret.java          | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 775af9c679..d2d9c3049d 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -3968,6 +3968,7 @@ public class Blocks{
                 hitColor = Pal.meltdownHit;
                 status = StatusEffects.melting;
                 drawSize = 420f;
+                timescaleDamage = true;
 
                 incendChance = 0.4f;
                 incendSpread = 5f;
diff --git a/core/src/mindustry/entities/bullet/ContinuousBulletType.java b/core/src/mindustry/entities/bullet/ContinuousBulletType.java
index 0f95881285..a9ea18876b 100644
--- a/core/src/mindustry/entities/bullet/ContinuousBulletType.java
+++ b/core/src/mindustry/entities/bullet/ContinuousBulletType.java
@@ -11,6 +11,8 @@ public class ContinuousBulletType extends BulletType{
     public float damageInterval = 5f;
     public boolean largeHit = false;
     public boolean continuous = true;
+    /** If a building fired this, whether to multiply damage by its timescale. */
+    public boolean timescaleDamage = false;
 
     {
         removeAfterPierce = false;
@@ -79,7 +81,12 @@ public class ContinuousBulletType extends BulletType{
     }
 
     public void applyDamage(Bullet b){
+        float damage = b.damage;
+        if(timescaleDamage && b.owner instanceof Building build){
+             b.damage *= build.timeScale();
+        }
         Damage.collideLine(b, b.team, hitEffect, b.x, b.y, b.rotation(), currentLength(b), largeHit, laserAbsorb, pierceCap);
+        b.damage = damage;
     }
 
     public float currentLength(Bullet b){
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
index 2cbf82e0e9..6d3683958f 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
@@ -78,7 +78,7 @@ public class LaserTurret extends PowerTurret{
                     entry.bullet.set(bulletX, bulletY);
                     entry.bullet.time = entry.bullet.type.lifetime * entry.bullet.type.optimalLifeFract;
                     entry.bullet.keepAlive = true;
-                    entry.life -= Time.delta / Math.max(efficiency, 0.00001f);
+                    entry.life -= Time.delta * timeScale / Math.max(efficiency, 0.00001f);
                 }
 
                 wasShooting = true;

From 24c2be499470f4c303cf07cf03b62fa4e11a3031 Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Sat, 4 Nov 2023 19:00:32 +0100
Subject: [PATCH 3/3] Update bundle_hu.properties (#9236)

Minor fixes
---
 core/assets/bundles/bundle_hu.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 0b9e351e77..3aa426f974 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1642,7 +1642,7 @@ block.duct-bridge.name = Szállítószalag Híd
 block.large-payload-mass-driver.name = Nagy Rakomány Tömegmozgató
 block.payload-void.name = Rakomány Megsemmisítő
 block.payload-source.name = Rakomány Készítő
-block.disassembler.name = Szétszerelő
+block.disassembler.name = Szétválasztó
 block.silicon-crucible.name = Szilícium Olvasztó
 block.overdrive-dome.name = Túlhajtó Búra
 block.interplanetary-accelerator.name = Bolygóközi Gyorsító
@@ -1950,7 +1950,7 @@ item.carbide.description = Korszerű szerkezetekben, nehezebb egységekben és l
 liquid.water.description = Gépek hűtésére és Törmelékfeldolgozásra használható.
 liquid.slag.description = Leválasztóban finomítva értékes fémek forrása, az ellenségre fröcskölve gyilkos fegyver.
 liquid.oil.description = Magas szintű nyersanyagok gyártására vagy gyújtólövedékként használható.
-liquid.cryofluid.description = Hűtőfolyadék a reaktorok, lövegtornyok és gyárak számára.
+liquid.cryofluid.description = Hűtőfolyadék az erőművek, reaktorok, lövegtornyok és gyárak számára.
 
 #Erekir
 liquid.arkycite.description = Kémiai reakciókban használják energiatermelésre és anyagszintézisre.