changes

code/game/objects/structures/aliens.dm

@@ -269,8 +269,7 @@
 				return
 	else
 		to_chat(user, "<span class='notice'>It feels slimy.</span>")
-		user.changeNext_move(CLICK_CD_MELEE)
-
+		user.DelayNextAction(CLICK_CD_MELEE)
 
 /obj/structure/alien/egg/proc/Grow()
 	status = GROWN

code/game/objects/structures/tables_racks.dm

@@ -635,8 +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
+	attack_hand_speed = CLICK_CD_MELEE
+	attack_hand_is_action = TRUE
 
 /obj/structure/rack/examine(mob/user)
 	. = ..()

code/game/objects/structures/watercloset.dm

@@ -13,8 +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
+	attack_hand_speed = CLICK_CD_MELEE
+	attack_hand_is_action = TRUE
 
 /obj/structure/toilet/Initialize()
 	. = ..()

code/game/objects/structures/window.dm

@@ -40,8 +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
+	attack_hand_speed = CLICK_CD_MELEE
+	attack_hand_is_action = TRUE
 
 	/// Electrochromatic status
 	var/electrochromatic_status = NOT_ELECTROCHROMATIC