Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RelPath

This commit is contained in:
variableundefined
2018-10-20 15:14:12 +08:00
24 changed files with 642 additions and 1056 deletions
@@ -38,6 +38,8 @@ var/datum/paiController/paiController // Global handler for pAI candidates
var/obj/item/paicard/card = locate(href_list["device"])
if(card.pai)
return
if(usr.incapacitated() || isobserver(usr) || !card.Adjacent(usr))
return
if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate))
var/mob/living/silicon/pai/pai = new(card)
if(!candidate.name)