From 72d4e2fe38f7a3131497293bccd40ee14a181297 Mon Sep 17 00:00:00 2001 From: Dimach Date: Mon, 1 Apr 2024 13:05:34 +0000 Subject: [PATCH] Fix power unit conversions --- .../modules/singularity_engine/code/collector.dm | 4 ++-- .../modules/singularity_engine/code/emp_proof_door.dm | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modular_nova/modules/singularity_engine/code/collector.dm b/modular_nova/modules/singularity_engine/code/collector.dm index 858fd3a14747c2c..c74d49e35aa25ea 100644 --- a/modular_nova/modules/singularity_engine/code/collector.dm +++ b/modular_nova/modules/singularity_engine/code/collector.dm @@ -132,7 +132,7 @@ . = ..() if(!active) . += span_notice("[src]'s display displays the words: \"Power production mode. Please insert Plasma.\"") - . += span_notice("[src]'s display states that it has stored [display_joules(get_stored_joules())], and is processing [display_power(get_power_output())].") + . += span_notice("[src]'s display states that it has stored [display_energy(get_stored_joules())], and is processing [display_power(processed_energy)].") /obj/machinery/power/energy_accumulator/rad_collector/atom_break(damage_flag) . = ..() @@ -166,7 +166,7 @@ /obj/machinery/power/energy_accumulator/rad_collector/proc/hawking_pulse(atom/source, pulse_strength) if(loaded_tank && active && pulse_strength > RAD_COLLECTOR_THRESHOLD) // Adjust energy calculation based on efficiency multiplier - stored_energy += joules_to_energy((pulse_strength - RAD_COLLECTOR_THRESHOLD) * RAD_COLLECTOR_COEFFICIENT * efficiency_multiplier) + stored_energy += (pulse_strength - RAD_COLLECTOR_THRESHOLD) * RAD_COLLECTOR_COEFFICIENT * efficiency_multiplier new /obj/effect/temp_visual/hawking_radiation(get_turf(src)) /obj/machinery/power/energy_accumulator/rad_collector/update_overlays() diff --git a/modular_nova/modules/singularity_engine/code/emp_proof_door.dm b/modular_nova/modules/singularity_engine/code/emp_proof_door.dm index 2197d8c06f932f2..623ac3a1c564b71 100644 --- a/modular_nova/modules/singularity_engine/code/emp_proof_door.dm +++ b/modular_nova/modules/singularity_engine/code/emp_proof_door.dm @@ -1,13 +1,15 @@ /obj/machinery/door/airlock/external/glass/emp_proof name = "emp proof airlock" -/obj/machinery/door/airlock/external/glass/emp_proof/emp_act(severity) - return +/obj/machinery/door/airlock/external/glass/emp_proof/Initialize(mapload, ...) + . = ..() + AddElement(/datum/element/empprotection, EMP_PROTECT_ALL) /obj/machinery/power/apc/auto_name/emp_proof name = "emp proof apc" -/obj/machinery/power/apc/auto_name/emp_proof/emp_act(severity) - return +/obj/machinery/power/apc/auto_name/emp_proof/Initialize(mapload, ndir) + . = ..() + AddElement(/datum/element/empprotection, EMP_PROTECT_ALL) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name/emp_proof, APC_PIXEL_OFFSET)