From 541b8db6842c9b8597120dc2e0211a6f622ac040 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 24 Nov 2017 18:10:55 -0200 Subject: [PATCH 1/2] Merge pull request #32985 from YPOQ/airlockfix Fixes AIs being unable to interact with unscrewed airlocks --- code/game/machinery/doors/airlock.dm | 1 + code/modules/power/apc.dm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 465f74f05e..449b9ea8a4 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -49,6 +49,7 @@ var/normal_integrity = AIRLOCK_INTEGRITY_N integrity_failure = 70 damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N + interact_open = TRUE var/security_level = 0 //How much are wires secured var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 35d104819f..815da3fbdb 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -49,6 +49,7 @@ max_integrity = 200 integrity_failure = 50 resistance_flags = FIRE_PROOF + interact_open = TRUE var/lon_range = 1.5 var/area/area @@ -657,7 +658,7 @@ wires.interact(user) else return ..() - + /obj/machinery/power/apc/AltClick(mob/user) ..() if(!issilicon(user) && (!user.canUseTopic(src, be_close=TRUE) || !isturf(loc))) @@ -665,7 +666,7 @@ return else togglelock(user) - + /obj/machinery/power/apc/proc/togglelock(mob/living/user) if(emagged) to_chat(user, "The interface is broken!")