cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge with upstream/master

Browse Source 
Fixes merge conflicts.
This commit is contained in:
DZD
2015-02-19 19:38:48 -05:00
parent c11bb0d283 043a5e0e31
commit d0d6c8eebd
115 changed files with 3012 additions and 2380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/computer3/computers/security.dm
+1 -1
View File
@@ -38,7 +38,7 @@
proc/authenticate()
if(access_security in scan.access || access_forensics_lockers in scan.access )
if((access_security in scan.access) || (access_forensics_lockers in scan.access) )
return 1
if(istype(usr,/mob/living/silicon/ai))
return 1