diff --git a/code/__DEFINES/~monkestation/power.dm b/code/__DEFINES/~monkestation/power.dm index ad5d9c5a0b4a..3a3795a69263 100644 --- a/code/__DEFINES/~monkestation/power.dm +++ b/code/__DEFINES/~monkestation/power.dm @@ -8,3 +8,7 @@ #define TW GW * 1000 #define PW TW * 1000 #define EW PW * 1000 +#define ZW EW * 1000 +#define YW ZW * 1000 +#define RW YW * 1000 +#define QW RW * 1000 diff --git a/monkestation/code/modules/power/power_transmission_laser/code/machine.dm b/monkestation/code/modules/power/power_transmission_laser/code/machine.dm index d4ceaee8d7c9..fa9652fc8229 100644 --- a/monkestation/code/modules/power/power_transmission_laser/code/machine.dm +++ b/monkestation/code/modules/power/power_transmission_laser/code/machine.dm @@ -211,6 +211,16 @@ power_format_multi = 1 TW if("inputPW") power_format_multi = 1 PW + if("inputEW") + power_format_multi = 1 EW + if("inputZW") + power_format_multi = 1 ZW + if("inputYW") + power_format_multi = 1 YW + if("inputRW") + power_format_multi = 1 RW + if("inputQW") + power_format_multi = 1 QW if("outputW") power_format_multi_output = 1 @@ -224,6 +234,16 @@ power_format_multi_output = 1 TW if("outputPW") power_format_multi_output = 1 PW + if("outputEW") + power_format_multi_output = 1 EW + if("outputZW") + power_format_multi_output = 1 ZW + if("outputYW") + power_format_multi_output = 1 YW + if("outputRW") + power_format_multi_output = 1 RW + if("outputQW") + power_format_multi_output = 1 QW /obj/machinery/power/transmission_laser/process() @@ -284,7 +304,7 @@ ////selling defines are here #define MINIMUM_BAR 25 -#define PROCESS_CAP 5000 - MINIMUM_BAR +#define PROCESS_CAP 5000000 - MINIMUM_BAR #define A1_CURVE 70 diff --git a/tgui/packages/tgui/interfaces/TransmissionLaser.js b/tgui/packages/tgui/interfaces/TransmissionLaser.js index c94966e27acc..a9c85c7f179f 100644 --- a/tgui/packages/tgui/interfaces/TransmissionLaser.js +++ b/tgui/packages/tgui/interfaces/TransmissionLaser.js @@ -145,6 +145,31 @@ const InputControls = (props, context) => { selected={power_format === 10 ** 15} onClick={() => act('inputPW')} /> +