Merge pull request tgstation#9817 from xxalpha/dropfixes

Fixed hacking from inside machines.

code/datums/wires/wires.dm

@@ -102,8 +102,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 
 /datum/wires/Topic(href, href_list)
 	..()
-	if(in_range(holder, usr) && isliving(usr))
-
+	if(usr.Adjacent(holder) && isliving(usr))
 		var/mob/living/L = usr
 		if(CanUse(L) && href_list["action"])
 			var/obj/item/I = L.get_active_hand()

code/game/objects/items/devices/PDA/PDA.dm

@@ -904,16 +904,16 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		else
 			var/obj/item/I = user.get_active_hand()
 			if (istype(I, /obj/item/weapon/card/id))
-				if(!user.drop_item())
+				if(!user.unEquip(I))
 					return 0
 				I.loc = src
 				id = I
 	else
 		var/obj/item/weapon/card/I = user.get_active_hand()
 		if (istype(I, /obj/item/weapon/card/id) && I:registered_name)
-			var/obj/old_id = id
-			if(!user.drop_item())
+			if(!user.unEquip(I))
 				return 0
+			var/obj/old_id = id
 			I.loc = src
 			id = I
 			user.put_in_hands(old_id)
@@ -924,7 +924,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	..()
 	if(istype(C, /obj/item/weapon/cartridge) && !cartridge)
 		cartridge = C
-		if(!user.drop_item())
+		if(!user.unEquip(C))
 			return
 		cartridge.loc = src
 		user << "<span class='notice'>You insert [cartridge] into [src].</span>"
@@ -952,7 +952,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			return	//Return in case of failed check or when successful.
 		updateSelfDialog()//For the non-input related code.
 	else if(istype(C, /obj/item/device/paicard) && !src.pai)
-		if(!user.drop_item())
+		if(!user.unEquip(C))
 			return
 		C.loc = src
 		pai = C
@@ -963,7 +963,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if(O)
 			user << "<span class='warning'>There is already a pen in \the [src]!</span>"
 		else
-			if(!user.drop_item())
+			if(!user.unEquip(C))
 				return
 			C.loc = src
 			user << "<span class='notice'>You slide \the [C] into \the [src].</span>"

code/modules/recycling/disposal.dm

@@ -590,7 +590,7 @@
 	return
 
 /obj/structure/disposalholder/allow_drop()
-	return 0
+	return 1
 
 // Disposal pipes