From d57f61613156af176725c030853c945636ea6dd1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 20 Jan 2018 10:48:48 -0500 Subject: [PATCH 1/2] Merge pull request #34631 from uraniummeltdown/airlock Emagged Airlocks Are Easier To Deconstruct --- code/game/machinery/doors/airlock.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b36cc1e4c4..c932c329dd 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -979,7 +979,7 @@ charge.forceMove(get_turf(user)) charge = null return - if( beingcrowbarred && (density && welded && !operating && src.panel_open && (!hasPower()) && !src.locked) ) + if(beingcrowbarred && panel_open && (emagged || (density && welded && !operating && !hasPower() && !locked))) playsound(src.loc, I.usesound, 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", \ "You start to remove electronics from the airlock assembly...")