cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update airlock_electronics.dm

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-08 15:53:32 -04:00
committed by GitHub
parent e02fc2550a
commit f8fa0c09cf
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock_electronics.dm
-8
View File
@@ -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"])