Merge branch 'master' into findnreplace

code/modules/computer3/computers/law.dm

@@ -24,10 +24,11 @@
 
 
 	attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params)
-		if(is_away_level(user.z))
-			to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the station!")
-			return
 		if(istype(module, /obj/item/weapon/aiModule))
+			var/turf/T = get_turf(current)
+			if(!atoms_share_level(T, src))
+				to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the target silicon!")
+				return
 			module.install(src)
 		else
 			return ..()
@@ -60,6 +61,10 @@
 
 	attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params)
 		if(istype(module, /obj/item/weapon/aiModule))
+			var/turf/T = get_turf(current)
+			if(!atoms_share_level(T, src))
+				to_chat(user, "<span class='danger'>Unable to establish a connection</span>: You're too far away from the target silicon!")
+				return
 			module.install(src)
 		else
 			return ..()

code/modules/computer3/lapvend.dm

@@ -61,7 +61,15 @@
 		..()
 
 
-/obj/machinery/lapvend/attack_hand(mob/user as mob)
+/obj/machinery/lapvend/attack_hand(mob/user)
+	if(..())
+		return 1
+	interact(user)
+	
+/obj/machinery/lapvend/attack_ghost(mob/user)
+	interact(user)
+	
+/obj/machinery/lapvend/interact(mob/user)
 	user.set_machine(src)
 	var/vendorname = (src.name)  //import the machine's name
 	var/dat = "<TT><center><b>[vendorname]</b></center><hr /><br>" //display the name, and added a horizontal rule
@@ -133,8 +141,10 @@
 
 
 /obj/machinery/lapvend/Topic(href, href_list)
-	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
-		usr.set_machine(src)
+	if(..())
+		return 1
+		
+	usr.set_machine(src)
 	switch(href_list["choice"])
 		if("single_add")
 			cardreader = 1