merge stable into master (#38213)

2025-06-10 12:44:53 +02:00
parent 5fcff99fbc cad0b6b3fa
commit 0bdaf9e5ff
1 changed files with 3 additions and 3 deletions
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml
@@ -97,7 +97,7 @@
  - type: BallisticAmmoProvider
    proto: CartridgeCaselessRifle
    capacity: 500
-      
+
 - type: entity
  parent: BaseWeaponTurret
  id: BaseWeaponEnergyTurret
@@ -129,10 +129,10 @@
  - type: ApcPowerReceiverBattery
    idleLoad: 5
    batteryRechargeRate: 200
-    batteryRechargeEfficiency: 1.225
+    batteryRechargeEfficiency: 0.0 # temporarily no power draw because this was causing potentially seizure inducing light flickering
  - type: ApcPowerReceiver
    powerLoad: 5
  - type: ExtensionCableReceiver
  - type: HTN
    rootTask:
-      task: EnergyTurretCompound
+      task: EnergyTurretCompound