From 4fd360c694d55966c5500835c1b1ee05ef9aec23 Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Mon, 16 Oct 2017 17:08:39 -0400 Subject: [PATCH 1/2] Fixes cogged APCs being permanently locked to non-servants (#31673) * Fixes cogged APCs being inaccessible * Doop ba doop --- code/modules/power/apc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index ad3e2c9d33..a17fd05d68 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -737,7 +737,7 @@ /obj/machinery/power/apc/ui_data(mob/user) var/list/data = list( - "locked" = integration_cog ? !is_servant_of_ratvar(user) : locked, + "locked" = locked && !(integration_cog && is_servant_of_ratvar(user)), "failTime" = failure_timer, "isOperating" = operating, "externalPower" = main_status, @@ -833,7 +833,7 @@ return TRUE /obj/machinery/power/apc/ui_act(action, params) - if(..() || !can_use(usr, 1) || (locked && !usr.has_unlimited_silicon_privilege && !failure_timer)) + if(..() || !can_use(usr, 1) || (locked && !usr.has_unlimited_silicon_privilege && !failure_timer && !(integration_cog && (is_servant_of_ratvar(usr))))) return switch(action) if("lock")