From e93fbcd2a0a404157d7145fc279cd5be00b5a518 Mon Sep 17 00:00:00 2001
From: AnturK <why@so.serious>
Date: Tue, 9 Feb 2016 15:16:56 +0100
Subject: [PATCH] Cleanup

---
 code/__HELPERS/unsorted.dm            | 20 +++++++++++++++++++-
 code/_onclick/ai.dm                   |  4 ++--
 code/_onclick/click.dm                |  2 +-
 code/modules/admin/admin.dm           | 16 +---------------
 code/modules/admin/verbs/buildmode.dm | 27 ++-------------------------
 code/modules/client/client defines.dm |  2 +-
 6 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 7b20b42e8f3..f3c3e4ae279 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1228,4 +1228,22 @@ proc/shift_proximity(atom/checker, atom/A, range, atom/B, newrange)
 			if(closest_distance > distance)
 				closest_distance = distance
 				closest_atom = A
-	return closest_atom
\ No newline at end of file
+	return closest_atom
+
+proc/pick_closest_path(value)
+	var/list/matches = get_fancy_list_of_types()
+	if (!isnull(value) && value!="")
+		matches = filter_fancy_list(matches, value)
+
+	if(matches.len==0)
+		return
+
+	var/chosen
+	if(matches.len==1)
+		chosen = matches[1]
+	else
+		chosen = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in matches
+		if(!chosen)
+			return
+	chosen = matches[chosen]
+	return chosen
\ No newline at end of file
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index 7f526e126af..e354fbbe2d4 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, "ClickOn")(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, "ClickOn")(src, params, A))
 			return
 
 	if(control_disabled || stat)
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 423357d71f2..d500428a29f 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, "ClickOn")(src, params, A))
 			return
 
 	var/list/modifiers = params2list(params)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index f023e7de493..0672ba1437f 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -619,21 +619,7 @@ var/global/BSACooldown = 0
 	if(!check_rights(R_SPAWN))
 		return
 
-	var/list/matches = get_fancy_list_of_types()
-	if (!isnull(object) && object!="")
-		matches = filter_fancy_list(matches, object)
-
-	if(matches.len==0)
-		return
-
-	var/chosen
-	if(matches.len==1)
-		chosen = matches[1]
-	else
-		chosen = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in matches
-		if(!chosen)
-			return
-	chosen = matches[chosen]
+	var/chosen = pick_closest_path(object)
 
 	if(ispath(chosen,/turf))
 		var/turf/T = get_turf(usr.loc)
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index 6c94138ab51..bd04c75653b 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -156,25 +156,6 @@
 			user << "\blue Right Mouse Button on obj/mob = Select target to copy"
 			user << "\blue ***********************************************************"
 
-
-/datum/buildmode/proc/pick_closest_path(value)
-	var/list/matches = get_fancy_list_of_types()
-	if (!isnull(value) && value!="")
-		matches = filter_fancy_list(matches, value)
-
-	if(matches.len==0)
-		return
-
-	var/chosen
-	if(matches.len==1)
-		chosen = matches[1]
-	else
-		chosen = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in matches
-		if(!chosen)
-			return
-	chosen = matches[chosen]
-	return chosen
-
 /datum/buildmode/proc/change_settings(mob/user)
 	switch(mode)
 		if(BASIC_BUILDMODE)
@@ -237,10 +218,6 @@
 	cornerA = null
 	cornerB = null
 
-/datum/buildmode/proc/ClickOn(mob/user,params,A)
-	world << "[user] clicking on [A]. Interceptin"
-	return 1
-
 /proc/togglebuildmode(mob/M in player_list)
 	set name = "Toggle Build Mode"
 	set category = "Special Verbs"
@@ -255,7 +232,7 @@
 			log_admin("[key_name(usr)] has entered build mode.")
 
 
-/datum/buildmode/ClickOn(user,params,atom/object) //Click Intercept
+/datum/buildmode/proc/ClickOn(user,params,atom/object) //Click Intercept
 	var/list/pa = params2list(params)
 	var/right_click = pa.Find("right")
 	var/left_click = pa.Find("left")
@@ -265,7 +242,7 @@
 	. = 1
 	switch(mode)
 		if(BASIC_BUILDMODE)
-			if(istype(object,/turf) && left_click && !alt_click && !ctrl_click )
+			if(istype(object,/turf) && left_click && !alt_click && !ctrl_click)
 				var/turf/T = object
 				if(istype(object,/turf/space))
 					T.ChangeTurf(/turf/simulated/floor/plasteel)
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index 05ee9cfe3bc..ca9ced5dc8e 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/click_intercept = null // Needs to implement ClickOn(user,params,atom) proc
+	var/datum/click_intercept = null // Needs to implement ClickOn(user,params,atom) proc
 	var/AI_Interact		= 0
 
 	var/jobbancache = null //Used to cache this client's jobbans to save on DB queries