more

code/modules/clothing/glasses/disablerglasses.dm

@@ -4,7 +4,9 @@
 	var/beamtype = /obj/item/projectile/beam/disabler //change for adminbus
 
 /obj/item/clothing/glasses/hud/security/sunglasses/disablers/ranged_attack(mob/living/carbon/human/user,atom/A, params)
-	user.changeNext_move(CLICK_CD_RANGE)
+	if(!user.CheckActionCooldown(CLICK_CD_RANGE))
+		return
+	user.last_action = world.time
 	var/obj/item/projectile/beam/disabler/LE = new beamtype( loc )
 	playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
 	LE.firer = src
@@ -12,4 +14,4 @@
 	LE.preparePixelProjectile(A, src, params)
 	LE.fire()
 	return TRUE
-	//shamelessly copied
+	//shamelessly copied

code/modules/clothing/gloves/miscellaneous.dm

@@ -105,7 +105,7 @@
 		return
 
 	var/mob/living/M = loc
-	M.changeNext_move(CLICK_CD_RAPID)
+	M.SetNextAction(CLICK_CD_RAPID)
 	if(warcry)
 		M.say("[warcry]", ignore_spam = TRUE, forced = TRUE)
 
@@ -135,7 +135,7 @@
 	if(target.stat != CONSCIOUS) //Can't hug people who are dying/dead
 		return FALSE
 	else
-		M.changeNext_move(CLICK_CD_RAPID)
+		M.SetNextAction(CLICK_CD_RAPID)
 
 	return FALSE