From f4d05971eebab32e16f19bc0cd0fdc3896da7a18 Mon Sep 17 00:00:00 2001
From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Date: Sat, 1 Jun 2024 08:44:12 -0700
Subject: [PATCH] [MIRROR] gravekeeper apc (#8445)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
---
 .../living/silicon/robot/subtypes/lost_drone.dm |  4 ++--
 code/modules/power/apc.dm                       | 17 +++++++++++++++++
 code/modules/power/apc_vr.dm                    | 12 ------------
 vorestation.dme                                 |  1 -
 4 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 code/modules/power/apc_vr.dm

diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm
index 953a5f6f81..2f17ee46f4 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm
@@ -23,7 +23,7 @@
 	if(!cell)
 		cell = new /obj/item/weapon/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface.
 
-	scramble_hardware()
+	scramble_hardware(20)
 
 	playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0)
 
@@ -31,7 +31,7 @@
 	return "synthetic_evil"
 
 /mob/living/silicon/robot/lost/proc/scramble_hardware(var/chance)
-	if(prob(20))  //Small chance to spawn with a scrambled
+	if(prob(chance))  //Small chance to spawn with a scrambled
 		emag_items = 1
 
 /mob/living/silicon/robot/lost/proc/apply_new_laws()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index bcef1e11cb..6ad65cd6b5 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -85,6 +85,10 @@ GLOBAL_LIST_EMPTY(apcs)
 	pixel_x = (dir & 3) ? 0 : (dir == 4 ? 24 : -24)
 	pixel_y = (dir & 3) ? (dir == 1 ? 20 : -20) : 0
 
+/obj/machinery/power/apc/hyper/graveyard
+	req_access = list(access_lost)
+	alarms_hidden = TRUE
+
 /obj/machinery/power/apc
 	name = "area power controller"
 	desc = "A control terminal for the area electrical systems."
@@ -1365,6 +1369,19 @@ GLOBAL_LIST_EMPTY(apcs)
 		L.update() //For some reason it gets hung up on updating the overlay for the light fixture somewhere down the line. This fixes it.
 		CHECK_TICK
 
+/obj/machinery/power/apc/proc/update_area()
+	var/area/NA = get_area(src)
+	if(!(NA == area))
+		if(area.apc == src)
+			area.apc = null
+		NA.apc = src
+		area = NA
+		name = "[area.name] APC"
+	update()
+
+/obj/machinery/power/apc/get_cell()
+	return cell
+
 #undef APC_UPDATE_ICON_COOLDOWN
 
 #undef APC_EXTERNAL_POWER_NOTCONNECTED
diff --git a/code/modules/power/apc_vr.dm b/code/modules/power/apc_vr.dm
deleted file mode 100644
index ec7d4dba09..0000000000
--- a/code/modules/power/apc_vr.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-/obj/machinery/power/apc/proc/update_area()
-	var/area/NA = get_area(src)
-	if(!(NA == area))
-		if(area.apc == src)
-			area.apc = null
-		NA.apc = src
-		area = NA
-		name = "[area.name] APC"
-	update()
-
-/obj/machinery/power/apc/get_cell()
-	return cell
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 4375007767..9966b4d355 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3861,7 +3861,6 @@
 #include "code\modules\planet\weather.dm"
 #include "code\modules\player_tips_vr\player_tips_controller_vr.dm"
 #include "code\modules\power\apc.dm"
-#include "code\modules\power\apc_vr.dm"
 #include "code\modules\power\batteryrack.dm"
 #include "code\modules\power\batteryrack_vr.dm"
 #include "code\modules\power\breaker_box.dm"