From bf41978ed03ded9ae27bac724f0a83a5d72c324e Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sun, 22 Apr 2012 22:00:14 +0100 Subject: [PATCH] Reverts access changes and adds be syndicate line to setup_client proc. --- code/game/jobs/access.dm | 14 ++++++-------- code/modules/mob/new_player/preferences.dm | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 82c5475e399..c37c7937b90 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -143,14 +143,13 @@ return 1 if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access return 0 - for(var/req in src.req_access) - if(!(req in I.access)) //doesn't have this access - return 0 if(src.req_one_access && src.req_one_access.len) for(var/req in src.req_one_access) if(req in I.access) //has an access from the single access list return 1 - return 0 + for(var/req in src.req_access) + if(!(req in I.access)) //doesn't have this access + return 0 return 1 @@ -160,14 +159,13 @@ if(!src.req_access.len && (!src.req_one_access || !src.req_one_access.len)) return 1 if(!L) return 0 if(!istype(L, /list)) return 0 - for(var/req in src.req_access) - if(!(req in L)) //doesn't have this access - return 0 if(src.req_one_access && src.req_one_access.len) for(var/req in src.req_one_access) if(req in L) //has an access from the single access list return 1 - return 0 + for(var/req in src.req_access) + if(!(req in L)) //doesn't have this access + return 0 return 1 diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 01ff30befdc..e9cc815edf1 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -988,6 +988,7 @@ datum/preferences C.ooccolor = src.ooccolor C.be_alien = be_special & BE_ALIEN C.be_pai = be_special & BE_PAI + C.be_syndicate = be_special if(isnull(src.ghost_ears)) src.ghost_ears = 1 //There were problems where the default was null before someone saved their profile. C.ghost_ears = src.ghost_ears