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.
This commit is contained in:
Ryan784
2017-02-24 12:30:09 -05:00
committed by skull132
parent 54b64c3688
commit a52092b294
10 changed files with 26 additions and 17 deletions

View File

@@ -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

View File

@@ -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()

View File

@@ -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
..()
..()