diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index b03e690f6a4..7ad2b3f9d71 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -552,16 +552,22 @@ return H /mob/living/silicon/pai/MouseDrop(atom/over_object) - var/mob/living/carbon/H = over_object - if(!istype(H) || !Adjacent(H) || usr != src) 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." + var/mob/living/carbon/H = over_object + if(!istype(H) || !Adjacent(H)) return ..() + if(usr == src) + 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." + else + if(Adjacent(H)) + get_scooped(H) + else + return ..() /mob/living/silicon/pai/on_forcemove(atom/newloc) if(card)