Merge pull request #4950 from Heroman3003/pda-is-valid-id-holder

Fixes borg not being unlockable via PDA holding an ID
This commit is contained in:
Novacat
2019-04-07 22:19:10 -04:00
committed by GitHub
@@ -722,17 +722,18 @@
return 1
return 0
/mob/living/silicon/robot/proc/check_access(obj/item/weapon/card/id/I)
/mob/living/silicon/robot/proc/check_access(obj/item/I)
if(!istype(req_access, /list)) //something's very wrong
return 1
var/list/L = req_access
if(!L.len) //no requirements
return 1
if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access
if(!I || !(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))) //not ID or PDA
return 0
var/access_found = I.GetAccess()
for(var/req in req_access)
if(req in I.access) //have one of the required accesses
if(req in access_found) //have one of the required accesses
return 1
return 0