sigh

code/game/objects/structures/manned_turret.dm

@@ -198,10 +198,6 @@
 /obj/item/gun_control/CanItemAutoclick()
 	return TRUE
 
-/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
-	user.changeNext_move(CLICK_CD_MELEE)
-	O.attacked_by(src, user)
-
 /obj/item/gun_control/attack(mob/living/M, mob/living/user)
 	M.lastattacker = user.real_name
 	M.lastattackerckey = user.ckey

code/game/objects/structures/tables_racks.dm

@@ -635,6 +635,8 @@
 	anchored = TRUE
 	pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.
 	max_integrity = 20
+	clickdelay_attack_hand_is_action = TRUE
+	clickdelay_attack_hand_preattack_cooldown = CLICK_CD_MELEE
 
 /obj/structure/rack/examine(mob/user)
 	. = ..()
@@ -682,7 +684,6 @@
 		return
 	if(CHECK_MULTIPLE_BITFIELDS(user.mobility_flags, MOBILITY_STAND|MOBILITY_MOVE) || user.get_num_legs() < 2)
 		return
-	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src, ATTACK_EFFECT_KICK)
 	user.visible_message("<span class='danger'>[user] kicks [src].</span>", null, null, COMBAT_MESSAGE_RANGE)
 	take_damage(rand(4,8), BRUTE, "melee", 1)

code/game/objects/structures/watercloset.dm

@@ -13,6 +13,8 @@
 	var/mob/living/swirlie = null	//the mob being given a swirlie
 	var/buildstacktype = /obj/item/stack/sheet/metal //they're metal now, shut up
 	var/buildstackamount = 1
+	clickdelay_attack_hand_is_action = TRUE
+	clickdelay_attack_hand_preattack_cooldown = CLICK_CD_MELEE
 
 /obj/structure/toilet/Initialize()
 	. = ..()
@@ -31,13 +33,11 @@
 	if(.)
 		return
 	if(swirlie)
-		user.changeNext_move(CLICK_CD_MELEE)
 		playsound(src.loc, "swing_hit", 25, 1)
 		swirlie.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "<span class='userdanger'>[user] slams the toilet seat onto your head!</span>", "<span class='italics'>You hear reverberating porcelain.</span>")
 		swirlie.adjustBruteLoss(5)
 
 	else if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling))
-		user.changeNext_move(CLICK_CD_MELEE)
 		var/mob/living/GM = user.pulling
 		if(user.grab_state >= GRAB_AGGRESSIVE)
 			if(GM.loc != get_turf(src))

code/game/objects/structures/window.dm

@@ -40,6 +40,8 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	rad_flags = RAD_PROTECT_CONTENTS
 	flags_ricochet = RICOCHET_HARD
 	ricochet_chance_mod = 0.4
+	clickdelay_attack_hand_is_action = TRUE
+	clickdelay_attack_hand_preattack_cooldown = CLICK_CD_MELEE
 
 	/// Electrochromatic status
 	var/electrochromatic_status = NOT_ELECTROCHROMATIC
@@ -157,7 +159,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	return 1
 
 /obj/structure/window/attack_tk(mob/user)
-	user.changeNext_move(CLICK_CD_MELEE)
+	user.DelayNextAction(CLICK_CD_MELEE)
 	user.visible_message("<span class='notice'>Something knocks on [src].</span>")
 	add_fingerprint(user)
 	playsound(src, 'sound/effects/Glassknock.ogg', 50, 1)
@@ -173,7 +175,6 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 		return
 	if(!can_be_reached(user))
 		return
-	user.changeNext_move(CLICK_CD_MELEE)
 	user.visible_message("[user] knocks on [src].")
 	add_fingerprint(user)
 	playsound(src, 'sound/effects/Glassknock.ogg', 50, 1)
@@ -842,7 +843,6 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 		return
 	add_fingerprint(user)
 	if(user.a_intent != INTENT_HARM)
-		user.changeNext_move(CLICK_CD_MELEE)
 		user.visible_message("[user] knocks on [src].")
 		playsound(src, "pageturn", 50, 1)
 	else