diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index f3ada6e48c..3b88412b94 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -23,9 +23,10 @@
 
 
 /mob/living/silicon/ai/ClickOn(var/atom/A, params)
-	if(world.time <= next_click)
+	if(!checkClickCooldown())
 		return
-	next_click = world.time + 1
+	
+	setClickCooldown(1)
 
 	if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked
 		build_click(src, client.buildmode, params, A)
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index a9de2897e8..0c99425147 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -7,9 +7,10 @@
 */
 
 /mob/living/silicon/robot/ClickOn(var/atom/A, var/params)
-	if(world.time <= next_click)
+	if(!checkClickCooldown())
 		return
-	next_click = world.time + 1
+	
+	setClickCooldown(1)
 
 	if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked
 		build_click(src, client.buildmode, params, A)
@@ -35,9 +36,6 @@
 	if(stat || lockdown || weakened || stunned || paralysis)
 		return
 
-	if(!checkClickCooldown())
-		return
-
 	face_atom(A) // change direction to face what you clicked on
 
 	if(aiCamera && aiCamera.in_camera_mode)
diff --git a/code/modules/mob/living/inventory.dm b/code/modules/mob/living/inventory.dm
index 24f36f8ac7..94c86ae2ba 100644
--- a/code/modules/mob/living/inventory.dm
+++ b/code/modules/mob/living/inventory.dm
@@ -154,10 +154,10 @@
 	set category = "Object"
 	set src = usr
 
-	if(world.time <= next_click) // This isn't really a 'click' but it'll work for our purposes.
+	if(!checkClickCooldown())
 		return
-
-	next_click = world.time + 1
+	
+	setClickCooldown(1)
 
 	if(istype(loc,/obj/mecha)) return