Fixes #1789 and most alt-clicking related bugs (#1808)

Fix for the alt-clicking related bugs; users being able to alt-click and
have it work regardless of distance.

code/defines/obj/weapon.dm

@@ -173,7 +173,7 @@
 	throw_range = 5
 	w_class = 2.0
 	attack_verb = list("warned", "cautioned", "smashed")
-	
+
 /obj/item/weapon/caution/attack_self(mob/user as mob)
     if(src.icon_state == "caution")
         src.icon_state = "caution_blinking"
@@ -181,14 +181,15 @@
     else
         src.icon_state = "caution"
         user << "You turn the sign off."
-        
+
 /obj/item/weapon/caution/AltClick()
-    if(src.icon_state == "caution")
+	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return
-        src.icon_state = "caution_blinking"
+	if(src.icon_state == "caution")
-        usr << "You turn the sign on."
+		src.icon_state = "caution_blinking"
-    else
+		usr << "You turn the sign on."
-        src.icon_state = "caution"
+	else
-        usr << "You turn the sign off."
+		src.icon_state = "caution"
+		usr << "You turn the sign off."
 
 /obj/item/weapon/caution/cone
 	desc = "This cone is trying to warn you of something!"
@@ -197,10 +198,10 @@
 	item_state = "cone"
 	contained_sprite = 1
 	slot_flags = SLOT_HEAD
-	
+
 /obj/item/weapon/caution/cone/attack_self(mob/user as mob)
 	return
-	
+
 /obj/item/weapon/caution/cone/AltClick()
 	return
 
@@ -427,7 +428,7 @@
 	icon = 'icons/obj/stock_parts.dmi'
 	w_class = 2.0
 	var/rating = 1
-	
+
 /obj/item/weapon/stock_parts/New()
 	src.pixel_x = rand(-5.0, 5)
 	src.pixel_y = rand(-5.0, 5)

code/game/machinery/computer/medical.dm

@@ -26,7 +26,7 @@
 	set name = "Eject ID Card"
 	set src in oview(1)
 
-	if(!usr || usr.stat || usr.lying)	return
+	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return
 
 	if(scan)
 		usr << "You remove \the [scan] from \the [src]."
@@ -499,7 +499,7 @@
 					record1 = active1
 				if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
 					record2 = active2
-				
+
 				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper()
 				var/info = "<CENTER><B>Medical Record</B></CENTER><BR>"
 				var/rname

code/game/machinery/computer/security.dm

@@ -33,7 +33,7 @@
 	set name = "Eject ID Card"
 	set src in oview(1)
 
-	if(!usr || usr.stat || usr.lying)	return
+	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return
 
 	if(scan)
 		usr << "You remove \the [scan] from \the [src]."

code/game/machinery/computer/skills.dm

@@ -42,7 +42,7 @@
 	set name = "Eject ID Card"
 	set src in oview(1)
 
-	if(!usr || usr.stat || usr.lying)	return
+	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return
 
 	if(scan)
 		usr << "You remove \the [scan] from \the [src]."

code/game/machinery/kitchen/cooking_machines/oven.dm

@@ -49,6 +49,7 @@
 
 
 /obj/machinery/appliance/cooker/oven/AltClick(var/mob/user)
+	if(user.stat || user.restrained())	return
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)//No spamming the door, it makes a sound
 	toggle_door()
 
@@ -107,4 +108,4 @@
 		combination_cook(CI)
 		return
 	else
-		..()
+		..()

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

@@ -343,6 +343,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	return id
 
 /obj/item/device/pda/AltClick(var/mob/user)
+	if(!user || user.stat || user.lying || user.restrained() || !Adjacent(user))	return
 	if (ismob(src.loc))
 		verb_remove_id()
 

code/game/objects/structures/janicart.dm

@@ -48,6 +48,7 @@
 //Altclick the cart with a mop to stow the mop away
 //Altclick the cart with a reagent container to pour things into the bucket without putting the bottle in trash
 /obj/structure/janitorialcart/AltClick()
+	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return
 	var/obj/I = usr.get_active_hand()
 	if(istype(I, /obj/item/weapon/mop))
 		if(!mymop)

code/modules/economy/ATM.dm

@@ -483,12 +483,15 @@ log transactions
 
 // put the currently held id on the ground or in the hand of the user
 /obj/machinery/atm/proc/release_held_id(mob/living/carbon/human/human_user as mob)
+
 	if (!ishuman(human_user))
 		return
 
 	if(!held_card)
 		return
 
+	if(human_user.stat || human_user.lying || human_user.restrained() || !Adjacent(human_user))	return
+
 	held_card.loc = src.loc
 	authenticated_account = null
 

code/modules/mob/living/silicon/pai/pai.dm

@@ -426,6 +426,7 @@
 	return
 
 /mob/living/silicon/pai/AltClick(mob/user as mob)
+	if(!user || user.stat || user.lying || user.restrained() || !Adjacent(user))	return
 	visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
 	close_up()
 

code/modules/reagents/reagent_containers/spray.dm

@@ -23,6 +23,7 @@
 	src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT
 
 /obj/item/weapon/reagent_containers/spray/AltClick()
+	if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr))	return
 	safety = !safety
 	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
 	usr << "<span class = 'notice'>You twist the locking cap on the end of the nozzle, the spraybottle is now [safety ? "locked" : "unlocked"].</span>"
@@ -224,4 +225,4 @@
 	if(istype(A, /obj/effect/blob)) // blob damage in blob code
 		return
 
-	..()
+	..()