Skip to content

Commit

Permalink
Fix power unit conversions
Browse files Browse the repository at this point in the history
  • Loading branch information
Dimach committed Apr 9, 2024
1 parent e52b9b6 commit 72d4e2f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions modular_nova/modules/singularity_engine/code/collector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
. = ..()
if(!active)
. += span_notice("<b>[src]'s display displays the words:</b> \"Power production mode. Please insert <b>Plasma</b>.\"")
. += span_notice("[src]'s display states that it has stored <b>[display_joules(get_stored_joules())]</b>, and is processing <b>[display_power(get_power_output())]</b>.")
. += span_notice("[src]'s display states that it has stored <b>[display_energy(get_stored_joules())]</b>, and is processing <b>[display_power(processed_energy)]</b>.")

/obj/machinery/power/energy_accumulator/rad_collector/atom_break(damage_flag)
. = ..()
Expand Down Expand Up @@ -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()
Expand Down
10 changes: 6 additions & 4 deletions modular_nova/modules/singularity_engine/code/emp_proof_door.dm
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 72d4e2f

Please sign in to comment.