From ed2097043e8911aac04a5bd8b5683eaefaf3f7bc Mon Sep 17 00:00:00 2001
From: NovaBot <154629622+NovaBot13@users.noreply.github.com>
Date: Wed, 27 Mar 2024 19:06:58 -0400
Subject: [PATCH] [MIRROR] Fixes modular computer boot-up (#1668)

* Fixes modular computer boot-up

* Prepare for merge master

* restore mirror

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: SomeRandomOwl <2568378+SomeRandomOwl@users.noreply.github.com>
---
 code/modules/modular_computers/computers/item/computer.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index ed857902bc7..22012cfcace 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -491,7 +491,11 @@
 				to_chat(user, span_warning("You press the power button, but the computer fails to boot up, displaying variety of errors before shutting down again."))
 		return FALSE
 
+<<<<<<< HEAD
 	if(use_power()) // checks if the PC is powered
+=======
+	if(use_energy(base_active_power_usage)) // checks if the PC is powered
+>>>>>>> fb7c87be111 ([MIRROR] Fixes modular computer boot-up (#1668))
 		if(looping_sound)
 			soundloop.start()
 		enabled = TRUE