From bf878d9173f67c1818820ac39bc0f0c97e288211 Mon Sep 17 00:00:00 2001 From: craftxbox Date: Thu, 18 Oct 2018 17:21:47 -0230 Subject: [PATCH 1/4] add check to make sure person downloading pAI isnt dead. --- code/modules/mob/living/silicon/pai/recruit.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 07df995658e..fd775ec0168 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -36,8 +36,11 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(href_list["download"]) var/datum/paiCandidate/candidate = locate(href_list["candidate"]) var/obj/item/paicard/card = locate(href_list["device"]) + var/mob/downloader = locate(href_list["downloader"]) if(card.pai) return + if(downloader.stat == DEAD || istype(downloader,/mob/dead/observer)) + return if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate)) var/mob/living/silicon/pai/pai = new(card) if(!candidate.name) @@ -334,7 +337,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates -
Download [c.name] + Download [c.name]

From 11c5d69660a078a5f8273e7ebf598cb91b9a4374 Mon Sep 17 00:00:00 2001 From: craftxbox Date: Fri, 19 Oct 2018 00:14:08 -0230 Subject: [PATCH 2/4] remove \ref --- code/modules/mob/living/silicon/pai/recruit.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index fd775ec0168..37fe7b99fcc 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -337,7 +337,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates -
Download [c.name] + Download [c.name]

From 2a3e27e14d9f5f802d901b57895e25cb146e9aff Mon Sep 17 00:00:00 2001 From: craftxbox Date: Sat, 20 Oct 2018 01:56:01 -0230 Subject: [PATCH 3/4] use better dead checking methods. --- code/modules/mob/living/silicon/pai/recruit.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 37fe7b99fcc..8dd33a1caff 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -36,10 +36,9 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(href_list["download"]) var/datum/paiCandidate/candidate = locate(href_list["candidate"]) var/obj/item/paicard/card = locate(href_list["device"]) - var/mob/downloader = locate(href_list["downloader"]) if(card.pai) return - if(downloader.stat == DEAD || istype(downloader,/mob/dead/observer)) + if(usr.incapacitated() || isobserver(usr)) return if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate)) var/mob/living/silicon/pai/pai = new(card) @@ -337,7 +336,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates -
Download [c.name] + Download [c.name]

From 2e8c655f67e1511aa6fb406824804b9a892abe21 Mon Sep 17 00:00:00 2001 From: craftxbox Date: Sat, 20 Oct 2018 01:56:21 -0230 Subject: [PATCH 4/4] add adjacent check too. --- code/modules/mob/living/silicon/pai/recruit.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 8dd33a1caff..9dfaa8337fc 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -38,7 +38,7 @@ 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)) + 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)