From 21d36362b708b63b0d5b5efaa5bf98cb526c2e17 Mon Sep 17 00:00:00 2001
From: veganzombeh <rhys.hi96@gmail.com>
Date: Sat, 12 Sep 2015 17:51:15 +0100
Subject: [PATCH] Fixes non-pAI mousedrop

---
 code/modules/mob/living/silicon/pai/pai.dm | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

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 << "<span class='warning'>You need to stay in reaching distance to be picked up.</span>"
-		if("No")
-			src << "<span class='warning'>[H] decided not to pick you up.</span>"
+  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 << "<span class='warning'>You need to stay in reaching distance to be picked up.</span>"
+      if("No")
+        src << "<span class='warning'>[H] decided not to pick you up.</span>"
+  else
+    if(Adjacent(H))
+      get_scooped(H)
+    else
+      return ..()
 
 /mob/living/silicon/pai/on_forcemove(atom/newloc)
 	if(card)