From 445b689a1de0a63b7b654b7e171d29debbb19712 Mon Sep 17 00:00:00 2001 From: Razharas Date: Wed, 4 May 2016 19:20:22 +0300 Subject: [PATCH] Removed snoflek Removed snoflek --- code/_onclick/autoclick.dm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/code/_onclick/autoclick.dm b/code/_onclick/autoclick.dm index ffed451bc7d..e3c4b4f04d0 100644 --- a/code/_onclick/autoclick.dm +++ b/code/_onclick/autoclick.dm @@ -12,15 +12,15 @@ /client/MouseUp(object, location, control, params) selected_target = null -/client/MouseDrag(src_object,over_object,src_location,over_location,src_control,over_control,params) - if(selected_target && !istype(over_object, /obj/screen)) +/client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params) + if(selected_target && over_object.IsAutoclickable()) selected_target = over_object /mob/proc/CanMobAutoclick(object, location, params) -/mob/living/CanMobAutoclick(object, location, params) - if(istype(object, /obj/screen)) - return 0 +/mob/living/carbon/CanMobAutoclick(atom/object, location, params) + if(!object.IsAutoclickable()) + return var/obj/item/h = get_active_hand() if(h) . = h.CanItemAutoclick(object, location, params) @@ -31,4 +31,13 @@ var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds /obj/item/weapon/gun/CanItemAutoclick(object, location, params) - . = automatic \ No newline at end of file + . = automatic + +/atom/proc/IsAutoclickable() + . = 1 + +/obj/screen/IsAutoclickable() + . = 0 + +/obj/screen/click_catcher/IsAutoclickable() + . = 1 \ No newline at end of file