diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 72c661f55b9..4fa1675445f 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -23,6 +23,7 @@ GLOBAL_LIST_EMPTY(radial_menus) var/choice var/next_page = FALSE var/tooltips = FALSE + var/tooltip_theme /atom/movable/screen/radial/slice/set_parent(new_value) . = ..() @@ -36,7 +37,7 @@ GLOBAL_LIST_EMPTY(radial_menus) else icon_state = "[parent.radial_slice_icon]_focus" if(tooltips) - openToolTip(usr, src, params, title = name) + openToolTip(usr, src, params, title = name, theme = tooltip_theme) if (click_on_hover && !isnull(usr) && !isnull(parent)) Click(location, control, params) @@ -260,12 +261,15 @@ GLOBAL_LIST_EMPTY(radial_menus) var/atom/movable/AM = choices_values[choice_id] //Movables only E.name = AM.name E.choice = choice_id + E.tooltip_theme = choice_datum?.tooltip_theme E.maptext = null E.next_page = FALSE if(choices_icons[choice_id]) E.add_overlay(choices_icons[choice_id]) if (choice_datum?.info) var/obj/effect/abstract/info/info_button = new(E, choice_datum.info) + info_button.name = "Info: [E.name]" + info_button.tooltip_theme = choice_datum.tooltip_theme SET_PLANE_EXPLICIT(info_button, ABOVE_HUD_PLANE, anchor) info_button.layer = RADIAL_CONTENT_LAYER E.vis_contents += info_button @@ -435,6 +439,9 @@ GLOBAL_LIST_EMPTY(radial_menus) /// If provided, will display an info button that will put this text in your chat var/info + /// If provided, changes the tooltip theme for this choice + var/tooltip_theme + /datum/radial_menu_choice/Destroy(force) . = ..() QDEL_NULL(image) diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm index 18525a8c04e..15de86aa23b 100644 --- a/code/datums/actions/action.dm +++ b/code/datums/actions/action.dm @@ -229,6 +229,8 @@ if(!button) return + button.actiontooltipstyle = buttontooltipstyle + if(update_flags & UPDATE_BUTTON_NAME) update_button_name(button, force) diff --git a/code/game/objects/effects/info.dm b/code/game/objects/effects/info.dm index adf609d50c2..c9295a090c1 100644 --- a/code/game/objects/effects/info.dm +++ b/code/game/objects/effects/info.dm @@ -7,6 +7,9 @@ /// What should the info button display when clicked? var/info_text + /// What theme should the tooltip use? + var/tooltip_theme + /obj/effect/abstract/info/Initialize(mapload, info_text) . = ..() @@ -20,6 +23,7 @@ /obj/effect/abstract/info/MouseEntered(location, control, params) . = ..() icon_state = "info_hovered" + openToolTip(usr, src, params, title = name, content = info_text, theme = tooltip_theme) /obj/effect/abstract/info/MouseExited() . = ..() diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 44c5ec8c9e6..697b1dc88c9 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -176,6 +176,7 @@ cultitem.name = item cultitem.info = span_cult_italic(options[item][RADIAL_DESC]) cultitem.image = options[item][PREVIEW_IMAGE] + cultitem.tooltip_theme = "cult" choices[item] = cultitem var/picked_choice = show_radial_menu(