diff --git a/code/modules/shieldgen/_energy_field.dm b/code/modules/shieldgen/_energy_field.dm index 71e88cee3e0..bf74e5c8f50 100644 --- a/code/modules/shieldgen/_energy_field.dm +++ b/code/modules/shieldgen/_energy_field.dm @@ -19,7 +19,7 @@ /// The time passed since the last "fail", AKA losing charge faster than you can replenish it. var/time_since_fail = 100 /// How many renwicks per watt. - var/energy_conversion_rate = 0.0002 + var/energy_conversion_rate = 0.00006 /// If the field is strong, then the energy field objects will turn dense. var/strong_field = FALSE diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index a62a7cbf190..a589f09a9bd 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -14,7 +14,7 @@ var/stored_charge = 0 var/last_stored_charge = 0 var/time_since_fail = 100 - var/max_charge = 2e8 //200 MJ + var/max_charge = 2e7 //20 MJ var/max_charge_rate = 9000000 //9 MW var/locked = FALSE diff --git a/html/changelogs/Bat-MultiZShieldBalance.yml b/html/changelogs/Bat-MultiZShieldBalance.yml new file mode 100644 index 00000000000..9b78cf49eda --- /dev/null +++ b/html/changelogs/Bat-MultiZShieldBalance.yml @@ -0,0 +1,6 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - balance: "Reduces Horizon multi-z hull generator Watt -> Renwick conversion rate from 0.0002 to 0.00006, given increased capacitor throughput and reactor outputs." + - balance: "Reduces maximum shield capacitor storage from 200 mJ to 20 mJ." + - bugfix: "Corrects Shield Capacitor TGUI displaying capacitor storage as Watts instead of Joules." diff --git a/tgui/packages/tgui/interfaces/ShieldCapacitor.tsx b/tgui/packages/tgui/interfaces/ShieldCapacitor.tsx index 59d0f48e933..5247d06608a 100644 --- a/tgui/packages/tgui/interfaces/ShieldCapacitor.tsx +++ b/tgui/packages/tgui/interfaces/ShieldCapacitor.tsx @@ -18,7 +18,9 @@ export type CapacitorData = { time_since_fail: number; charge_rate: number; stored_charge: number; + stored_charge_readable: string; max_charge: number; + max_charge_readable: string; max_charge_rate: number; }; @@ -74,7 +76,7 @@ export const CapacitorWindow = (props, context) => { minValue={0} maxValue={data.max_charge} > - {data.stored_charge} / {data.max_charge} W + {data.stored_charge} / {data.max_charge} J