d k daunkey kaung

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -200,7 +200,7 @@ Doesn't work on other aliens/AI.*/
 
 /obj/effect/proc_holder/alien/neurotoxin/update_icon()
 	action.button_icon_state = "alien_neurotoxin_[active]"
-	action.UpdateButtonIcon()
+	action.UpdateButtons()
 
 /obj/effect/proc_holder/alien/neurotoxin/InterceptClickOn(mob/living/caller, params, atom/target)
 	if(..())
@@ -333,7 +333,7 @@ Doesn't work on other aliens/AI.*/
 	for(var/X in abilities)
 		var/obj/effect/proc_holder/alien/APH = X
 		if(APH.has_action)
-			APH.action.UpdateButtonIcon()
+			APH.action.UpdateButtons()
 	return 1
 
 /mob/living/carbon/alien/adjustPlasma(amount)

code/modules/mob/living/carbon/human/innate_abilities/blobform.dm

@@ -37,7 +37,7 @@
 			to_chat(owner, "There's something stuck to your hand, stopping you from transforming!")
 			return
 	if(IsAvailable())
-		UpdateButtonIcon()
+		UpdateButtons()
 		var/mutcolor = owner.get_ability_property(INNATE_ABILITY_SLIME_BLOBFORM, PROPERTY_BLOBFORM_COLOR) || ("#" + H.dna.features["mcolor"])
 		if(!is_puddle)
 			if(CHECK_MOBILITY(H, MOBILITY_USE)) //if we can use items, we can turn into a puddle
@@ -78,7 +78,7 @@
 				owner.update_antag_overlays()
 
 				transforming = FALSE
-				UpdateButtonIcon()
+				UpdateButtons()
 		else
 			detransform()
 	else
@@ -109,4 +109,4 @@
 		squeak.RemoveComponent()
 	H.regenerate_icons()
 	transforming = FALSE
-	UpdateButtonIcon()
+	UpdateButtons()

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -480,9 +480,9 @@
 	spark_system.start()
 	do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
 	last_teleport = world.time
-	UpdateButtonIcon() //action icon looks unavailable
-	sleep(cooldown + 5)
-	UpdateButtonIcon() //action icon looks available again
+	UpdateButtons() //action icon looks unavailable
+	//action icon looks available again
+	addtimer(CALLBACK(src, .proc/UpdateButtons), cooldown + 5)
 
 
 //honk

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -82,7 +82,7 @@
 
 	var/datum/action/innate/ability/regrowth = H.ability_actions[INNATE_ABILITY_LIMB_REGROWTH]
 	if(regrowth)
-		regrowth.UpdateButtonIcon()
+		regrowth.UpdateButtons()
 
 	return FALSE // to let living/handle_blood know that the species is handling blood instead
 
@@ -472,9 +472,9 @@
 
 /datum/species/jelly/luminescent/proc/update_slime_actions()
 	integrate_extract.update_name()
-	integrate_extract.UpdateButtonIcon()
-	extract_minor.UpdateButtonIcon()
-	extract_major.UpdateButtonIcon()
+	integrate_extract.UpdateButtons()
+	extract_minor.UpdateButtons()
+	extract_major.UpdateButtons()
 
 /datum/species/jelly/luminescent/proc/update_glow(mob/living/carbon/C, intensity)
 	if(intensity)
@@ -514,7 +514,7 @@
 		name = "Eject Extract"
 		desc = "Eject your current slime extract."
 
-/datum/action/innate/integrate_extract/UpdateButtonIcon(status_only, force)
+/datum/action/innate/integrate_extract/UpdateButton(atom/movable/screen/movable/action_button/button, status_only, force)
 	if(!species || !species.current_extract)
 		button_icon_state = "slimeconsume"
 	else