Adds in returns, removes buildmode click speed limit on living mobs

code/_onclick/ai.dm

@@ -12,6 +12,7 @@
 /mob/living/silicon/ai/DblClickOn(var/atom/A, params)
 	if(client.click_intercept)
 		client.click_intercept.InterceptClickOn(src, params, A)
+		return
 
 	if(control_disabled || stat) return
 
@@ -22,12 +23,14 @@
 
 
 /mob/living/silicon/ai/ClickOn(var/atom/A, params)
+	if(client.click_intercept)
+		client.click_intercept.InterceptClickOn(src, params, A)
+		return
+
 	if(world.time <= next_click)
 		return
 	next_click = world.time + 1
 
-	if(client.click_intercept)
-		client.click_intercept.InterceptClickOn(src, params, A)
 
 	if(control_disabled || stat)
 		return

code/_onclick/click.dm

@@ -34,13 +34,14 @@
 	* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
 */
 /mob/proc/ClickOn( var/atom/A, var/params )
+	if(client.click_intercept)
+		client.click_intercept.InterceptClickOn(src, params, A)
+		return
+
 	if(world.time <= next_click)
 		return
 	next_click = world.time + 1
 
-	if(client.click_intercept)
-		client.click_intercept.InterceptClickOn(src, params, A)
-
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"] && modifiers["ctrl"])
 		CtrlShiftClickOn(A)

code/_onclick/cyborg.dm

@@ -7,12 +7,14 @@
 */
 
 /mob/living/silicon/robot/ClickOn(var/atom/A, var/params)
+	if(client.click_intercept)
+		client.click_intercept.InterceptClickOn(src, params, A)
+		return
+
 	if(world.time <= next_click)
 		return
 	next_click = world.time + 1
 
-	if(client.click_intercept)
-		client.click_intercept.InterceptClickOn(src, params, A)
 
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"] && modifiers["ctrl"])

code/_onclick/observer.dm

@@ -1,6 +1,8 @@
 /mob/dead/observer/DblClickOn(var/atom/A, var/params)
 	if(client.click_intercept)
 		client.click_intercept.InterceptClickOn(src, params, A)
+		return
+
 	if(can_reenter_corpse && mind && mind.current)
 		if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it
 			reenter_corpse()						// (cloning scanner, body bag, closet, mech, etc)
@@ -18,6 +20,7 @@
 /mob/dead/observer/ClickOn(var/atom/A, var/params)
 	if(client.click_intercept)
 		client.click_intercept.InterceptClickOn(src, params, A)
+		return
 	if(world.time <= next_move)
 		return
 

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -86,10 +86,11 @@
 	if(essence == 0)
 		src << "<span class='revendanger'>You feel your essence fraying!</span>"
 
-/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly.if(client.click_intercept)
+/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly.
 
 	if(client.click_intercept)
 		client.click_intercept.InterceptClickOn(src, params, A)
+		return
 
 	var/list/modifiers = params2list(params)
 	if(modifiers["middle"])