mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-21 07:32:02 +00:00
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:
@@ -183,6 +183,7 @@
|
||||
user << "You turn the sign off."
|
||||
|
||||
/obj/item/weapon/caution/AltClick()
|
||||
if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr)) return
|
||||
if(src.icon_state == "caution")
|
||||
src.icon_state = "caution_blinking"
|
||||
usr << "You turn the sign on."
|
||||
|
||||
@@ -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]."
|
||||
|
||||
@@ -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]."
|
||||
|
||||
@@ -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]."
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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>"
|
||||
|
||||
Reference in New Issue
Block a user