diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm index 0bc3c1ce5e5..4d3ea3bc17d 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/phaser.dm @@ -253,16 +253,16 @@ -/obj/machinery/ship_weapon/energy/proc/process_heat(delta_time)//heat management. don't push your weapons too hard. actual heat generation is in _ship_weapons.dm +/obj/machinery/ship_weapon/energy/proc/process_heat()//heat management. don't push your weapons too hard. actual heat generation is in _ship_weapons.dm for(var/obj/machinery/cooling/cooler/C in coolers) if(!(C.machine_stat & (BROKEN|NOPOWER|MAINT))) cooling_amount++ for(var/obj/machinery/cooling/storage/C in storages) if(!(C.machine_stat & (BROKEN|NOPOWER|MAINT))) storage_amount++ - max_heat = initial(max_heat) + (min((storage_amount),10))*storage_rate + max_heat = initial(max_heat) + ((min((storage_amount),10))*storage_rate) if(heat > 0) - heat = max(heat-(min((cooling_amount),10)*delta_time*heat_rate),0) + heat = max(heat-(min((cooling_amount),10)*heat_rate),0) if(overloaded & (heat <= (max_heat/50))) overloaded = 0 if(overloaded) diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm index 68df735d9e3..b6fb39fd380 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/subspacecooling.dm @@ -34,14 +34,14 @@ /obj/machinery/cooling/cooler/Initialize(mapload) . = ..() - for(var/obj/machinery/ship_weapon/energy/E as() in orange(1, src)) + for(var/obj/machinery/ship_weapon/energy/E in orange(1, src)) //I have no idea what I'm doing and this causes errors so E.coolers |= src parent = E break /obj/machinery/cooling/storage/Initialize(mapload) . = ..() - for(var/obj/machinery/ship_weapon/energy/E as() in orange(1, src)) + for(var/obj/machinery/ship_weapon/energy/E in orange(1, src)) E.storages |= src parent = E break @@ -69,7 +69,7 @@ if(on) . += "The power is on" if(parent) - . += "The subspace transcever is linked" + . += "The thermal subspace transcever is linked" else . += "it's completely inactive" diff --git a/tgui/packages/tgui/interfaces/EnergyWeapons.js b/tgui/packages/tgui/interfaces/EnergyWeapons.js index 92820914c05..a32d09ff2d2 100644 --- a/tgui/packages/tgui/interfaces/EnergyWeapons.js +++ b/tgui/packages/tgui/interfaces/EnergyWeapons.js @@ -49,8 +49,7 @@ export const EnergyWeapons = (props, context) => { good: [-Infinity, 0.2], average: [0.2, 0.5], bad: [0.5, Infinity], - }}> - + }} /> Charge:
{ average: [0.15, 0.50], bad: [-Infinity, 0.15], }} /> - +
-
+ value={data.frequency* 0.01} + ranges={{ + good: [0.5, Infinity], + average: [0.15, 0.5], + bad: [-Infinity, 0.15], + }} />
Power Input Level: