diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index 5fc15d8e800..8a377d6706b 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -45,14 +45,12 @@
 /datum/middle_click_override/shock_implant
 
 /datum/middle_click_override/shock_implant/onClick(atom/A, mob/living/carbon/human/user)
-	if(A == user || user.a_intent == INTENT_HELP || user.a_intent == INTENT_GRAB)
-		return FALSE
-	if(user.incapacitated())
+	if(user.incapacitated() || A == user)
 		return FALSE
 	var/obj/item/bio_chip/shock/P = locate() in user
 	if(!P)
 		return
-	if(world.time < P.last_shocked + P.shock_delay)
+	if(!COOLDOWN_FINISHED(P, last_shocked))
 		to_chat(user, "<span class='warning'>The powerchip is still recharging.</span>")
 		return FALSE
 	var/turf/T = get_turf(user)
@@ -76,7 +74,7 @@
 		if(isliving(target_atom))
 			var/mob/living/L = target_atom
 			var/powergrid = C.get_available_power() //We want available power, so the station being conservative doesn't mess with the power biochip / dark bundle users
-			if(user.a_intent == INTENT_DISARM)
+			if(user.a_intent == INTENT_DISARM || user.a_intent == INTENT_HELP)
 				add_attack_logs(user, L, "shocked with power bio-chip.")
 				L.apply_damage(60, STAMINA)
 				L.Jitter(10 SECONDS)
@@ -110,7 +108,7 @@
 		A = target_atom
 		next_shocked.Cut()
 
-	P.last_shocked = world.time
+	COOLDOWN_START(P, last_shocked, P.shock_delay)
 	return TRUE
 
 /**
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index 212d52e21ca..214ba14e43e 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -218,7 +218,7 @@
 	name = "Power Bio-Chip"
 	desc = "A Bio-Chip that can utilize the power of the station to deliver a short arc of electricity at a target. \
 			Must be standing on a powered cable to use. \
-			Activated by alt-clicking, or pressing the middle mouse button. Disarm intent will deal stamina damage and cause jittering, while harm intent will deal damage based on the power of the cable you're standing on. Can be toggled on / off via the action button."
+			Activated by alt-clicking, or pressing the middle mouse button. Help/disarm intent will deal stamina damage and cause jittering, while harm/grab intent will deal damage based on the power of the cable you're standing on. Can be toggled on / off via the action button."
 	reference = "PG"
 	item = /obj/item/bio_chip_implanter/shock
 	cost = 50
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm
index dc68dfcb004..ff1be3e1419 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm
@@ -6,10 +6,10 @@
 	origin_tech = "combat=5;magnets=3;biotech=4;syndicate=2"
 	implant_data = /datum/implant_fluff/shock
 	implant_state = "implant-syndicate"
-	var/enabled = TRUE
+	var/enabled = FALSE
 	var/old_mclick_override
 	var/datum/middle_click_override/shock_implant/mclick_override = new /datum/middle_click_override/shock_implant
-	var/last_shocked = 0
+	COOLDOWN_DECLARE(last_shocked)
 	var/shock_delay = 3 SECONDS
 	var/unlimited_power = FALSE // Does this really need explanation?
 	var/shock_range = 7