diff --git a/modular_nova/modules/colony_fabricator/code/machines/power_storage_unit.dm b/modular_nova/modules/colony_fabricator/code/machines/power_storage_unit.dm index 113e5234c4e..4ee00d66f95 100644 --- a/modular_nova/modules/colony_fabricator/code/machines/power_storage_unit.dm +++ b/modular_nova/modules/colony_fabricator/code/machines/power_storage_unit.dm @@ -5,9 +5,9 @@ higher maximum output than some larger units. Most commonly seen being used not for their ability to store \ power, but rather for use in regulating power input and output." icon = 'modular_nova/modules/colony_fabricator/icons/power_storage_unit/small_battery.dmi' - capacity = 750 * 1000 - input_level_max = 400 * 1000 - output_level_max = 400 * 1000 + capacity = 7.5 * STANDARD_CELL_CHARGE + input_level_max = 400 KILO WATTS + output_level_max = 400 KILO WATTS circuit = null obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION /// The item we turn into when repacked @@ -71,9 +71,9 @@ low maximum output compared to smaller units. Most commonly seen as large backup batteries, or simply \ for large power storage where throughput is not a concern." icon = 'modular_nova/modules/colony_fabricator/icons/power_storage_unit/large_battery.dmi' - capacity = 10000 * 1000 - input_level_max = 50 * 1000 - output_level_max = 50 * 1000 + capacity = 100 * STANDARD_CELL_CHARGE + input_level_max = 50 KILO WATTS + output_level_max = 50 KILO WATTS repacked_type = /obj/item/flatpacked_machine/large_station_battery // Automatically set themselves to be completely charged on init diff --git a/modular_nova/modules/colony_fabricator/code/machines/rtg.dm b/modular_nova/modules/colony_fabricator/code/machines/rtg.dm index 4690ceb8aff..49eb96d4fb7 100644 --- a/modular_nova/modules/colony_fabricator/code/machines/rtg.dm +++ b/modular_nova/modules/colony_fabricator/code/machines/rtg.dm @@ -7,7 +7,7 @@ icon = 'modular_nova/modules/colony_fabricator/icons/machines.dmi' circuit = null obj_flags = CAN_BE_HIT | NO_DECONSTRUCTION - power_gen = 7500 + power_gen = 7.5 KILO WATTS /// What we turn into when we are repacked var/repacked_type = /obj/item/flatpacked_machine/rtg diff --git a/modular_nova/modules/colony_fabricator/code/machines/stirling_generator.dm b/modular_nova/modules/colony_fabricator/code/machines/stirling_generator.dm index c7f242638ba..2a99c17db75 100644 --- a/modular_nova/modules/colony_fabricator/code/machines/stirling_generator.dm +++ b/modular_nova/modules/colony_fabricator/code/machines/stirling_generator.dm @@ -22,7 +22,7 @@ /// Maximum efficient heat difference, at what heat difference does more difference stop meaning anything for power? var/max_efficient_heat_difference = 8000 /// Maximum power output from this machine - var/max_power_output = 100 * 1000 + var/max_power_output = 100 KILO WATTS /// How much power the generator is currently making var/current_power_generation /// Our looping fan sound that we play when turned on @@ -39,13 +39,12 @@ // This is just to make sure our atmos connection spawns facing the right way setDir(dir) - /obj/machinery/power/stirling_generator/examine(mob/user) . = ..() . += span_notice("You can use a wrench with Left-Click to rotate the generator.") . += span_notice("It will not work in a vacuum as it must be cooled by the gas around it.") - . += span_notice("It is currently generating [current_power_generation / 1000] kW of power.") - . += span_notice("It has a maximum power output of [max_power_output / 1000] kW at a temperature difference of [max_efficient_heat_difference] K.") + . += span_notice("It is currently generating [display_power(current_power_generation, convert = FALSE)] of power.") + . += span_notice("It has a maximum power output of [display_power(max_power_output, convert = FALSE)] at a temperature difference of [max_efficient_heat_difference] K.") /obj/machinery/power/stirling_generator/Destroy() @@ -85,7 +84,7 @@ /obj/machinery/power/stirling_generator/process() var/power_output = round(current_power_generation) - add_avail(power_output) + add_avail(power_to_energy(power_output)) var/new_icon_state = (power_output ? "stirling_on" : "stirling") icon_state = new_icon_state if(soundloop.is_active() && !power_output) diff --git a/modular_nova/modules/kahraman_equipment/code/ore_thumper.dm b/modular_nova/modules/kahraman_equipment/code/ore_thumper.dm index b3d6a72d7af..1a8b337da53 100644 --- a/modular_nova/modules/kahraman_equipment/code/ore_thumper.dm +++ b/modular_nova/modules/kahraman_equipment/code/ore_thumper.dm @@ -88,7 +88,7 @@ . += span_notice("Its must be constructed outdoors to function.") if(!istype(get_turf(src), /turf/open/misc)) . += span_notice("It must be constructed on suitable terrain, like ash, snow, or sand.") - . += span_notice("It must have a powered, wired connection running beneath it with [active_power_usage / BASE_MACHINE_ACTIVE_CONSUMPTION] kW of excess power to function.") + . += span_notice("It must have a powered, wired connection running beneath it with [display_power(active_power_usage, convert = FALSE)] of excess power to function.") . += span_notice("It will produce a box of materials after it has slammed [slam_jams_needed] times.") . += span_notice("Currently, it has slammed [slam_jams] / [slam_jams_needed] times needed.") . += span_notice("It will stop producing resources if there are too many piles of ore near it.") @@ -98,6 +98,7 @@ /obj/machinery/power/colony_ore_thumper/process() var/turf/our_turf = get_turf(src) var/obj/structure/cable/cable_under_us = locate() in our_turf + var/energy_needed = power_to_energy(active_power_usage) if(!cable_under_us && powernet) disconnect_from_network() else if(cable_under_us && !powernet) @@ -107,8 +108,8 @@ balloon_alert_to_viewers("invalid location!") cut_that_out() return - if(avail(active_power_usage)) - add_load(active_power_usage) + if(avail(energy_needed)) + add_load(energy_needed) else balloon_alert_to_viewers("not enough power!") cut_that_out()