cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Browse Source 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
This commit is contained in:
PsiOmega
2015-08-29 10:06:18 +02:00
parent e48fbdd1e6 3d66902839
commit 35ea424edc
148 changed files with 6540 additions and 5250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/airlock.dm
+1 -1
View File
@@ -161,7 +161,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
if(A.emagged) return
if(!A.requiresID() || A.check_access(null))
if(A.density) A.open()
else A.close()
else A.close()
if(AIRLOCK_WIRE_SAFETY)
A.safe = !A.safe
if(!A.density)