push

code/datums/action.dm

@@ -39,6 +39,7 @@
 	var/icon_icon = 'icons/mob/actions.dmi'
 	/// This is the icon state for the icon that appears on the button
 	var/button_icon_state = "default"
+	var/button_overlay_state
 
 /datum/action/New(Target)
 	link_to(Target)
@@ -177,6 +178,11 @@
 
 		ApplyIcon(button, force)
 
+	if(button_overlay_state)
+		button.cut_overlay(button.button_overlay)
+		button.button_overlay = mutable_appearance(icon = 'icons/mob/actions.dmi', icon_state = button_overlay_state)
+		button.add_overlay(button.button_overlay)
+
 	if(!IsAvailable(TRUE))
 		button.color = transparent_when_unavailable ? rgb(128,0,0,128) : rgb(128,0,0)
 	else
@@ -362,6 +368,8 @@
 
 /datum/action/item_action/set_internals
 	name = "Set Internals"
+	default_button_position = SCRN_OBJ_INSERT_FIRST
+	button_overlay_state = "ab_goldborder"
 
 /datum/action/item_action/set_internals/UpdateButton(atom/movable/screen/movable/action_button/button, status_only = FALSE, force)
 	if(!..()) // no button available

code/datums/components/combat_mode.dm

@@ -182,6 +182,7 @@
 	name = "toggle combat mode"
 	icon = 'modular_citadel/icons/ui/screen_midnight.dmi'
 	icon_state = "combat_off"
+	mouse_over_pointer = MOUSE_HAND_POINTER
 	var/mutable_appearance/flashy
 	var/combat_on = FALSE ///Wheter combat mode is enabled or not, so we don't have to store a reference.
 

code/datums/status_effects/debuffs.dm

@@ -971,6 +971,7 @@
 	desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
 	icon_state = "his_grace"
 	alerttooltipstyle = "hisgrace"
+	clickable_glow = TRUE
 
 /atom/movable/screen/alert/status_effect/strandling/Click(location, control, params)
 	. = ..()

code/datums/status_effects/wound_effects.dm

@@ -102,6 +102,7 @@
 /atom/movable/screen/alert/status_effect/wound
 	name = "Wounded"
 	desc = "Your body has sustained serious damage, click here to inspect yourself."
+	clickable_glow = TRUE
 
 /atom/movable/screen/alert/status_effect/wound/Click()
 	var/mob/living/carbon/C = usr