From ce768eae26a738e55d76baaec0e596b74055ddc9 Mon Sep 17 00:00:00 2001 From: veganzombeh Date: Sat, 12 Sep 2015 16:14:21 +0100 Subject: [PATCH] pAIs can no longer force people on help intent to pick them up. Apparently, pAIs could force people to pick them up by dragging themselves onto a person on help intent. This adds an alert which makes it a bit more clear what's happening, and requires the person to agree, similar to the give verb. --- code/modules/mob/living/silicon/pai/pai.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 79ead634085..fbe63ccbee8 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -554,11 +554,14 @@ /mob/living/silicon/pai/MouseDrop(atom/over_object) var/mob/living/carbon/H = over_object if(!istype(H) || !Adjacent(H)) return ..() - if(H.a_intent == I_HELP) - get_scooped(H) - //return - else - return ..() + switch(alert(H,"[src] wants you to pick them up. Do it?",,"Yes","No")) + if("Yes") + if(Adjacent(H)) + get_scooped(H) + else + src << "You need to stay in reaching distance to be picked up." + if("No") + src << "[H] decided not to pick you up." /mob/living/silicon/pai/on_forcemove(atom/newloc) if(card)