From e02fc2550a0b3b144e77c33858d9f4c125b33584 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Fri, 8 May 2020 12:19:50 -0700 Subject: [PATCH 1/2] Rewrite airlock electronics --- code/game/machinery/doors/airlock_electronics.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 41e3297c2b..6376db129a 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -6,7 +6,11 @@ matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50) +<<<<<<< HEAD req_one_access = list(access_engine, access_talon) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon +======= + req_one_access = list(access_engine) // Access to unlock the device, ignored if emagged +>>>>>>> 62c6693... Merge pull request #7099 from VOREStation/aro-airlockelec var/list/apply_any_access = list(access_engine) // Can apply any access, not just their own var/secure = 0 //if set, then wires will be randomized and bolts will drop if the door is broken @@ -64,7 +68,11 @@ if (usr.stat || usr.restrained() || (!ishuman(usr) && !istype(usr,/mob/living/silicon))) return if (href_list["close"]) +<<<<<<< HEAD usr << browse(null, "window=airlock") +======= + usr << browse(null, "window=airlock_electronics") +>>>>>>> 62c6693... Merge pull request #7099 from VOREStation/aro-airlockelec return if (href_list["login"]) From f8fa0c09cf7428837a731d4475afe2788fdbb5f5 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 8 May 2020 15:53:32 -0400 Subject: [PATCH 2/2] Update airlock_electronics.dm --- code/game/machinery/doors/airlock_electronics.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 6376db129a..4393417e26 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -6,11 +6,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50) -<<<<<<< HEAD req_one_access = list(access_engine, access_talon) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon -======= - req_one_access = list(access_engine) // Access to unlock the device, ignored if emagged ->>>>>>> 62c6693... Merge pull request #7099 from VOREStation/aro-airlockelec var/list/apply_any_access = list(access_engine) // Can apply any access, not just their own var/secure = 0 //if set, then wires will be randomized and bolts will drop if the door is broken @@ -68,11 +64,7 @@ if (usr.stat || usr.restrained() || (!ishuman(usr) && !istype(usr,/mob/living/silicon))) return if (href_list["close"]) -<<<<<<< HEAD - usr << browse(null, "window=airlock") -======= usr << browse(null, "window=airlock_electronics") ->>>>>>> 62c6693... Merge pull request #7099 from VOREStation/aro-airlockelec return if (href_list["login"])