From 77ee2ded62a2c285ccdda4ba2fd7e64f05ef4e3e Mon Sep 17 00:00:00 2001
From: AnturK <why@so.serious>
Date: Sat, 20 Feb 2016 13:33:51 +0100
Subject: [PATCH] Renames click intercept method to avoid collision with
 ClickOn

---
 code/_onclick/ai.dm                   | 4 ++--
 code/_onclick/click.dm                | 2 +-
 code/_onclick/cyborg.dm               | 2 +-
 code/_onclick/observer.dm             | 4 ++--
 code/modules/admin/verbs/buildmode.dm | 2 +-
 code/modules/client/client defines.dm | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index e354fbbe2d4..92590a9c361 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -11,7 +11,7 @@
 */
 /mob/living/silicon/ai/DblClickOn(var/atom/A, params)
 	if(client.click_intercept)
-		if(call(client.click_intercept, "ClickOn")(src, params, A))
+		if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
 			return
 
 	if(control_disabled || stat) return
@@ -28,7 +28,7 @@
 	next_click = world.time + 1
 
 	if(client.click_intercept)
-		if(call(client.click_intercept, "ClickOn")(src, params, A))
+		if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
 			return
 
 	if(control_disabled || stat)
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 294b5361da6..0231e7b0bdd 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -54,7 +54,7 @@
 	next_click = world.time + 1
 
 	if(client.click_intercept)
-		if(call(client.click_intercept, "ClickOn")(src, params, A))
+		if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
 			return
 
 	var/list/modifiers = params2list(params)
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 3d32ee284cb..e0052ef1aaf 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -12,7 +12,7 @@
 	next_click = world.time + 1
 
 	if(client.click_intercept)
-		if(call(client.click_intercept,"ClickOn")(src,params,A))
+		if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
 			return
 
 	if(stat || lockcharge || weakened || stunned || paralysis)
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index ba3c1c05783..8f818f47a88 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -1,6 +1,6 @@
 /mob/dead/observer/DblClickOn(var/atom/A, var/params)
 	if(client.click_intercept)
-		if(call(client.click_intercept,"ClickOn")(src,params,A))
+		if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
 			return
 
 	if(can_reenter_corpse && mind && mind.current)
@@ -19,7 +19,7 @@
 /mob/dead/observer/ClickOn(var/atom/A, var/params)
 	
 	if(client.click_intercept)
-		if(call(client.click_intercept,"ClickOn")(src,params,A))
+		if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
 			return
 
 	var/list/modifiers = params2list(params)
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index bd04c75653b..ee06e3a1f8a 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -232,7 +232,7 @@
 			log_admin("[key_name(usr)] has entered build mode.")
 
 
-/datum/buildmode/proc/ClickOn(user,params,atom/object) //Click Intercept
+/datum/buildmode/proc/InterceptClickOn(user,params,atom/object) //Click Intercept
 	var/list/pa = params2list(params)
 	var/right_click = pa.Find("right")
 	var/left_click = pa.Find("left")
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index ca9ced5dc8e..c0241ba6b74 100644
--- a/code/modules/client/client defines.dm	
+++ b/code/modules/client/client defines.dm	
@@ -4,7 +4,7 @@
 		//ADMIN THINGS//
 		////////////////
 	var/datum/admins/holder = null
-	var/datum/click_intercept = null // Needs to implement ClickOn(user,params,atom) proc
+	var/datum/click_intercept = null // Needs to implement InterceptClickOn(user,params,atom) proc
 	var/AI_Interact		= 0
 
 	var/jobbancache = null //Used to cache this client's jobbans to save on DB queries