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

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

View File

@@ -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]."

View File

@@ -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]."

View File

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

View File

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

View File

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