diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index d6136f765d699..59130d972134d 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -457,7 +457,7 @@ transform = M /atom/movable/screen/click_catcher - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "catcher" plane = CLICKCATCHER_PLANE mouse_opacity = MOUSE_OPACITY_OPAQUE @@ -467,7 +467,7 @@ #define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose. /atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15) - var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher") + var/icon/newicon = icon('icons/hud/screen_gen.dmi', "catcher") var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x) var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y) var/px = view_size_x * world.icon_size diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 390a399b04a18..6c4f40becf29c 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -71,10 +71,10 @@ /atom/movable/screen/movable/action_button/hide_toggle name = "Hide Buttons" desc = "Shift-click any button to reset its position, and Control-click it to lock it in place. Alt-click this button to reset all buttons to their default positions." - icon = 'icons/mob/actions.dmi' + icon = 'icons/hud/actions/action_generic.dmi' icon_state = "bg_default" var/hidden = FALSE - var/hide_icon = 'icons/mob/actions.dmi' + var/hide_icon = 'icons/hud/actions/action_generic.dmi' var/hide_state = "hide" var/show_state = "show" var/mutable_appearance/hide_appearance @@ -176,7 +176,7 @@ .["bg_state"] = "template" //TODO : Make these fit theme - .["toggle_icon"] = 'icons/mob/actions.dmi' + .["toggle_icon"] = 'icons/hud/actions/action_generic.dmi' .["toggle_hide"] = "hide" .["toggle_show"] = "show" diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index 9d70c7db0c168..354bf1ff60d58 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -1,5 +1,5 @@ /atom/movable/screen/ai - icon = 'icons/mob/screen_ai.dmi' + icon = 'icons/hud/screen_ai.dmi' /atom/movable/screen/ai/Click() if(isobserver(usr) || usr.incapacitated()) @@ -201,7 +201,7 @@ upwards = FALSE /datum/hud/ai - ui_style = 'icons/mob/screen_ai.dmi' + ui_style = 'icons/hud/screen_ai.dmi' /datum/hud/ai/New(mob/owner) ..() diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 9ade1b296467e..dd5f5e8722411 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -88,7 +88,7 @@ qdel(alert) /atom/movable/screen/alert - icon = 'icons/mob/screen_alert.dmi' + icon = 'icons/hud/screen_alert.dmi' icon_state = "default" name = "Alert" desc = "Something seems to have gone wrong with this alert, so report this bug please" @@ -388,7 +388,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /atom/movable/screen/alert/bloodsense/Initialize(mapload) . = ..() - narnar = new('icons/mob/screen_alert.dmi', "mini_nar") + narnar = new('icons/hud/screen_alert.dmi', "mini_nar") START_PROCESSING(SSprocessing, src) /atom/movable/screen/alert/bloodsense/Destroy() diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm index 8343a4a1ba534..cc01f91e5bf10 100644 --- a/code/_onclick/hud/alien.dm +++ b/code/_onclick/hud/alien.dm @@ -1,5 +1,5 @@ /atom/movable/screen/alien - icon = 'icons/mob/screen_alien.dmi' + icon = 'icons/hud/screen_alien.dmi' /atom/movable/screen/alien/leap name = "toggle leap" @@ -11,21 +11,21 @@ AH.toggle_leap() /atom/movable/screen/alien/plasma_display - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "power_display2" name = "plasma stored" screen_loc = ui_alienplasmadisplay /atom/movable/screen/alien/alien_queen_finder - icon = 'icons/mob/screen_alien.dmi' + icon = 'icons/hud/screen_alien.dmi' icon_state = "queen_finder" name = "queen sense" desc = "Allows you to sense the general direction of your Queen." screen_loc = ui_alien_queen_finder /datum/hud/alien - ui_style = 'icons/mob/screen_alien.dmi' + ui_style = 'icons/hud/screen_alien.dmi' /datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner) ..() diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index b12f5503a60b9..6fcf06804b97d 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -1,5 +1,5 @@ /datum/hud/larva - ui_style = 'icons/mob/screen_alien.dmi' + ui_style = 'icons/hud/screen_alien.dmi' /datum/hud/larva/New(mob/owner) ..() @@ -20,7 +20,7 @@ infodisplay += alien_queen_finder pull_icon = new /atom/movable/screen/pull() - pull_icon.icon = 'icons/mob/screen_alien.dmi' + pull_icon.icon = 'icons/hud/screen_alien.dmi' pull_icon.update_icon() pull_icon.screen_loc = ui_above_movement pull_icon.hud = src diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index adf475806cfb0..2e418f87f3f4c 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -1,6 +1,6 @@ /atom/movable/screen/blob - icon = 'icons/mob/blob.dmi' + icon = 'icons/hud/actions/actions_blob.dmi' /atom/movable/screen/blob/MouseEntered(location,control,params) openToolTip(usr,src,params,title = name,content = desc, theme = "blob") diff --git a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm index 9a5babbdb8bed..bee898ea489c8 100644 --- a/code/_onclick/hud/constructs.dm +++ b/code/_onclick/hud/constructs.dm @@ -1,5 +1,5 @@ /datum/hud/constructs - ui_style = 'icons/mob/screen_construct.dmi' + ui_style = 'icons/hud/screen_construct.dmi' /datum/hud/constructs/New(mob/owner) ..() diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index acb1d23879d78..837371ed07780 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -60,7 +60,7 @@ client.screen -= screen /atom/movable/screen/fullscreen - icon = 'icons/mob/screen_full.dmi' + icon = 'icons/hud/fullscreen/screen_full.dmi' icon_state = "default" screen_loc = "CENTER-7,CENTER-7" layer = FULLSCREEN_LAYER @@ -134,27 +134,27 @@ icon_state = "impairedoverlay" /atom/movable/screen/fullscreen/flash - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" /atom/movable/screen/fullscreen/flash/black - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "black" /atom/movable/screen/fullscreen/flash/static - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "noise" /atom/movable/screen/fullscreen/high - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "druggy" /atom/movable/screen/fullscreen/color_vision - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" alpha = 80 @@ -169,7 +169,7 @@ color = "#0000ff" /atom/movable/screen/fullscreen/lighting_backdrop - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "flash" transform = matrix(200, 0, 0, 0, 200, 0) plane = LIGHTING_PLANE @@ -216,7 +216,7 @@ /atom/movable/screen/fullscreen/blind_context_disable/Initialize(mapload) . = ..() - var/icon/mask = icon('icons/mob/psychic.dmi', "click_mask") + var/icon/mask = icon('icons/hud/fullscreen/psychic.dmi', "click_mask") add_filter("click_mask", 1, alpha_mask_filter(icon = mask, flags = MASK_INVERSE)) /atom/movable/screen/fullscreen/blind_context_disable/Destroy() diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index 64edf2e0ac5a4..1de39cd0ae2e8 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -1,5 +1,5 @@ /atom/movable/screen/ghost - icon = 'icons/mob/screen_ghost.dmi' + icon = 'icons/hud/screen_ghost.dmi' /atom/movable/screen/ghost/MouseEntered() flick(icon_state + "_anim", src) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 69a1d6c6b21a7..b491b22a93c90 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -6,13 +6,13 @@ // The default UI style is the first one in the list GLOBAL_LIST_INIT(available_ui_styles, list( - "Midnight" = 'icons/mob/screen_midnight.dmi', - "Plasmafire" = 'icons/mob/screen_plasmafire.dmi', - "Slimecore" = 'icons/mob/screen_slimecore.dmi', - "Operative" = 'icons/mob/screen_operative.dmi', - "Clockwork" = 'icons/mob/screen_clockwork.dmi', - "Trasen-Knox" = 'icons/mob/screen_trasenknox.dmi', - "Retro" = 'icons/mob/screen_retro.dmi' + "Midnight" = 'icons/hud/style/screen_midnight.dmi', + "Plasmafire" = 'icons/hud/style/screen_plasmafire.dmi', + "Slimecore" = 'icons/hud/style/screen_slimecore.dmi', + "Operative" = 'icons/hud/style/screen_operative.dmi', + "Clockwork" = 'icons/hud/style/screen_clockwork.dmi', + "Trasen-Knox" = 'icons/hud/style/screen_trasenknox.dmi', + "Retro" = 'icons/hud/style/screen_retro.dmi' )) /proc/ui_style2icon(ui_style) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 38e20f995b21b..19a4c6346b969 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -1,5 +1,5 @@ /atom/movable/screen/human - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' /atom/movable/screen/human/toggle name = "toggle" @@ -35,7 +35,7 @@ invisibility = INVISIBILITY_ABSTRACT /atom/movable/screen/devil/soul_counter - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' name = "souls owned" icon_state = "Devil-6" screen_loc = ui_devilsouldisplay diff --git a/code/_onclick/hud/lavaland_elite.dm b/code/_onclick/hud/lavaland_elite.dm index 81cbb4174827e..526e48ba87ba0 100644 --- a/code/_onclick/hud/lavaland_elite.dm +++ b/code/_onclick/hud/lavaland_elite.dm @@ -1,5 +1,5 @@ /datum/hud/lavaland_elite - ui_style = 'icons/mob/screen_slime.dmi' + ui_style = 'icons/hud/screen_slime.dmi' /datum/hud/lavaland_elite/New(mob/living/simple_animal/hostile/asteroid/elite) ..() diff --git a/code/_onclick/hud/minebot.dm b/code/_onclick/hud/minebot.dm index 6de36dc459eab..deeede01cd7ae 100644 --- a/code/_onclick/hud/minebot.dm +++ b/code/_onclick/hud/minebot.dm @@ -1,5 +1,5 @@ /datum/hud/minebot - ui_style = 'icons/mob/screen_cyborg.dmi' + ui_style = 'icons/hud/screen_cyborg.dmi' /datum/hud/minebot/New(mob/living/simple_animal/hostile/mining_drone) ..() diff --git a/code/_onclick/hud/pai.dm b/code/_onclick/hud/pai.dm index 2afd8a2b069eb..e6b01c2563170 100644 --- a/code/_onclick/hud/pai.dm +++ b/code/_onclick/hud/pai.dm @@ -1,7 +1,7 @@ #define PAI_MISSING_SOFTWARE_MESSAGE "You must download the required software to use this." /atom/movable/screen/pai - icon = 'icons/mob/screen_pai.dmi' + icon = 'icons/hud/screen_pai.dmi' var/required_software /atom/movable/screen/pai/Click() @@ -168,7 +168,7 @@ /atom/movable/screen/pai/radio name = "radio" - icon = 'icons/mob/screen_cyborg.dmi' + icon = 'icons/hud/screen_cyborg.dmi' icon_state = "radio" /atom/movable/screen/pai/radio/Click() diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 19bf15624cf23..aabadeb99dea9 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(radial_menus) /atom/movable/screen/radial - icon = 'icons/mob/radial.dmi' + icon = 'icons/hud/radials/radial_generic.dmi' appearance_flags = APPEARANCE_UI_IGNORE_ALPHA plane = ABOVE_HUD_PLANE var/datum/radial_menu/parent diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index dc1f9a4be5253..04b64b106564e 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -1,5 +1,5 @@ /atom/movable/screen/robot - icon = 'icons/mob/screen_cyborg.dmi' + icon = 'icons/hud/screen_cyborg.dmi' /atom/movable/screen/robot/module name = "cyborg module" @@ -69,7 +69,7 @@ R.uneq_active() /datum/hud/robot - ui_style = 'icons/mob/screen_cyborg.dmi' + ui_style = 'icons/hud/screen_cyborg.dmi' /datum/hud/robot/New(mob/owner) ..() @@ -168,7 +168,7 @@ module_store_icon.hud = src pull_icon = new /atom/movable/screen/pull() - pull_icon.icon = 'icons/mob/screen_cyborg.dmi' + pull_icon.icon = 'icons/hud/screen_cyborg.dmi' pull_icon.screen_loc = ui_borg_pull pull_icon.hud = src pull_icon.update_icon() @@ -303,7 +303,7 @@ /atom/movable/screen/robot/alerts name = "Alert Panel" - icon = 'icons/mob/screen_ai.dmi' + icon = 'icons/hud/screen_ai.dmi' icon_state = "alerts" /atom/movable/screen/robot/alerts/Click() @@ -315,7 +315,7 @@ /atom/movable/screen/robot/crew_manifest name = "Crew Manifest" - icon = 'icons/mob/screen_ai.dmi' + icon = 'icons/hud/screen_ai.dmi' icon_state = "manifest" /atom/movable/screen/robot/crew_manifest/Click() diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 734cc2645047f..567c41d56bd00 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -9,7 +9,7 @@ /atom/movable/screen name = "" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' plane = HUD_PLANE animate_movement = SLIDE_STEPS speech_span = SPAN_ROBOT @@ -70,13 +70,13 @@ /atom/movable/screen/craft name = "crafting menu" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "craft" screen_loc = ui_crafting /atom/movable/screen/area_creator name = "create new area" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "area_edit" screen_loc = ui_building @@ -91,7 +91,7 @@ /atom/movable/screen/language_menu name = "language menu" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "talk_wheel" screen_loc = ui_language_menu @@ -178,7 +178,7 @@ /atom/movable/screen/inventory/hand var/mutable_appearance/handcuff_overlay - var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "blocked") + var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/hud/screen_gen.dmi', "blocked") var/held_index = 0 /atom/movable/screen/inventory/hand/update_overlays() @@ -186,7 +186,7 @@ if(!handcuff_overlay) var/state = (!(held_index % 2)) ? "markus" : "gabrielle" - handcuff_overlay = mutable_appearance('icons/mob/screen_gen.dmi', state) + handcuff_overlay = mutable_appearance('icons/hud/screen_gen.dmi', state) if(!hud?.mymob) return @@ -248,7 +248,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) /atom/movable/screen/drop name = "drop" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "act_drop" plane = HUD_PLANE @@ -289,11 +289,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) return ..() /atom/movable/screen/act_intent/alien - icon = 'icons/mob/screen_alien.dmi' + icon = 'icons/hud/screen_alien.dmi' screen_loc = ui_movi /atom/movable/screen/act_intent/robot - icon = 'icons/mob/screen_cyborg.dmi' + icon = 'icons/hud/screen_cyborg.dmi' screen_loc = ui_borg_intents /atom/movable/screen/internals @@ -365,7 +365,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) /atom/movable/screen/mov_intent name = "run/walk toggle" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "running" /atom/movable/screen/mov_intent/Click() @@ -386,7 +386,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) /atom/movable/screen/pull name = "stop pulling" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "pull" /atom/movable/screen/pull/Click() @@ -403,7 +403,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) /atom/movable/screen/resist name = "resist" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "act_resist" plane = HUD_PLANE @@ -414,7 +414,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/close) /atom/movable/screen/rest name = "rest" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "act_rest" plane = HUD_PLANE @@ -456,7 +456,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) /atom/movable/screen/throw_catch name = "throw/catch" - icon = 'icons/mob/screen_midnight.dmi' + icon = 'icons/hud/style/screen_midnight.dmi' icon_state = "act_throw_off" /atom/movable/screen/throw_catch/Click() @@ -511,7 +511,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) vis_contents += overlay_object /obj/effect/overlay/zone_sel - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' mouse_opacity = MOUSE_OPACITY_TRANSPARENT alpha = 128 anchored = TRUE @@ -575,22 +575,22 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) /atom/movable/screen/zone_sel/update_icon() . = ..() cut_overlay(selecting_appearance) - selecting_appearance = mutable_appearance('icons/mob/screen_gen.dmi', "[selecting]") + selecting_appearance = mutable_appearance('icons/hud/screen_gen.dmi', "[selecting]") add_overlay(selecting_appearance) hud?.mymob?._set_zone_selected(selecting) /atom/movable/screen/zone_sel/alien - icon = 'icons/mob/screen_alien.dmi' + icon = 'icons/hud/screen_alien.dmi' /atom/movable/screen/zone_sel/alien/update_icon() . = ..() cut_overlay(selecting_appearance) - selecting_appearance = mutable_appearance('icons/mob/screen_alien.dmi', "[selecting]") + selecting_appearance = mutable_appearance('icons/hud/screen_alien.dmi', "[selecting]") add_overlay(selecting_appearance) hud?.mymob?._set_zone_selected(selecting) /atom/movable/screen/zone_sel/robot - icon = 'icons/mob/screen_cyborg.dmi' + icon = 'icons/hud/screen_cyborg.dmi' /atom/movable/screen/flash @@ -602,7 +602,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) plane = FULLSCREEN_PLANE /atom/movable/screen/damageoverlay - icon = 'icons/mob/screen_full.dmi' + icon = 'icons/hud/fullscreen/screen_full.dmi' icon_state = "oxydamageoverlay0" name = "dmg" blend_mode = BLEND_MULTIPLY @@ -617,15 +617,15 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) screen_loc = ui_health /atom/movable/screen/healths/alien - icon = 'icons/mob/screen_alien.dmi' + icon = 'icons/hud/screen_alien.dmi' screen_loc = ui_alien_health /atom/movable/screen/healths/robot - icon = 'icons/mob/screen_cyborg.dmi' + icon = 'icons/hud/screen_cyborg.dmi' screen_loc = ui_borg_health /atom/movable/screen/healths/minebot - icon = 'icons/mob/screen_cyborg.dmi' + icon = 'icons/hud/screen_cyborg.dmi' screen_loc = ui_health /atom/movable/screen/healths/blob @@ -645,7 +645,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) icon_state = "corehealth" /atom/movable/screen/healths/clock - icon = 'icons/mob/actions.dmi' + icon = 'icons/hud/actions/action_generic.dmi' icon_state = "bg_clock" screen_loc = ui_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT @@ -657,25 +657,25 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/storage) /atom/movable/screen/healths/revenant name = "essence" - icon = 'icons/mob/actions.dmi' + icon = 'icons/hud/actions/action_generic.dmi' icon_state = "bg_revenant" screen_loc = ui_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT /atom/movable/screen/healths/construct - icon = 'icons/mob/screen_construct.dmi' + icon = 'icons/hud/screen_construct.dmi' icon_state = "artificer_health0" screen_loc = ui_construct_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT /atom/movable/screen/healths/slime - icon = 'icons/mob/screen_slime.dmi' + icon = 'icons/hud/screen_slime.dmi' icon_state = "slime_health0" screen_loc = ui_slime_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT /atom/movable/screen/healths/lavaland_elite - icon = 'icons/mob/screen_elite.dmi' + icon = 'icons/hud/screen_elite.dmi' icon_state = "elite_health0" screen_loc = ui_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/_onclick/hud/slime.dm b/code/_onclick/hud/slime.dm index 72b759378623a..35845b64a24ec 100644 --- a/code/_onclick/hud/slime.dm +++ b/code/_onclick/hud/slime.dm @@ -1,5 +1,5 @@ /datum/hud/slime - ui_style = 'icons/mob/screen_slime.dmi' + ui_style = 'icons/hud/screen_slime.dmi' /datum/hud/slime/New(mob/living/simple_animal/slime/owner) ..() diff --git a/code/datums/action.dm b/code/datums/action.dm index 23f7128358ee0..53d4359d77f1e 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -8,10 +8,10 @@ var/buttontooltipstyle = "" var/transparent_when_unavailable = TRUE - var/button_icon = 'icons/mob/actions/backgrounds.dmi' //This is the file for the BACKGROUND icon + var/button_icon = 'icons/hud/actions/backgrounds.dmi' //This is the file for the BACKGROUND icon var/background_icon_state = ACTION_BUTTON_DEFAULT_BACKGROUND //And this is the state for the background icon - var/icon_icon = 'icons/mob/actions.dmi' //This is the file for the ACTION icon + var/icon_icon = 'icons/hud/actions/action_generic.dmi' //This is the file for the ACTION icon var/button_icon_state = "default" //And this is the state for the action icon var/mob/owner @@ -211,12 +211,12 @@ /datum/action/item_action/rcl_col name = "Change Cable Color" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "rcl_rainbow" /datum/action/item_action/rcl_gui name = "Toggle Fast Wiring Gui" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "rcl_gui" /datum/action/item_action/startchainsaw @@ -289,7 +289,7 @@ /datum/action/item_action/toggle_spacesuit name = "Toggle Suit Thermal Regulator" - icon_icon = 'icons/mob/actions/actions_spacesuit.dmi' + icon_icon = 'icons/hud/actions/actions_spacesuit.dmi' button_icon_state = "thermal_off" /datum/action/item_action/toggle_spacesuit/New(Target) @@ -314,7 +314,7 @@ /datum/action/item_action/toggle_unfriendly_fire name = "Toggle Friendly Fire \[ON\]" desc = "Toggles if the club's blasts cause friendly fire." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "vortex_ff_on" /datum/action/item_action/toggle_unfriendly_fire/Trigger() @@ -335,7 +335,7 @@ /datum/action/item_action/vortex_recall name = "Vortex Recall" desc = "Recall yourself, and anyone nearby, to an attuned hierophant beacon at any time.
If the beacon is still attached, will detach it." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "vortex_recall" /datum/action/item_action/vortex_recall/IsAvailable() @@ -363,12 +363,12 @@ /datum/action/item_action/toggle_beacon name = "Toggle Hardsuit Locator Beacon" - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/hud/actions/action_generic.dmi' button_icon_state = "toggle-transmission" /datum/action/item_action/toggle_beacon_hud name = "Toggle Hardsuit Locator HUD" - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/hud/actions/action_generic.dmi' button_icon_state = "toggle-hud" /datum/action/item_action/toggle_beacon_hud/explorer @@ -376,7 +376,7 @@ /datum/action/item_action/toggle_beacon_frequency name = "Toggle Hardsuit Locator Frequency" - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/hud/actions/action_generic.dmi' button_icon_state = "change-code" /datum/action/item_action/crew_monitor @@ -453,7 +453,7 @@ /datum/action/item_action/toggle_research_scanner name = "Toggle Research Scanner" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "scan_mode" var/active = FALSE @@ -510,7 +510,7 @@ /datum/action/item_action/cult_dagger name = "Draw Blood Rune" desc = "Use the ritual dagger to create a powerful blood rune" - icon_icon = 'icons/mob/actions/actions_cult.dmi' + icon_icon = 'icons/hud/actions/actions_cult.dmi' button_icon_state = "draw" buttontooltipstyle = "cult" background_icon_state = "bg_demon" @@ -549,7 +549,7 @@ desc = "Find inner peace, here, in the box." check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED|AB_CHECK_CONSCIOUS background_icon_state = "bg_agent" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "deploy_box" ///The type of closet this action spawns. var/boxtype = /obj/structure/closet/cardboard/agent @@ -708,14 +708,14 @@ /datum/action/item_action/stickmen name = "Summon Stick Minions" desc = "Allows you to summon faithful stickmen allies to aide you in battle." - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "art_summon" //surf_ss13 /datum/action/item_action/bhop name = "Activate Jump Boots" desc = "Activates the jump boot's internal propulsion system, allowing the user to dash over 4-wide gaps." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "jetboot" /datum/action/language_menu @@ -735,20 +735,20 @@ /datum/action/item_action/wheelys name = "Toggle Wheely-Heel's Wheels" desc = "Pops out or in your wheely-heel's wheels." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "wheelys" /datum/action/item_action/kindleKicks name = "Activate Kindle Kicks" desc = "Kick you feet together, activating the lights in your Kindle Kicks." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "kindleKicks" //Small sprites /datum/action/small_sprite name = "Toggle Giant Sprite" desc = "Others will always see you as giant." - icon_icon = 'icons/mob/actions/actions_xeno.dmi' + icon_icon = 'icons/hud/actions/actions_xeno.dmi' button_icon_state = "smallqueen" background_icon_state = "bg_alien" var/small = FALSE @@ -760,7 +760,7 @@ small_icon_state = "alienq" /datum/action/small_sprite/megafauna - icon_icon = 'icons/mob/actions/actions_xeno.dmi' + icon_icon = 'icons/hud/actions/actions_xeno.dmi' small_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' /datum/action/small_sprite/megafauna/drake @@ -805,7 +805,7 @@ /datum/action/item_action/storage_gather_mode name = "Switch gathering mode" desc = "Switches the gathering mode of a storage object." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "storage_gather_switch" /datum/action/item_action/storage_gather_mode/ApplyIcon(atom/movable/screen/movable/action_button/current_button) diff --git a/code/datums/actions/beam_rifle.dm b/code/datums/actions/beam_rifle.dm index 3af5d13690d08..46322963af4fb 100644 --- a/code/datums/actions/beam_rifle.dm +++ b/code/datums/actions/beam_rifle.dm @@ -1,12 +1,12 @@ /datum/action/item_action/zoom_speed_action name = "Toggle Zooming Speed" - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' button_icon_state = "projectile" background_icon_state = "bg_tech" /datum/action/item_action/zoom_lock_action name = "Switch Zoom Mode" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "zoom_mode" background_icon_state = "bg_tech" diff --git a/code/datums/actions/ninja.dm b/code/datums/actions/ninja.dm index b655078349dc7..dae0961d8d27e 100644 --- a/code/datums/actions/ninja.dm +++ b/code/datums/actions/ninja.dm @@ -5,20 +5,20 @@ name = "Smoke Bomb" desc = "Blind your enemies momentarily with a well-placed smoke bomb." button_icon_state = "smoke" - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' /datum/action/item_action/ninjaboost check_flags = NONE name = "Adrenaline Boost" desc = "Inject a secret chemical that will counteract all movement-impairing effect." button_icon_state = "repulse" - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' /datum/action/item_action/ninjapulse name = "EM Burst (25E)" desc = "Disable any nearby technology with an electro-magnetic pulse." button_icon_state = "emp" - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' /datum/action/item_action/ninjastar name = "Create Throwing Stars (1E)" @@ -42,7 +42,7 @@ name = "Toggle Stealth" desc = "Toggles stealth mode on and off." button_icon_state = "ninja_cloak" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' /datum/action/item_action/toggle_glove name = "Toggle interaction" diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm index 49a93f0538daf..7350c0ca47e49 100644 --- a/code/datums/ai/dog/dog_controller.dm +++ b/code/datums/ai/dog/dog_controller.dm @@ -163,7 +163,7 @@ /datum/ai_controller/dog/proc/command_radial(mob/living/clicker) var/list/commands = list( COMMAND_HEEL = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow"), - COMMAND_FETCH = image(icon = 'icons/mob/actions/actions_spells.dmi', icon_state = "summons"), + COMMAND_FETCH = image(icon = 'icons/hud/actions/actions_spells.dmi', icon_state = "summons"), COMMAND_ATTACK = image(icon = 'icons/effects/effects.dmi', icon_state = "bite"), COMMAND_DIE = image(icon = 'icons/mob/pets.dmi', icon_state = "puppy_dead") ) diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 33a6eec70573d..94796659f8bc9 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -247,7 +247,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend) var/turf/our_tile = get_turf(src) var/turf/tile = get_turf(A) - var/image/arrow = image(icon = 'icons/mob/screen_gen.dmi', loc = our_tile, icon_state = "arrow") + var/image/arrow = image(icon = 'icons/hud/screen_gen.dmi', loc = our_tile, icon_state = "arrow") arrow.plane = POINT_PLANE animate(arrow, pixel_x = (tile.x - our_tile.x) * world.icon_size + A.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + A.pixel_y, time = 1.7, easing = EASE_OUT) owner?.client?.images += arrow @@ -263,7 +263,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend) /datum/action/innate/imaginary_join name = "Join" desc = "Join your owner, following them from inside their mind." - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' background_icon_state = "bg_revenant" button_icon_state = "join" @@ -274,7 +274,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend) /datum/action/innate/imaginary_hide name = "Hide" desc = "Hide yourself from your owner's sight." - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' background_icon_state = "bg_revenant" button_icon_state = "hide" diff --git a/code/datums/brain_damage/mrat.dm b/code/datums/brain_damage/mrat.dm index be0925b5f3043..d93a5a35372fe 100644 --- a/code/datums/brain_damage/mrat.dm +++ b/code/datums/brain_damage/mrat.dm @@ -144,7 +144,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend/mrat) /datum/action/innate/mrat_costume name = "Change Appearance" desc = "Shape your appearance to whatever you desire." - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' background_icon_state = "bg_revenant" button_icon_state = "ninja_phase" @@ -157,7 +157,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend/mrat) /datum/action/innate/mrat_leave name = "Leave" desc = "Leave and return to your ghost form." - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' background_icon_state = "bg_revenant" button_icon_state = "beam_up" @@ -174,7 +174,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/imaginary_friend/mrat) /datum/action/innate/mrat_kick name = "Remove Mentor" desc = "Removes your mentor." - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' background_icon_state = "bg_revenant" button_icon_state = "beam_up" var/mob/camera/imaginary_friend/mrat/friend diff --git a/code/datums/components/aiming.dm b/code/datums/components/aiming.dm index aa254eabdf982..de472870c0740 100644 --- a/code/datums/components/aiming.dm +++ b/code/datums/components/aiming.dm @@ -192,7 +192,7 @@ AIMING_DROP_WEAPON means they selected the "drop your weapon" command if(holding_at_gunpoint) possible_actions += LET_GO for(var/option in possible_actions) - options[option] = image(icon = 'icons/effects/aiming.dmi', icon_state = option) + options[option] = image(icon = 'icons/hud/radials/radial_aiming.dmi', icon_state = option) if(choice_menu) choice_menu.change_choices(options) return @@ -329,7 +329,7 @@ AIMING_DROP_WEAPON means they selected the "drop your weapon" command return var/list/options = list() for(var/option in list(SURRENDER, IGNORE)) - options[option] = image(icon = 'icons/effects/aiming.dmi', icon_state = option) + options[option] = image(icon = 'icons/hud/radials/radial_aiming.dmi', icon_state = option) choice_menu_target = show_radial_menu_persistent(target, target, options, select_proc = CALLBACK(src, PROC_REF(aim_react_act))) /datum/component/aiming/proc/aim_react_act(choice) @@ -339,7 +339,7 @@ AIMING_DROP_WEAPON means they selected the "drop your weapon" command // Shows a crosshair effect when aiming at a target /obj/effect/temp_visual/aiming - icon = 'icons/effects/aiming.dmi' + icon = 'icons/hud/radials/radial_aiming.dmi' icon_state = "aiming" duration = 3 SECONDS layer = ABOVE_MOB_LAYER diff --git a/code/datums/components/manual_blinking.dm b/code/datums/components/manual_blinking.dm index 4c07cc31f6915..52f9369f5b77a 100644 --- a/code/datums/components/manual_blinking.dm +++ b/code/datums/components/manual_blinking.dm @@ -13,7 +13,7 @@ /datum/action/blink name = "Blink" - icon_icon = 'icons/mob/actions/actions_hive.dmi' + icon_icon = 'icons/hud/actions/actions_hive.dmi' button_icon_state = "see" //Feel free to replace /datum/action/blink/Trigger() diff --git a/code/datums/components/manual_breathing.dm b/code/datums/components/manual_breathing.dm index 6d3d4ce64dc13..46b9d51053573 100644 --- a/code/datums/components/manual_breathing.dm +++ b/code/datums/components/manual_breathing.dm @@ -13,7 +13,7 @@ /datum/action/breathe name = "Inhale" - icon_icon = 'icons/mob/actions/actions_hive.dmi' + icon_icon = 'icons/hud/actions/actions_hive.dmi' button_icon_state = "add" //Feel free to replace var/datum/emote/next_emote = "inhale" diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm index de768730c96f3..f4744185442ed 100644 --- a/code/datums/dash_weapon.dm +++ b/code/datums/dash_weapon.dm @@ -1,7 +1,7 @@ /datum/action/innate/dash name = "Dash" desc = "Teleport to the targeted location." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "jetboot" var/current_charges = 1 var/max_charges = 1 diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 9cb9736aa93fd..4ebfb454f337e 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -181,7 +181,7 @@ /datum/action/innate/end_holocall name = "End Holocall" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "camera_off" var/datum/holocall/hcall diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 32600b825d236..4f892ce72991c 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -7,7 +7,7 @@ /datum/action/neck_chop name = "Neck Chop - Injures the neck, stopping the victim from speaking for a while." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "neckchop" /datum/action/neck_chop/Trigger() @@ -24,7 +24,7 @@ /datum/action/leg_sweep name = "Leg Sweep - Trips the victim, knocking them down for a brief moment." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "legsweep" /datum/action/leg_sweep/Trigger() @@ -41,7 +41,7 @@ /datum/action/lung_punch//referred to internally as 'quick choke' name = "Lung Punch - Delivers a strong punch just above the victim's abdomen, constraining the lungs. The victim will be unable to breathe for a short time." - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "lungpunch" /datum/action/lung_punch/Trigger() diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 2612e07c1f6f9..791e462a5231b 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -336,7 +336,7 @@ /datum/action/innate/camera_off name = "End Camera View" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "camera_off" /datum/action/innate/camera_off/Activate() @@ -349,7 +349,7 @@ /datum/action/innate/camera_jump name = "Jump To Camera" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "camera_jump" /datum/action/innate/camera_jump/Activate() @@ -389,7 +389,7 @@ /datum/action/innate/camera_multiz_up name = "Move up a floor" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "move_up" /datum/action/innate/camera_multiz_up/Activate() @@ -404,7 +404,7 @@ /datum/action/innate/camera_multiz_down name = "Move down a floor" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "move_down" /datum/action/innate/camera_multiz_down/Activate() diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 26a7be1621543..7ab2e4ea8d8eb 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -628,7 +628,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) /datum/action/turret_toggle name = "Toggle Mode" - icon_icon = 'icons/mob/actions/actions_mecha.dmi' + icon_icon = 'icons/hud/actions/actions_mecha.dmi' button_icon_state = "mech_cycle_equip_off" /datum/action/turret_toggle/Trigger() @@ -639,7 +639,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) /datum/action/turret_quit name = "Release Control" - icon_icon = 'icons/mob/actions/actions_mecha.dmi' + icon_icon = 'icons/hud/actions/actions_mecha.dmi' button_icon_state = "mech_eject" /datum/action/turret_quit/Trigger() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index cb3b618366e5e..7a68136856953 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -282,9 +282,9 @@ var/list/choices = list() if (locked) - choices["unlock"] = icon('icons/mob/radial.dmi', "radial_unlock") + choices["unlock"] = icon('icons/hud/radials/radial_generic.dmi', "radial_unlock") else if (state_open) - choices["close"] = icon('icons/mob/radial.dmi', "radial_close") + choices["close"] = icon('icons/hud/radials/radial_generic.dmi', "radial_close") for (var/item_key in items) var/item = vars[item_key] @@ -294,9 +294,9 @@ // If the item doesn't exist, put a silhouette in its place choices[item_key] = items[item_key] else - choices["open"] = icon('icons/mob/radial.dmi', "radial_open") - choices["disinfect"] = icon('icons/mob/radial.dmi', "radial_disinfect") - choices["lock"] = icon('icons/mob/radial.dmi', "radial_lock") + choices["open"] = icon('icons/hud/radials/radial_generic.dmi', "radial_open") + choices["disinfect"] = icon('icons/hud/radials/radial_generic.dmi', "radial_disinfect") + choices["lock"] = icon('icons/hud/radials/radial_generic.dmi', "radial_lock") var/choice = show_radial_menu( user, diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 70b2272b2a586..d5de916e68261 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -1,6 +1,6 @@ /obj/effect/bump_teleporter name = "bump-teleporter" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "x2" var/id = null //id of this bump_teleporter. var/id_target = null //id of bump_teleporter which this moves you to. diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 7f5e8b6989e0c..04e93d4ffe2bf 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -5,7 +5,7 @@ /obj/effect/spawner/newbomb name = "bomb" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "x" var/temp_p = 1500 var/temp_o = 1000 // tank temperatures diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index 1acc5cf623b07..9e84e0d8ddfee 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -1,6 +1,6 @@ /obj/effect/spawner/bundle name = "bundle spawner" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "x2" color = "#00FF00" diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 64400f96130c8..a1015199fb9ea 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -384,10 +384,10 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) if(!user) return var/list/computer_dirs = list( - "NORTH" = image(icon = 'icons/mob/radial.dmi', icon_state = "cnorth"), - "EAST" = image(icon = 'icons/mob/radial.dmi', icon_state = "ceast"), - "SOUTH" = image(icon = 'icons/mob/radial.dmi', icon_state = "csouth"), - "WEST" = image(icon = 'icons/mob/radial.dmi', icon_state = "cwest") + "NORTH" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "cnorth"), + "EAST" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "ceast"), + "SOUTH" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "csouth"), + "WEST" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "cwest") ) var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) @@ -409,8 +409,8 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) var/list/solid_or_glass_choices = list( "Solid" = get_airlock_image(/obj/machinery/door/airlock), "Glass" = get_airlock_image(/obj/machinery/door/airlock/glass), - "Windoor" = image(icon = 'icons/mob/radial.dmi', icon_state = "windoor"), - "Secure Windoor" = image(icon = 'icons/mob/radial.dmi', icon_state = "secure_windoor") + "Windoor" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "windoor"), + "Secure Windoor" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "secure_windoor") ) var/list/solid_choices = list( @@ -552,10 +552,10 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) if(!user) return var/static/list/choices = list( - "Chair" = image(icon = 'icons/mob/radial.dmi', icon_state = "chair"), - "Stool" = image(icon = 'icons/mob/radial.dmi', icon_state = "stool"), - "Table" = image(icon = 'icons/mob/radial.dmi', icon_state = "table"), - "Glass Table" = image(icon = 'icons/mob/radial.dmi', icon_state = "glass_table") + "Chair" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "chair"), + "Stool" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "stool"), + "Table" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "table"), + "Glass Table" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "glass_table") ) var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) @@ -625,16 +625,16 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) /obj/item/construction/rcd/attack_self(mob/user) ..() var/list/choices = list( - "Airlock" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlock"), - "Deconstruct" = image(icon= 'icons/mob/radial.dmi', icon_state = "delete"), - "Grilles & Windows" = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow"), - "Floors & Walls" = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor") + "Airlock" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "airlock"), + "Deconstruct" = image(icon= 'icons/hud/radials/radial_generic.dmi', icon_state = "delete"), + "Grilles & Windows" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "grillewindow"), + "Floors & Walls" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "wallfloor") ) if(upgrade & RCD_UPGRADE_FRAMES) choices += list( - "Machine Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "machine"), - "Computer Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "computer_dir"), - "Ladders" = image(icon = 'icons/mob/radial.dmi', icon_state = "ladder") + "Machine Frames" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "machine"), + "Computer Frames" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "computer_dir"), + "Ladders" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "ladder") ) if(upgrade & RCD_UPGRADE_SILO_LINK) choices += list( @@ -642,21 +642,21 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) ) if(upgrade & RCD_UPGRADE_FURNISHING) choices += list( - "Furnishing" = image(icon = 'icons/mob/radial.dmi', icon_state = "chair") + "Furnishing" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "chair") ) if(mode == RCD_AIRLOCK) choices += list( - "Change Access" = image(icon = 'icons/mob/radial.dmi', icon_state = "access"), - "Change Airlock Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocktype") + "Change Access" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "access"), + "Change Airlock Type" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "airlocktype") ) else if(mode == RCD_WINDOWGRILLE) choices += list( - "Change Window Glass" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype"), - "Change Window Size" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowsize") + "Change Window Glass" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "windowtype"), + "Change Window Size" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "windowsize") ) else if(mode == RCD_FURNISHING) choices += list( - "Change Furnishing Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "chair") + "Change Furnishing Type" = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "chair") ) var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index 3e56adab98fa7..427ab2285a133 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -248,7 +248,7 @@ var/cablesuffix = "[min(fromdir,dirnum)]-[max(fromdir,dirnum)]" if(fromdir == dirnum) //cables can't loop back on themselves cablesuffix = "invalid" - var/image/img = image(icon = 'icons/mob/radial.dmi', icon_state = "cable_[cablesuffix]") + var/image/img = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "cable_[cablesuffix]") img.color = GLOB.cable_colors[colors[current_color_index]] wiredirs[icondir] = img return wiredirs diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index bcdabad928023..a7382025dfd41 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -252,7 +252,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) /obj/effect/dumpeetTarget name = "Landing Zone Indicator" desc = "A holographic projection designating the landing zone of something. It's probably best to stand back." - icon = 'icons/mob/actions/actions_items.dmi' + icon = 'icons/hud/actions/actions_items.dmi' icon_state = "sniper_zoom" layer = PROJECTILE_HIT_THRESHOLD_LAYER light_range = 2 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 98d6381ede1fb..db4cb8c238b6f 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -23,7 +23,7 @@ var/open_panel = FALSE var/canprint = TRUE var/list/icons_available = list() - var/radial_icon_file = 'icons/obj/radial_taperecorder.dmi' + var/radial_icon_file = 'icons/hud/radials/radial_taperecorder.dmi' ///Whether we've warned during this recording session that the tape is almost up. var/time_warned = FALSE ///Seconds under which to warn that the tape is almost up. @@ -396,7 +396,7 @@ var/list/timestamp_otherside = list() var/unspooled = FALSE var/list/icons_available = list() - var/radial_icon_file = 'icons/obj/radial_tape.dmi' + var/radial_icon_file = 'icons/hud/radials/radial_tape.dmi' /obj/item/tape/fire_act(exposed_temperature, exposed_volume) unspool() diff --git a/code/game/objects/items/stacks/tiles/tile_reskinning.dm b/code/game/objects/items/stacks/tiles/tile_reskinning.dm index 25cb28bd867f1..0980eced25dcc 100644 --- a/code/game/objects/items/stacks/tiles/tile_reskinning.dm +++ b/code/game/objects/items/stacks/tiles/tile_reskinning.dm @@ -38,8 +38,8 @@ GLOBAL_LIST_EMPTY(tile_dir_lists) /obj/item/stack/tile/attack_self(mob/user) var/list/radial_options = list() if(tile_reskin_types && tile_rotate_dirs) - radial_options["Reskin"] = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_reskin") - radial_options["Rotate"] = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_rotate") + radial_options["Reskin"] = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_reskin") + radial_options["Rotate"] = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_rotate") var/radial_result = show_radial_menu(user, src, radial_options, require_near = TRUE, tooltips = TRUE) switch(radial_result) if("Reskin") diff --git a/code/game/objects/structures/popout_cake.dm b/code/game/objects/structures/popout_cake.dm index 981ca124e57bc..271f6e3fb7f4a 100644 --- a/code/game/objects/structures/popout_cake.dm +++ b/code/game/objects/structures/popout_cake.dm @@ -166,7 +166,7 @@ desc = "Pull the string and pop out of the cake in a surprising fashion, with confetti and everything!" check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED|AB_CHECK_CONSCIOUS button_icon_state = "pull_string" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' var/obj/structure/popout_cake/cake = null diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index e02867cb99c55..36dc95bc3aaec 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -60,7 +60,7 @@ GLOBAL_PROTECT(admin_verbs_debug_mapping) /obj/effect/debugging/mapfix_marker name = "map fix marker" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "mapfixmarker" desc = "I am a mappers mistake." @@ -316,7 +316,7 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) qdel(D) //Also add the x for(var/x_number in 1 to 4) - final.Insert(icon('icons/mob/screen_gen.dmi', "x[x_number == 1 ? "" : x_number]"), "x[x_number == 1 ? "" : x_number]") + final.Insert(icon('icons/hud/screen_gen.dmi', "x[x_number == 1 ? "" : x_number]"), "x[x_number == 1 ? "" : x_number]") fcopy(final, "icons/mob/landmarks.dmi") /client/proc/debug_z_levels() diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm index 2fc5400c6d91e..be861bd50e849 100644 --- a/code/modules/antagonists/abductor/machinery/camera.dm +++ b/code/modules/antagonists/abductor/machinery/camera.dm @@ -60,7 +60,7 @@ /datum/action/innate/teleport_in name = "Send To" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "beam_down" /datum/action/innate/teleport_in/Activate() @@ -103,7 +103,7 @@ /datum/action/innate/teleport_out name = "Retrieve" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "beam_up" /datum/action/innate/teleport_out/Activate() @@ -115,7 +115,7 @@ /datum/action/innate/teleport_self name = "Send Self" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "beam_down" /datum/action/innate/teleport_self/Activate() @@ -158,7 +158,7 @@ /datum/action/innate/vest_mode_swap name = "Switch Vest Mode" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "vest_mode" /datum/action/innate/vest_mode_swap/Activate() @@ -170,7 +170,7 @@ /datum/action/innate/vest_disguise_swap name = "Switch Vest Disguise" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "vest_disguise" /datum/action/innate/vest_disguise_swap/Activate() @@ -181,7 +181,7 @@ /datum/action/innate/set_droppoint name = "Set Experiment Release Point" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "set_drop" /datum/action/innate/set_droppoint/Activate() diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index 0575741d4fe6d..70c292f826735 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -5,7 +5,7 @@ /datum/action/changeling name = "Prototype Sting - Debug button, ahelp this" background_icon_state = "bg_changeling" - icon_icon = 'icons/mob/actions/actions_changeling.dmi' + icon_icon = 'icons/hud/actions/actions_changeling.dmi' var/needs_button = TRUE//for passive abilities like hivemind that dont need a button var/helptext = "" // Details var/chemical_cost = 0 // negative chemical cost is for passive abilities (chemical glands) diff --git a/code/modules/antagonists/clock_cult/mobs/eminence.dm b/code/modules/antagonists/clock_cult/mobs/eminence.dm index 276e4f2495c3f..a393206e19a12 100644 --- a/code/modules/antagonists/clock_cult/mobs/eminence.dm +++ b/code/modules/antagonists/clock_cult/mobs/eminence.dm @@ -158,7 +158,7 @@ /obj/effect/proc_holder/spell/targeted/eminence invocation = "none" invocation_type = INVOCATION_NONE - action_icon = 'icons/mob/actions/actions_clockcult.dmi' + action_icon = 'icons/hud/actions/actions_clockcult.dmi' action_icon_state = "ratvarian_spear" action_background_icon_state = "bg_clock" clothes_req = FALSE diff --git a/code/modules/antagonists/clock_cult/ratvarian_cyborg_modules.dm b/code/modules/antagonists/clock_cult/ratvarian_cyborg_modules.dm index 1d3455017fb1c..486d327cfd370 100644 --- a/code/modules/antagonists/clock_cult/ratvarian_cyborg_modules.dm +++ b/code/modules/antagonists/clock_cult/ratvarian_cyborg_modules.dm @@ -1,7 +1,7 @@ /obj/item/clock_module name = "ratvarian borg module" desc = "cool." - icon = 'icons/mob/actions/actions_clockcult.dmi' + icon = 'icons/hud/actions/actions_clockcult.dmi' icon_state = "Replicant" w_class = WEIGHT_CLASS_NORMAL item_flags = NOBLUDGEON diff --git a/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm b/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm index b2a19e5114b9f..f4736f13a4a0d 100644 --- a/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm +++ b/code/modules/antagonists/clock_cult/scriptures/_clockwork_scripture.dm @@ -235,7 +235,7 @@ //==================================// /datum/action/innate/clockcult - icon_icon = 'icons/mob/actions/actions_clockcult.dmi' + icon_icon = 'icons/hud/actions/actions_clockcult.dmi' background_icon_state = "bg_clock" buttontooltipstyle = "brass" check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED|AB_CHECK_CONSCIOUS diff --git a/code/modules/antagonists/clock_cult/scriptures/summon_spear.dm b/code/modules/antagonists/clock_cult/scriptures/summon_spear.dm index a45714ad7c9e0..2cc55b6fe1b3b 100644 --- a/code/modules/antagonists/clock_cult/scriptures/summon_spear.dm +++ b/code/modules/antagonists/clock_cult/scriptures/summon_spear.dm @@ -5,7 +5,7 @@ charge_max = 20 invocation = "none" invocation_type = INVOCATION_NONE - action_icon = 'icons/mob/actions/actions_clockcult.dmi' + action_icon = 'icons/hud/actions/actions_clockcult.dmi' action_icon_state = "ratvarian_spear" action_background_icon_state = "bg_clock" clothes_req = FALSE diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index d5d23dd0d4c4a..b85fde36dd9e7 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -1,7 +1,7 @@ // Contains cult communion, guide, and cult master abilities /datum/action/innate/cult - icon_icon = 'icons/mob/actions/actions_cult.dmi' + icon_icon = 'icons/hud/actions/actions_cult.dmi' background_icon_state = "bg_demon" buttontooltipstyle = "cult" check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED|AB_CHECK_CONSCIOUS @@ -384,7 +384,7 @@ /datum/action/innate/cult/master/pulse name = "Eldritch Pulse" desc = "Seize upon a fellow cultist or cult structure and teleport it to a nearby location." - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' button_icon_state = "arcane_barrage" var/obj/effect/proc_holder/pulse/PM var/cooldown = 0 diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 50db41f3de719..6d00ac2f0a3d7 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -93,7 +93,7 @@ Striking a noncultist, however, will tear their flesh."} /datum/action/innate/dash/cult name = "Rend the Veil" desc = "Use the sword to shear open the flimsy fabric of this reality and teleport to your target." - icon_icon = 'icons/mob/actions/actions_cult.dmi' + icon_icon = 'icons/hud/actions/actions_cult.dmi' button_icon_state = "phaseshift" dash_sound = 'sound/magic/enter_blood.ogg' recharge_sound = 'sound/magic/exit_blood.ogg' diff --git a/code/modules/antagonists/heretic/magic/aggressive_spread.dm b/code/modules/antagonists/heretic/magic/aggressive_spread.dm index bcd8f65ab3138..145242373a589 100644 --- a/code/modules/antagonists/heretic/magic/aggressive_spread.dm +++ b/code/modules/antagonists/heretic/magic/aggressive_spread.dm @@ -2,7 +2,7 @@ /obj/effect/proc_holder/spell/aoe_turf/rust_conversion name = "Aggressive Spread" desc = "Spreads rust onto nearby surfaces." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "corrode" action_background_icon_state = "bg_ecult" invocation = "A'GRSV SPR'D" diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm index af77434b6872f..60845038645f3 100644 --- a/code/modules/antagonists/heretic/magic/ash_ascension.dm +++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/targeted/fire_sworn name = "Oath of Flame" desc = "For a minute, you will passively create a ring of fire around you." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "fire_ring" action_background_icon_state = "bg_ecult" invocation = "FL'MS" @@ -53,7 +53,7 @@ invocation = "C'SC'DE" invocation_type = INVOCATION_WHISPER range = 4 - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "fire_ring" action_background_icon_state = "bg_ecult" @@ -80,7 +80,7 @@ /obj/effect/proc_holder/spell/pointed/ash_final name = "Nightwatcher's Rite" desc = "A powerful spell that releases 5 streams of fire away from you." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "flames" action_background_icon_state = "bg_ecult" invocation = "F'RE" diff --git a/code/modules/antagonists/heretic/magic/ash_jaunt.dm b/code/modules/antagonists/heretic/magic/ash_jaunt.dm index e775c1f8d24dc..88434e26f3742 100644 --- a/code/modules/antagonists/heretic/magic/ash_jaunt.dm +++ b/code/modules/antagonists/heretic/magic/ash_jaunt.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/ash name = "Ashen Passage" desc = "A short range spell that allows you to pass unimpeded through walls." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "ash_shift" action_background_icon_state = "bg_ecult" invocation = "ASH'N P'SSG'" diff --git a/code/modules/antagonists/heretic/magic/blood_cleave.dm b/code/modules/antagonists/heretic/magic/blood_cleave.dm index c9597c5841c05..b077a2ef3fa95 100644 --- a/code/modules/antagonists/heretic/magic/blood_cleave.dm +++ b/code/modules/antagonists/heretic/magic/blood_cleave.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/pointed/cleave name = "Cleave" desc = "Causes severe bleeding on a target and several targets around them." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "cleave" action_background_icon_state = "bg_ecult" invocation = "CL'VE" diff --git a/code/modules/antagonists/heretic/magic/blood_siphon.dm b/code/modules/antagonists/heretic/magic/blood_siphon.dm index 919253807b9e7..d143adaeedc06 100644 --- a/code/modules/antagonists/heretic/magic/blood_siphon.dm +++ b/code/modules/antagonists/heretic/magic/blood_siphon.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/pointed/blood_siphon name = "Blood Siphon" desc = "A spell that heals your wounds while damaging the enemy." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "blood_siphon" action_background_icon_state = "bg_ecult" invocation = "FL'MS O'ET'RN'ITY" diff --git a/code/modules/antagonists/heretic/magic/flesh_ascension.dm b/code/modules/antagonists/heretic/magic/flesh_ascension.dm index f865124c37c82..ad0cbd96f83e2 100644 --- a/code/modules/antagonists/heretic/magic/flesh_ascension.dm +++ b/code/modules/antagonists/heretic/magic/flesh_ascension.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/targeted/shed_human_form name = "Shed form" desc = "Shed your fragile form, become one with the arms, become one with the emperor." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "worm_ascend" invocation = "REALITY UNCOIL!" invocation_type = INVOCATION_SHOUT @@ -53,7 +53,7 @@ range = -1 include_user = TRUE charge_max = 300 - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "worm_contract" /obj/effect/proc_holder/spell/targeted/worm_contract/cast(list/targets, mob/user) diff --git a/code/modules/antagonists/heretic/magic/madness_touch.dm b/code/modules/antagonists/heretic/magic/madness_touch.dm index 90da70fcdd0fd..55c66ca5646cb 100644 --- a/code/modules/antagonists/heretic/magic/madness_touch.dm +++ b/code/modules/antagonists/heretic/magic/madness_touch.dm @@ -3,7 +3,7 @@ /obj/effect/proc_holder/spell/pointed/touch/mad_touch name = "Touch of Madness" desc = "A touch spell that drains your enemy's sanity." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "mad_touch" action_background_icon_state = "bg_ecult" requires_heretic_focus = TRUE diff --git a/code/modules/antagonists/heretic/magic/manse_link.dm b/code/modules/antagonists/heretic/magic/manse_link.dm index fcdd62467d944..1e5b016654ef1 100644 --- a/code/modules/antagonists/heretic/magic/manse_link.dm +++ b/code/modules/antagonists/heretic/magic/manse_link.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/pointed/manse_link name = "Mansus Link" desc = "Piercing through reality, connecting minds. This spell allows you to add people to a Mansus Net, allowing them to communicate with each other from afar." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "mansus_link" action_background_icon_state = "bg_ecult" invocation = "PI'RC' TH' M'ND" @@ -38,7 +38,7 @@ name = "Mansus Link" desc = "Send a psychic message to everyone connected to your Mansus Net." button_icon_state = "link_speech" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_ecult" /// The raw prophet that hosts our link. var/mob/living/simple_animal/hostile/heretic_summon/raw_prophet/originator diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm index 8009cd6d2fe81..1967df5b5028a 100644 --- a/code/modules/antagonists/heretic/magic/mansus_grasp.dm +++ b/code/modules/antagonists/heretic/magic/mansus_grasp.dm @@ -4,7 +4,7 @@ hand_path = /obj/item/melee/touch_attack/mansus_fist charge_max = 100 clothes_req = FALSE - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "mansus_grasp" action_background_icon_state = "bg_ecult" diff --git a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm index 313c32721aa97..86d6d4e332477 100644 --- a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm +++ b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm @@ -10,7 +10,7 @@ range = -1 include_user = TRUE charge_max = 600 - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "smoke" /obj/effect/proc_holder/spell/targeted/fiery_rebirth/cast(list/targets, mob/living/carbon/human/user) diff --git a/code/modules/antagonists/heretic/magic/rust_wave.dm b/code/modules/antagonists/heretic/magic/rust_wave.dm index d4cb3641b22c9..83cbe626475c1 100644 --- a/code/modules/antagonists/heretic/magic/rust_wave.dm +++ b/code/modules/antagonists/heretic/magic/rust_wave.dm @@ -3,7 +3,7 @@ name = "Entropic Plume" desc = "Spews forth a disorienting plume that causes enemies to strike each other, briefly blinds them (increasing with range) and poisons them (decreasing with range). Also spreads rust in the path of the plume." action_background_icon_state = "bg_ecult" - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "entropic_plume" invocation = "'NTR'P'C PL'M'" invocation_type = INVOCATION_WHISPER @@ -66,7 +66,7 @@ requires_heretic_focus = TRUE charge_max = 350 clothes_req = FALSE - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "rust_wave" action_background_icon_state = "bg_ecult" invocation = "SPR'D TH' WO'D" diff --git a/code/modules/antagonists/heretic/magic/void_phase.dm b/code/modules/antagonists/heretic/magic/void_phase.dm index 79ae103984ad0..6fded7d6018fa 100644 --- a/code/modules/antagonists/heretic/magic/void_phase.dm +++ b/code/modules/antagonists/heretic/magic/void_phase.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/pointed/void_phase name = "Void Phase" desc = "Lets you blink to your pointed destination, causes 3x3 AoE damage bubble around your destination and your current location. It has a minimum range of 3 tiles and a maximum range of 9 tiles." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "voidblink" action_background_icon_state = "bg_ecult" invocation = "RE'L'TY PH'S'E" diff --git a/code/modules/antagonists/heretic/magic/void_pull.dm b/code/modules/antagonists/heretic/magic/void_pull.dm index 3dafc153a3e80..eaf2ba30a48f3 100644 --- a/code/modules/antagonists/heretic/magic/void_pull.dm +++ b/code/modules/antagonists/heretic/magic/void_pull.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/targeted/void_pull name = "Void Pull" desc = "Call the void, this pulls all nearby people closer to you and damages people already around you. If they are 4 tiles or closer they are also knocked down and a short stun is applied." - action_icon = 'icons/mob/actions/actions_ecult.dmi' + action_icon = 'icons/hud/actions/actions_heretic.dmi' action_icon_state = "voidpull" action_background_icon_state = "bg_ecult" invocation = "BR'NG F'RTH TH'M T' M'" diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm index 91493458ade2a..eed18614df296 100644 --- a/code/modules/antagonists/heretic/structures/carving_knife.dm +++ b/code/modules/antagonists/heretic/structures/carving_knife.dm @@ -128,7 +128,7 @@ desc = "Destroys all runes carved by this blade." background_icon_state = "bg_ecult" button_icon_state = "rune_break" - icon_icon = 'icons/mob/actions/actions_ecult.dmi' + icon_icon = 'icons/hud/actions/actions_heretic.dmi' /datum/action/item_action/rune_shatter/New(Target) . = ..() diff --git a/code/modules/antagonists/hivemind/hiveui.dm b/code/modules/antagonists/hivemind/hiveui.dm index ca3ee7ff58510..60498165895dd 100644 --- a/code/modules/antagonists/hivemind/hiveui.dm +++ b/code/modules/antagonists/hivemind/hiveui.dm @@ -79,7 +79,7 @@ /datum/action/innate/psychic_plane name = "Psychic Plane" - icon_icon = 'icons/mob/actions/actions_hive.dmi' + icon_icon = 'icons/hud/actions/actions_hive.dmi' button_icon_state = "scan" background_icon_state = "bg_hive" var/datum/psychic_plane/psychic_plane diff --git a/code/modules/antagonists/hivemind/spells/hivemind_add.dm b/code/modules/antagonists/hivemind/spells/hivemind_add.dm index decf83c48c9b6..979930d2986c5 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_add.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_add.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/targeted/hive_add name = "Assimilate Vessel" desc = "We silently add an unsuspecting target to the hive." - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" selection_type = "view" action_icon_state = "add" diff --git a/code/modules/antagonists/hivemind/spells/hivemind_barrier.dm b/code/modules/antagonists/hivemind/spells/hivemind_barrier.dm index 84c7a36ef1789..7e138e6b709be 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_barrier.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_barrier.dm @@ -6,7 +6,7 @@ clothes_req = 0 human_req = 1 invocation_type = INVOCATION_NONE - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "forcewall" range = -1 diff --git a/code/modules/antagonists/hivemind/spells/hivemind_dominance.dm b/code/modules/antagonists/hivemind/spells/hivemind_dominance.dm index 24b1b49c9eed9..f8cfd4f590ebf 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_dominance.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_dominance.dm @@ -7,7 +7,7 @@ invocation_type = INVOCATION_NONE clothes_req = 0 human_req = 1 - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "assim" antimagic_allowed = TRUE diff --git a/code/modules/antagonists/hivemind/spells/hivemind_hand.dm b/code/modules/antagonists/hivemind/spells/hivemind_hand.dm index f2bf876ebbf8c..b86a0be2b5bf5 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_hand.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_hand.dm @@ -5,7 +5,7 @@ school = "evocation" charge_max = 150 clothes_req = FALSE - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_icon_state = "hand" action_background_icon_state = "bg_hive" diff --git a/code/modules/antagonists/hivemind/spells/hivemind_heal.dm b/code/modules/antagonists/hivemind/spells/hivemind_heal.dm index 25858317d5bc2..86bcd5ab3920c 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_heal.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_heal.dm @@ -6,7 +6,7 @@ charge_max = 600 clothes_req = 0 invocation_type = INVOCATION_NONE - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "drain" human_req = 1 diff --git a/code/modules/antagonists/hivemind/spells/hivemind_integrate.dm b/code/modules/antagonists/hivemind/spells/hivemind_integrate.dm index d902e796972c1..8d6aa49d10f86 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_integrate.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_integrate.dm @@ -8,7 +8,7 @@ invocation_type = INVOCATION_NONE clothes_req = 0 human_req = 1 - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "reclaim" antimagic_allowed = TRUE diff --git a/code/modules/antagonists/hivemind/spells/hivemind_invasion.dm b/code/modules/antagonists/hivemind/spells/hivemind_invasion.dm index fbf095c82de9c..47a107dde7cea 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_invasion.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_invasion.dm @@ -7,7 +7,7 @@ invocation_type = INVOCATION_NONE clothes_req = 0 max_targets = 1 - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "hack" antimagic_allowed = TRUE diff --git a/code/modules/antagonists/hivemind/spells/hivemind_loyalty.dm b/code/modules/antagonists/hivemind/spells/hivemind_loyalty.dm index 5f3fb3e78ae49..8e16362f05c21 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_loyalty.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_loyalty.dm @@ -6,7 +6,7 @@ invocation_type = INVOCATION_NONE clothes_req = 0 human_req = 1 - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "loyal" antimagic_allowed = TRUE diff --git a/code/modules/antagonists/hivemind/spells/hivemind_panic.dm b/code/modules/antagonists/hivemind/spells/hivemind_panic.dm index fac83f363bfd5..4a8ca38421e30 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_panic.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_panic.dm @@ -8,7 +8,7 @@ clothes_req = 0 max_targets = 0 antimagic_allowed = TRUE - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "panic" diff --git a/code/modules/antagonists/hivemind/spells/hivemind_probe.dm b/code/modules/antagonists/hivemind/spells/hivemind_probe.dm index f0555578d5ab0..c4bd9f2db1678 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_probe.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_probe.dm @@ -7,7 +7,7 @@ invocation_type = INVOCATION_NONE clothes_req = 0 max_targets = 1 - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "probe" antimagic_allowed = TRUE diff --git a/code/modules/antagonists/hivemind/spells/hivemind_rally.dm b/code/modules/antagonists/hivemind/spells/hivemind_rally.dm index 227ac7af97993..49abb9ea945f1 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_rally.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_rally.dm @@ -9,7 +9,7 @@ max_targets = 0 include_user = 1 antimagic_allowed = TRUE - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "rally" diff --git a/code/modules/antagonists/hivemind/spells/hivemind_spells.dm b/code/modules/antagonists/hivemind/spells/hivemind_spells.dm index cf453e2379e92..b3efaf8ddb844 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_spells.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_spells.dm @@ -2,7 +2,7 @@ panel = "Hivemind Abilities" invocation_type = INVOCATION_NONE selection_type = "range" - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "spell_default" clothes_req = 0 diff --git a/code/modules/antagonists/hivemind/spells/hivemind_thrall.dm b/code/modules/antagonists/hivemind/spells/hivemind_thrall.dm index 2113bb57097c9..b026197dc41cb 100644 --- a/code/modules/antagonists/hivemind/spells/hivemind_thrall.dm +++ b/code/modules/antagonists/hivemind/spells/hivemind_thrall.dm @@ -8,7 +8,7 @@ invocation_type = INVOCATION_NONE clothes_req = 0 human_req = 1 - action_icon = 'icons/mob/actions/actions_hive.dmi' + action_icon = 'icons/hud/actions/actions_hive.dmi' action_background_icon_state = "bg_hive" action_icon_state = "chaos" antimagic_allowed = TRUE diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 85b96e894dc64..fc022483aaf65 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -155,7 +155,7 @@ charge_max = 0 panel = "Revenant Abilities" message = "You toggle your night vision." - action_icon = 'icons/mob/actions/actions_revenant.dmi' + action_icon = 'icons/hud/actions/actions_revenant.dmi' action_icon_state = "r_nightvision" action_background_icon_state = "bg_revenant" @@ -165,7 +165,7 @@ desc = "Teleport to the station." charge_max = 0 panel = "Revenant Abilities" - action_icon = 'icons/mob/actions/actions_revenant.dmi' + action_icon = 'icons/hud/actions/actions_revenant.dmi' action_icon_state = "r_teleport" action_background_icon_state = "bg_revenant" clothes_req = FALSE @@ -197,7 +197,7 @@ /obj/effect/proc_holder/spell/targeted/telepathy/revenant name = "Revenant Transmit" panel = "Revenant Abilities" - action_icon = 'icons/mob/actions/actions_revenant.dmi' + action_icon = 'icons/hud/actions/actions_revenant.dmi' action_icon_state = "r_transmit" action_background_icon_state = "bg_revenant" notice = "revennotice" @@ -241,7 +241,7 @@ name = "Phase Shift" desc = "Shift in and out of your corporeal form" panel = "Revenant Abilities" - action_icon = 'icons/mob/actions/actions_revenant.dmi' + action_icon = 'icons/hud/actions/actions_revenant.dmi' action_icon_state = "r_phase" action_background_icon_state = "bg_revenant" clothes_req = FALSE @@ -273,7 +273,7 @@ /obj/effect/proc_holder/spell/aoe_turf/revenant clothes_req = 0 - action_icon = 'icons/mob/actions/actions_revenant.dmi' + action_icon = 'icons/hud/actions/actions_revenant.dmi' action_background_icon_state = "bg_revenant" panel = "Revenant Abilities (Locked)" name = "Report this to a coder" diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm index 643119e949ebc..9b6576fb36478 100644 --- a/code/modules/antagonists/space_dragon/carp_rift.dm +++ b/code/modules/antagonists/space_dragon/carp_rift.dm @@ -9,7 +9,7 @@ name = "Summon Rift" desc = "Summon a rift to bring forth a horde of space carp." background_icon_state = "bg_default" - icon_icon = 'icons/mob/actions/actions_space_dragon.dmi' + icon_icon = 'icons/hud/actions/actions_space_dragon.dmi' button_icon_state = "carp_rift" /datum/action/innate/summon_rift/Activate() diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 2da64bf242b32..c55a06e15c34f 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -215,7 +215,7 @@ name = "Carp Wavespeak" desc = "Communicate through wavespeak." background_icon_state = "bg_default" - icon_icon = 'icons/mob/actions/actions_space_dragon.dmi' + icon_icon = 'icons/hud/actions/actions_space_dragon.dmi' button_icon_state = "wavespeak" check_flags = AB_CHECK_CONSCIOUS diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index c55a951d8f374..33a3968dd2eb6 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( name = "AI Action" desc = "You aren't entirely sure what this does, but it's very beepy and boopy." background_icon_state = "bg_tech_blue" - icon_icon = 'icons/mob/actions/actions_AI.dmi' + icon_icon = 'icons/hud/actions/actions_AI.dmi' /// The owner AI, so we don't have to typecast every time var/mob/living/silicon/ai/owner_AI /// If we have multiple uses of the same power diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index fcc4870e591c7..8dd811cc64e8f 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -137,7 +137,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/hotspot) var/mutable_appearance/fusion_overlay = mutable_appearance('icons/effects/atmospherics.dmi', "fusion_gas") fusion_overlay.blend_mode = BLEND_ADD fusion_overlay.alpha = fusion_amt * 255 - var/mutable_appearance/rainbow_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "druggy") + var/mutable_appearance/rainbow_overlay = mutable_appearance('icons/hud/screen_gen.dmi', "druggy") rainbow_overlay.blend_mode = BLEND_ADD rainbow_overlay.alpha = fusion_amt * 255 rainbow_overlay.appearance_flags = RESET_COLOR diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 1b23537e72a96..dae76be69e01c 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -2,7 +2,7 @@ /datum/action/item_action/chameleon/drone/randomise name = "Randomise Headgear" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "random" /datum/action/item_action/chameleon/drone/randomise/Trigger() @@ -22,7 +22,7 @@ /datum/action/item_action/chameleon/drone/togglehatmask name = "Toggle Headgear Mode" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' /datum/action/item_action/chameleon/drone/togglehatmask/New() ..() diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 1ae7c244d7020..cd0fb3022c0f5 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -327,7 +327,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom/movable/screen/chronos_target) /datum/action/innate/chrono_teleport name = "Teleport Now" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "chrono_phase" check_flags = AB_CHECK_CONSCIOUS //|AB_CHECK_INSIDE var/obj/item/clothing/suit/space/chronos/chronosuit = null diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 08c611261d034..c87eb895af78a 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -24,9 +24,9 @@ var/datum/looping_sound/microwave/soundloop var/list/ingredients = list() // may only contain /atom/movables - var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine") - var/static/radial_eject = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_eject") - var/static/radial_use = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_use") + var/static/radial_examine = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_examine") + var/static/radial_eject = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_eject") + var/static/radial_use = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_use") // we show the button even if the proc will not work var/static/list/radial_options = list("eject" = radial_eject, "use" = radial_use) diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index 8b613e6113f92..c136791e98066 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -5,7 +5,7 @@ These remove snowflake code for special holodeck functions. */ /obj/effect/holodeck_effect - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "x2" invisibility = INVISIBILITY_ABSTRACT diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 747fbe11bc53f..61bab3f29a8c5 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -129,7 +129,7 @@ eyeobj.invisibility = INVISIBILITY_MAXIMUM //Hide the eye when not in use. /datum/action/innate/aux_base //Parent aux base action - icon_icon = 'icons/mob/actions/actions_construction.dmi' + icon_icon = 'icons/hud/actions/actions_construction.dmi' var/mob/living/C //Mob using the action var/mob/camera/ai_eye/remote/base_construction/remote_eye //Console's eye mob var/obj/machinery/computer/camera_advanced/base_construction/B //Console itself diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 66b4b2810c6e6..ff5b9ac353ce1 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -354,7 +354,7 @@ /obj/item/fakeartefact name = "expensive forgery" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "x2" var/possible = list(/obj/item/ship_in_a_bottle, /obj/item/gun/energy/pulse, diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index ed25f119af870..8d203c326d6e2 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -497,7 +497,7 @@ /datum/action/innate/minedrone check_flags = AB_CHECK_CONSCIOUS - icon_icon = 'icons/mob/actions/actions_mecha.dmi' + icon_icon = 'icons/hud/actions/actions_mecha.dmi' background_icon_state = "bg_default" /// Toggles a minebot's inbuilt meson scanners. diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 6467c13b4cfb5..3eb399dbc9d92 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -10,7 +10,7 @@ Doesn't work on other aliens/AI.*/ name = "Alien Power" panel = "Alien" base_action = /datum/action/spell_action/alien - action_icon = 'icons/mob/actions/actions_xeno.dmi' + action_icon = 'icons/hud/actions/actions_xeno.dmi' action_background_icon_state = "bg_alien" var/plasma_cost = 0 var/check_turf = FALSE diff --git a/code/modules/mob/living/carbon/alien/screen.dm b/code/modules/mob/living/carbon/alien/screen.dm index 2bfa60dfb463c..4a928467e4640 100644 --- a/code/modules/mob/living/carbon/alien/screen.dm +++ b/code/modules/mob/living/carbon/alien/screen.dm @@ -28,7 +28,7 @@ finder_icon = "finder_med" if(21 to INFINITY) finder_icon = "finder_far" - var/image/finder_eye = image('icons/mob/screen_alien.dmi', finder_icon, dir = Qdir) + var/image/finder_eye = image('icons/hud/screen_alien.dmi', finder_icon, dir = Qdir) hud_used.alien_queen_finder.add_overlay(finder_eye) /mob/living/carbon/alien/humanoid/royal/queen/findQueen() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7b4f7add40380..527cdc8687b31 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -769,17 +769,17 @@ if(hal_screwyhud == SCREWYHUD_HEALTHY) icon_num = 0 if(icon_num) - hud_used.healthdoll.add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[BP.body_zone][icon_num]")) + hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[BP.body_zone][icon_num]")) //Stamina Outline (Communicate that we have stamina damage) //Hallucinations will appear as regular damage if(BP.stamina_dam && !hallucination) - var/mutable_appearance/MA = mutable_appearance('icons/mob/screen_gen.dmi', "[BP.body_zone]stam") + var/mutable_appearance/MA = mutable_appearance('icons/hud/screen_gen.dmi', "[BP.body_zone]stam") MA.alpha = (BP.stamina_dam / BP.max_stamina_damage) * 70 + 30 hud_used.healthdoll.add_overlay(MA) for(var/t in get_missing_limbs()) //Missing limbs - hud_used.healthdoll.add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[t]6")) + hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[t]6")) for(var/t in get_disabled_limbs()) //Disabled limbs - hud_used.healthdoll.add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[t]7")) + hud_used.healthdoll.add_overlay(mutable_appearance('icons/hud/screen_gen.dmi', "[t]7")) else hud_used.healthdoll.icon_state = "healthdoll_DEAD" diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm index 238747e1cc0d6..9b8a854c94a2c 100644 --- a/code/modules/mob/living/carbon/human/species_types/IPC.dm +++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm @@ -103,7 +103,7 @@ /datum/action/innate/change_screen name = "Change Display" check_flags = AB_CHECK_CONSCIOUS - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "drone_vision" /datum/action/innate/change_screen/Activate() diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 205986cf73893..76842c3af6aee 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -510,7 +510,7 @@ name = "Unstable Teleport" check_flags = AB_CHECK_CONSCIOUS button_icon_state = "jaunt" - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' var/cooldown = 150 var/last_teleport = 0 @@ -1137,7 +1137,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cloth_pile) name = "Bone Chill" desc = "Rattle your bones and strike fear into your enemies!" check_flags = AB_CHECK_CONSCIOUS - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' button_icon_state = "bonechill" var/cooldown = 600 var/last_use diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 7f4c9f3d5ec1c..3652781810fef 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -80,7 +80,7 @@ name = "Split Body" check_flags = AB_CHECK_CONSCIOUS button_icon_state = "slimesplit" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/split_body/IsAvailable() @@ -161,7 +161,7 @@ name = "Swap Body" check_flags = NONE button_icon_state = "slimeswap" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/swap_body/Activate() @@ -365,7 +365,7 @@ desc = "Eat a slime extract to use its properties." check_flags = AB_CHECK_CONSCIOUS button_icon_state = "slimeconsume" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/integrate_extract/proc/update_name() @@ -426,7 +426,7 @@ desc = "Pulse the slime extract with energized jelly to activate it." check_flags = AB_CHECK_CONSCIOUS button_icon_state = "slimeuse1" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" var/activation_type = SLIME_ACTIVATE_MINOR @@ -813,7 +813,7 @@ GLOBAL_LIST_EMPTY(slime_links_by_mind) name = "Slimelink" desc = "Send a psychic message to everyone connected to your slime link." button_icon_state = "link_speech" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/linked_speech/Activate() @@ -832,7 +832,7 @@ GLOBAL_LIST_EMPTY(slime_links_by_mind) name = "Send Thought" desc = "Send a private psychic message to someone you can see." button_icon_state = "send_mind" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/project_thought/Activate() @@ -875,7 +875,7 @@ GLOBAL_LIST_EMPTY(slime_links_by_mind) name = "Link Minds" desc = "Link someone's mind to your Slime Link, allowing them to communicate telepathically with other linked minds." button_icon_state = "mindlink" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/link_minds/Activate() @@ -915,7 +915,7 @@ GLOBAL_LIST_EMPTY(slime_links_by_mind) name = "Unlink Mind" desc = "Forcefully disconnect a member of your Slime Link, cutting them off from the rest of the link." button_icon_state = "mindunlink" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/unlink_minds/Activate() diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index ab4b47c0a4f62..8dfbd2ac4a660 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -84,7 +84,7 @@ desc = "Restore your wings and antennae, and heal some damage. If your cocoon is broken externally you will take heavy damage!" check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED|AB_CHECK_CONSCIOUS button_icon_state = "wrap_0" - icon_icon = 'icons/mob/actions/actions_animal.dmi' + icon_icon = 'icons/hud/actions/actions_animal.dmi' /datum/action/innate/cocoon/Activate() var/mob/living/carbon/H = owner diff --git a/code/modules/mob/living/carbon/human/species_types/oozelings.dm b/code/modules/mob/living/carbon/human/species_types/oozelings.dm index a9b97156a964e..35dc8f5afb36d 100644 --- a/code/modules/mob/living/carbon/human/species_types/oozelings.dm +++ b/code/modules/mob/living/carbon/human/species_types/oozelings.dm @@ -123,7 +123,7 @@ name = "Regenerate Limbs" check_flags = AB_CHECK_CONSCIOUS button_icon_state = "slimeheal" - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" /datum/action/innate/regenerate_limbs/IsAvailable() diff --git a/code/modules/mob/living/carbon/human/species_types/psyphoza.dm b/code/modules/mob/living/carbon/human/species_types/psyphoza.dm index b0032317c64fc..5c60a5e976f13 100644 --- a/code/modules/mob/living/carbon/human/species_types/psyphoza.dm +++ b/code/modules/mob/living/carbon/human/species_types/psyphoza.dm @@ -134,7 +134,7 @@ /datum/action/item_action/organ_action/psychic_highlight name = "Psychic Sense" desc = "Sense your surroundings psychically." - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/hud/actions/action_generic.dmi' button_icon_state = "activate_psychic" transparent_when_unavailable = TRUE ///The distant our psychic sense works @@ -303,7 +303,7 @@ //keep this type- /atom/movable/screen/fullscreen/blind/psychic icon_state = "trip" - icon = 'icons/mob/psychic.dmi' + icon = 'icons/hud/fullscreen/psychic.dmi' ///The color we return to after going black & back. var/origin_color = "#111" ///Index for texture setting - Useful if we add more presets @@ -351,7 +351,7 @@ //And this type as a seperate type-path to avoid issues with animations & locate() /atom/movable/screen/fullscreen/blind/psychic_highlight icon_state = "trip" - icon = 'icons/mob/psychic.dmi' + icon = 'icons/hud/fullscreen/psychic.dmi' render_target = "" plane = FULLSCREEN_PLANE layer = 4.1 @@ -414,7 +414,7 @@ /datum/action/change_psychic_visual name = "Change Psychic Sense" desc = "Change the visual style of your psychic sense." - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/hud/actions/action_generic.dmi' button_icon_state = "change_color" ///Ref to the overlay - hard del edition var/atom/movable/screen/fullscreen/blind/psychic_highlight/psychic_overlay @@ -442,7 +442,7 @@ /datum/action/change_psychic_auto name = "Auto Psychic Sense" desc = "Change your psychic sense to auto." - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/hud/actions/action_generic.dmi' button_icon_state = "change_generic" ///Ref to the action var/datum/action/item_action/organ_action/psychic_highlight/psychic_action @@ -475,7 +475,7 @@ /datum/action/change_psychic_texture name = "Change Psychic Texture" desc = "Change your psychic texture." - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/hud/actions/action_generic.dmi' button_icon_state = "change_texture" ///Ref to the overlay - hard del edition var/atom/movable/screen/fullscreen/blind/psychic_highlight/psychic_overlay diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 9d05c59b9b460..0369ce3181fc0 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1006,7 +1006,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/silicon/ai) /datum/action/innate/deploy_shell name = "Deploy to AI Shell" desc = "Wirelessly control a specialized cyborg shell." - icon_icon = 'icons/mob/actions/actions_AI.dmi' + icon_icon = 'icons/hud/actions/actions_AI.dmi' button_icon_state = "ai_shell" /datum/action/innate/deploy_shell/Trigger() @@ -1018,7 +1018,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/silicon/ai) /datum/action/innate/deploy_last_shell name = "Reconnect to shell" desc = "Reconnect to the most recently used AI shell." - icon_icon = 'icons/mob/actions/actions_AI.dmi' + icon_icon = 'icons/hud/actions/actions_AI.dmi' button_icon_state = "ai_last_shell" var/mob/living/silicon/robot/last_used_shell diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index a3f4d8aac6c34..f85e0619bdeca 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -253,7 +253,7 @@ /datum/action/innate/pai name = "PAI Action" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' var/mob/living/silicon/pai/P /datum/action/innate/pai/Trigger() @@ -302,7 +302,7 @@ /datum/action/innate/pai/light name = "Toggle Integrated Lights" - icon_icon = 'icons/mob/actions/actions_spells.dmi' + icon_icon = 'icons/hud/actions/actions_spells.dmi' button_icon_state = "emp" background_icon_state = "bg_tech" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index fcc91d8b28707..37398013f53f1 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1192,7 +1192,7 @@ /datum/action/innate/undeployment name = "Disconnect from shell" desc = "Stop controlling your shell and resume normal core operations." - icon_icon = 'icons/mob/actions/actions_AI.dmi' + icon_icon = 'icons/hud/actions/actions_AI.dmi' button_icon_state = "ai_core" /datum/action/innate/undeployment/Trigger() diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 5a2ac317faab5..e1cec92197e64 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -505,7 +505,7 @@ /datum/action/innate/seek_prey name = "Seek the Harvest" desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!" - icon_icon = 'icons/mob/actions/actions_cult.dmi' + icon_icon = 'icons/hud/actions/actions_cult.dmi' background_icon_state = "bg_demon" buttontooltipstyle = "cult" button_icon_state = "cult_mark" diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index ebd377730bf8b..07f57b4f47829 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -29,7 +29,7 @@ //Lets the wizard summon his art to fight for him /datum/action/boss/wizard_summon_minions name = "Summon Minions" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "art_summon" usage_probability = 40 boss_cost = 30 @@ -57,7 +57,7 @@ //Hitting the wizard himself destroys all decoys /datum/action/boss/wizard_mimic name = "Craft Mimicry" - icon_icon = 'icons/mob/actions/actions_minor_antag.dmi' + icon_icon = 'icons/hud/actions/actions_minor_antag.dmi' button_icon_state = "mimic_summon" usage_probability = 30 boss_cost = 40 diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 35ab586b1465c..bb6896759e69c 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -465,7 +465,7 @@ // SPIDER ACTIONS/PROCS /datum/action/innate/spider - icon_icon = 'icons/mob/actions/actions_animal.dmi' + icon_icon = 'icons/hud/actions/actions_animal.dmi' background_icon_state = "bg_alien" check_flags = AB_CHECK_CONSCIOUS @@ -534,7 +534,7 @@ panel = "Spider" desc = "Wrap something or someone in a cocoon. If it's a living being, you'll also consume them, allowing you to lay eggs." ranged_mousepointer = 'icons/effects/wrap_target.dmi' - action_icon = 'icons/mob/actions/actions_animal.dmi' + action_icon = 'icons/hud/actions/actions_animal.dmi' action_icon_state = "wrap_0" action_background_icon_state = "bg_alien" @@ -578,7 +578,7 @@ panel = "Spider" desc = "Throw a sticky web at potential prey to immobilize them temporarily" ranged_mousepointer = 'icons/effects/throwweb_target.dmi' - action_icon = 'icons/mob/actions/actions_animal.dmi' + action_icon = 'icons/hud/actions/actions_animal.dmi' action_icon_state = "throw_web_0" action_background_icon_state = "bg_alien" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index e01379510971c..8a930abc1cbee 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -66,7 +66,7 @@ Difficulty: Medium /datum/action/innate/megafauna_attack/dash name = "Dash To Target" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "sniper_zoom" chosen_message = "You are now dashing to your target." chosen_attack_num = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 1fac50705a534..8670e2bcc3139 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -78,7 +78,7 @@ Difficulty: Hard /datum/action/innate/megafauna_attack/triple_charge name = "Triple Charge" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "sniper_zoom" chosen_message = "You are now triple charging at the target you click on." chosen_attack_num = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 5f4141bbaf65c..225bf40f36e9c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -64,7 +64,7 @@ Difficulty: Very Hard /datum/action/innate/megafauna_attack/spiral_attack name = "Spiral Shots" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "sniper_zoom" chosen_message = "You are now firing in a spiral." chosen_attack_num = 1 @@ -875,7 +875,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box) range = -1 include_user = TRUE selection_type = "view" - action_icon = 'icons/mob/actions/actions_spells.dmi' + action_icon = 'icons/hud/actions/actions_spells.dmi' action_icon_state = "exit_possession" sound = null diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index d3ca35b2c40bb..f2b9417323fca 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -75,7 +75,7 @@ Difficulty: Medium /datum/action/innate/megafauna_attack/fire_cone_meteors name = "Fire Cone With Meteors" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "sniper_zoom" chosen_message = "You are now shooting fire at your target and raining fire around you." chosen_attack_num = 2 @@ -528,7 +528,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/temp_visual/dragon_flight) animate(src, pixel_z = 0, time = duration) /obj/effect/temp_visual/target - icon = 'icons/mob/actions/actions_items.dmi' + icon = 'icons/hud/actions/actions_items.dmi' icon_state = "sniper_zoom" layer = BELOW_MOB_LAYER light_range = 2 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index f433499acdb4e..b87534a6c3a72 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -94,7 +94,7 @@ Difficulty: Hard /datum/action/innate/megafauna_attack/blink name = "Blink To Target" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "sniper_zoom" chosen_message = "You are now blinking to your target." chosen_attack_num = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 121d4f09b69b6..3f205c136ab37 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -55,7 +55,7 @@ Difficulty: Medium /datum/action/innate/megafauna_attack/charge_target name = "Charge Target" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "sniper_zoom" chosen_message = "You are now charging at your target." chosen_attack_num = 2 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 2be5fe3585f48..185f6b2307c1b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -149,7 +149,7 @@ /datum/action/innate/megafauna_attack name = "Megafauna Attack" - icon_icon = 'icons/mob/actions/actions_animal.dmi' + icon_icon = 'icons/hud/actions/actions_animal.dmi' button_icon_state = "" var/chosen_message var/chosen_attack_num = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 83adde4abbb85..6c1c66f6aaea5 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -66,7 +66,7 @@ While using this makes the system rely on OnFire, it still gives options for tim /datum/action/innate/elite_attack name = "Elite Attack" - icon_icon = 'icons/mob/actions/actions_elites.dmi' + icon_icon = 'icons/hud/actions/actions_elites.dmi' button_icon_state = "" background_icon_state = "bg_default" var/chosen_message diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 0f8acbb22532b..eba7425a5995a 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -460,7 +460,7 @@ name = "Gust Attack" desc = "Use your wings to knock back foes with gusts of air, pushing them away and stunning them. Using this too often will leave you vulnerable for longer periods of time." background_icon_state = "bg_default" - icon_icon = 'icons/mob/actions/actions_space_dragon.dmi' + icon_icon = 'icons/hud/actions/actions_space_dragon.dmi' button_icon_state = "gust_attack" cooldown_time = 5 SECONDS // the ability takes up around 2-3 seconds diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 9058c2ebc51bb..05037f4860349 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -63,7 +63,7 @@ E.Activate() /datum/action/innate/fugu - icon_icon = 'icons/mob/actions/actions_animal.dmi' + icon_icon = 'icons/hud/actions/actions_animal.dmi' /datum/action/innate/fugu/expand name = "Inflate" diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index 461b0891e14eb..131ac488b324d 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -3,7 +3,7 @@ /datum/action/innate/slime check_flags = AB_CHECK_CONSCIOUS - icon_icon = 'icons/mob/actions/actions_slime.dmi' + icon_icon = 'icons/hud/actions/actions_slime.dmi' background_icon_state = "bg_alien" var/needs_growth = NO_GROWTH_NEEDED diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm index 2133d5b7d2da9..5eecd5467b0b2 100644 --- a/code/modules/point/point.dm +++ b/code/modules/point/point.dm @@ -73,7 +73,7 @@ thought_bubble.mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/mutable_appearance/point_visual = mutable_appearance( - 'icons/mob/screen_gen.dmi', + 'icons/hud/screen_gen.dmi', "arrow", plane = thought_bubble.plane, ) @@ -88,7 +88,7 @@ /obj/effect/temp_visual/point name = "pointer" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/screen_gen.dmi' icon_state = "arrow" plane = POINT_PLANE duration = POINT_TIME diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 547ec90e023a0..dd9e4ae8ebd38 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -671,7 +671,7 @@ /datum/action/toggle_scope_zoom name = "Toggle Scope" check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED|AB_CHECK_LYING - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "sniper_zoom" var/obj/item/gun/gun = null diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 53f07b1bc301e..d1a2e9298d2dc 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -20,11 +20,11 @@ var/list/holdingitems var/static/list/typecache_to_take - var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine") - var/static/radial_eject = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_eject") - var/static/radial_grind = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_grind") - var/static/radial_juice = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_juice") - var/static/radial_mix = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_mix") + var/static/radial_examine = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_examine") + var/static/radial_eject = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_eject") + var/static/radial_grind = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_grind") + var/static/radial_juice = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_juice") + var/static/radial_mix = image(icon = 'icons/hud/radials/radial_generic.dmi', icon_state = "radial_mix") /obj/machinery/reagentgrinder/Initialize(mapload) . = ..() diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm index 4a1b1f5cdf5da..24aadc2457be6 100644 --- a/code/modules/research/nanites/nanite_programs/utility.dm +++ b/code/modules/research/nanites/nanite_programs/utility.dm @@ -354,7 +354,7 @@ /datum/action/innate/nanite_button name = "Button" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' check_flags = AB_CHECK_HANDS_BLOCKED|AB_CHECK_INCAPACITATED|AB_CHECK_CONSCIOUS button_icon_state = "power_green" var/datum/nanite_program/dermal_button/program diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index ac5046c935e2a..4d8bbe72d3fb4 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -190,7 +190,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) /datum/action/innate/slime_place name = "Place Slimes" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "slime_down" /datum/action/innate/slime_place/Activate() @@ -210,7 +210,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) /datum/action/innate/slime_pick_up name = "Pick up Slime" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "slime_up" /datum/action/innate/slime_pick_up/Activate() @@ -236,7 +236,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) /datum/action/innate/feed_slime name = "Feed Slimes" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "monkey_down" /datum/action/innate/feed_slime/Activate() @@ -261,7 +261,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) /datum/action/innate/monkey_recycle name = "Recycle Monkeys" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "monkey_up" /datum/action/innate/monkey_recycle/Activate() @@ -289,7 +289,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) /datum/action/innate/slime_scan name = "Scan Slime" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "slime_scan" /datum/action/innate/slime_scan/Activate() @@ -306,7 +306,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) /datum/action/innate/feed_potion name = "Apply Potion" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "slime_potion" /datum/action/innate/feed_potion/Activate() @@ -330,7 +330,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio) /datum/action/innate/hotkey_help name = "Hotkey Help" - icon_icon = 'icons/mob/actions/actions_silicon.dmi' + icon_icon = 'icons/hud/actions/actions_silicon.dmi' button_icon_state = "hotkey_help" /datum/action/innate/hotkey_help/Activate() diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm index fe8d4044a652c..08c4db66a0699 100644 --- a/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm +++ b/code/modules/shuttle/shuttle_creation/shuttle_creator_actions.dm @@ -1,6 +1,6 @@ //============ Actions ============ /datum/action/innate/shuttle_creator - icon_icon = 'icons/mob/actions/actions_shuttle.dmi' + icon_icon = 'icons/hud/actions/actions_shuttle.dmi' var/mob/living/C var/mob/camera/ai_eye/remote/shuttle_creation/remote_eye var/obj/item/shuttle_creator/shuttle_creator diff --git a/code/modules/shuttle/super_cruise/shuttle_components/shuttle_docking.dm b/code/modules/shuttle/super_cruise/shuttle_components/shuttle_docking.dm index a48af3f394b16..b3af1b2a9e7d2 100644 --- a/code/modules/shuttle/super_cruise/shuttle_components/shuttle_docking.dm +++ b/code/modules/shuttle/super_cruise/shuttle_components/shuttle_docking.dm @@ -386,7 +386,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/ai_eye/remote/shuttle_docker) /datum/action/innate/shuttledocker_rotate name = "Rotate" - icon_icon = 'icons/mob/actions/actions_mecha.dmi' + icon_icon = 'icons/hud/actions/actions_mecha.dmi' button_icon_state = "mech_cycle_equip_off" /datum/action/innate/shuttledocker_rotate/Activate() @@ -399,7 +399,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/camera/ai_eye/remote/shuttle_docker) /datum/action/innate/shuttledocker_place name = "Place" - icon_icon = 'icons/mob/actions/actions_mecha.dmi' + icon_icon = 'icons/hud/actions/actions_mecha.dmi' button_icon_state = "mech_zoom_off" /datum/action/innate/shuttledocker_place/Activate() diff --git a/code/modules/spells/__DEFINES/spell.dm b/code/modules/spells/__DEFINES/spell.dm index b22f0869a6cdb..0764f970e3f89 100644 --- a/code/modules/spells/__DEFINES/spell.dm +++ b/code/modules/spells/__DEFINES/spell.dm @@ -9,7 +9,7 @@ var/ranged_clickcd_override = -1 var/has_action = TRUE var/datum/action/spell_action/action = null - var/action_icon = 'icons/mob/actions/actions_spells.dmi' + var/action_icon = 'icons/hud/actions/actions_spells.dmi' var/action_icon_state = "spell_default" var/action_background_icon_state = "bg_spell" var/base_action = /datum/action/spell_action @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th /// Base typecache of clothing needed to cast spells. Do not modify, make a separate static var in subtypes if necessary. var/static/list/casting_clothes_base - action_icon = 'icons/mob/actions/actions_spells.dmi' + action_icon = 'icons/hud/actions/actions_spells.dmi' action_icon_state = "spell_default" action_background_icon_state = "bg_spell" base_action = /datum/action/spell_action/spell diff --git a/code/modules/spells/spell_types/bloodcrawl.dm b/code/modules/spells/spell_types/bloodcrawl.dm index eb07ecb20536a..02676bfa6d547 100644 --- a/code/modules/spells/spell_types/bloodcrawl.dm +++ b/code/modules/spells/spell_types/bloodcrawl.dm @@ -9,7 +9,7 @@ range = 1 cooldown_min = 0 overlay = null - action_icon = 'icons/mob/actions/actions_minor_antag.dmi' + action_icon = 'icons/hud/actions/actions_minor_antag.dmi' action_icon_state = "bloodcrawl" action_background_icon_state = "bg_demon" var/phased = FALSE diff --git a/code/modules/spells/spell_types/cluwnecurse.dm b/code/modules/spells/spell_types/cluwnecurse.dm index 019b327a8ac7b..ac2b320bc7989 100644 --- a/code/modules/spells/spell_types/cluwnecurse.dm +++ b/code/modules/spells/spell_types/cluwnecurse.dm @@ -12,7 +12,7 @@ cooldown_min = 75 selection_type = "range" var/list/compatible_mobs = list(/mob/living/carbon/human) - action_icon = 'icons/mob/actions.dmi' + action_icon = 'icons/hud/actions/action_generic.dmi' action_icon_state = "cluwne" /obj/effect/proc_holder/spell/targeted/cluwnecurse/cast(list/targets, mob/user = usr) diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm index 7a0247f5b6e9c..7f697c2a300f5 100644 --- a/code/modules/spells/spell_types/construct_spells.dm +++ b/code/modules/spells/spell_types/construct_spells.dm @@ -2,7 +2,7 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser charge_max = 3 MINUTES - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "artificer" action_background_icon_state = "bg_demon" @@ -20,7 +20,7 @@ invocation = "none" invocation_type = INVOCATION_NONE range = 2 - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "areaconvert" action_background_icon_state = "bg_cult" @@ -41,7 +41,7 @@ invocation_type = INVOCATION_NONE range = 0 summon_type = list(/turf/open/floor/engine/cult) - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "floorconstruct" action_background_icon_state = "bg_cult" @@ -56,7 +56,7 @@ invocation = "none" invocation_type = INVOCATION_NONE range = 0 - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "lesserconstruct" action_background_icon_state = "bg_cult" @@ -73,7 +73,7 @@ invocation_type = INVOCATION_NONE invocation_time = 50 range = 0 - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "airlockconstruct" action_background_icon_state = "bg_cult" @@ -102,7 +102,7 @@ invocation = "none" invocation_type = INVOCATION_NONE range = 0 - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "summonsoulstone" action_background_icon_state = "bg_demon" @@ -130,7 +130,7 @@ invocation = "none" invocation_type = INVOCATION_NONE wall_type = /obj/effect/forcefield/cult - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "cultforcewall" action_background_icon_state = "bg_demon" @@ -144,7 +144,7 @@ invocation = "none" invocation_type = INVOCATION_NONE jaunt_duration = 5 SECONDS - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "phaseshift" action_background_icon_state = "bg_demon" jaunt_in_time = 0.6 SECONDS @@ -219,7 +219,7 @@ clothes_req = FALSE invocation = "none" invocation_type = INVOCATION_NONE - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_background_icon_state = "bg_demon" action_icon_state = "abyssal_gaze" @@ -267,7 +267,7 @@ clothes_req = FALSE invocation = "none" invocation_type = INVOCATION_NONE - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_background_icon_state = "bg_demon" action_icon_state = "dominate" @@ -323,7 +323,7 @@ proj_type = /obj/projectile/magic/spell/juggernaut charge_max = 35 SECONDS clothes_req = FALSE - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "cultfist" action_background_icon_state = "bg_demon" sound = 'sound/weapons/resonator_blast.ogg' diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm index d1ccd72301b75..de9949f1639b0 100644 --- a/code/modules/spells/spell_types/devil.dm +++ b/code/modules/spells/spell_types/devil.dm @@ -10,7 +10,7 @@ school = "conjuration" charge_max = 150 cooldown_min = 10 - action_icon = 'icons/mob/actions/actions_minor_antag.dmi' + action_icon = 'icons/hud/actions/actions_minor_antag.dmi' action_icon_state = "pitchfork" action_background_icon_state = "bg_demon" @@ -27,7 +27,7 @@ invocation = "I ain't have this much fun since Georgia." action_icon_state = "golden_violin" name = "Summon golden violin" - action_icon = 'icons/mob/actions/actions_minor_antag.dmi' + action_icon = 'icons/hud/actions/actions_minor_antag.dmi' action_background_icon_state = "bg_demon" /obj/effect/proc_holder/spell/targeted/summon_contract @@ -173,7 +173,7 @@ cooldown_min = 0 overlay = null include_user = FALSE - action_icon = 'icons/mob/actions/actions_cult.dmi' + action_icon = 'icons/hud/actions/actions_cult.dmi' action_icon_state = "sintouch" action_background_icon_state = "bg_demon" phase_allowed = FALSE @@ -211,7 +211,7 @@ school = "conjuration" charge_max = 10 cooldown_min = 50 //5 seconds, so the smoke can't be spammed - action_icon = 'icons/mob/actions/actions_minor_antag.dmi' + action_icon = 'icons/hud/actions/actions_minor_antag.dmi' action_icon_state = "funk" action_background_icon_state = "bg_demon" diff --git a/code/modules/spells/spell_types/devil_boons.dm b/code/modules/spells/spell_types/devil_boons.dm index f9f651f79c93d..72eebaea8db48 100644 --- a/code/modules/spells/spell_types/devil_boons.dm +++ b/code/modules/spells/spell_types/devil_boons.dm @@ -8,7 +8,7 @@ school = "conjuration" charge_max = 100 cooldown_min = 10 - action_icon = 'icons/mob/actions/actions_minor_antag.dmi' + action_icon = 'icons/hud/actions/actions_minor_antag.dmi' action_icon_state = "moneybag" @@ -35,7 +35,7 @@ clothes_req = FALSE charge_max = 50 cooldown_min = 10 - action_icon = 'icons/mob/actions/actions_silicon.dmi' + action_icon = 'icons/hud/actions/actions_silicon.dmi' action_icon_state = "camera_jump" var/ranges = list(7,8,9,10) @@ -54,7 +54,7 @@ clothes_req = FALSE charge_max = 50 cooldown_min = 10 - action_icon = 'icons/mob/actions/actions_spells.dmi' + action_icon = 'icons/hud/actions/actions_spells.dmi' action_icon_state = "sacredflame" var/mob/living/friend var/obj/effect/mob_spawn/human/demonic_friend/friendShell diff --git a/code/modules/spells/spell_types/lesserlichdom.dm b/code/modules/spells/spell_types/lesserlichdom.dm index 21f22ee5640f7..bb1cb79992b2c 100644 --- a/code/modules/spells/spell_types/lesserlichdom.dm +++ b/code/modules/spells/spell_types/lesserlichdom.dm @@ -17,7 +17,7 @@ cooldown_min = 10 include_user = TRUE - action_icon = 'icons/mob/actions/actions_spells.dmi' + action_icon = 'icons/hud/actions/actions_spells.dmi' action_icon_state = "skeleton" /obj/effect/proc_holder/spell/targeted/lesserlichdom/cast(list/targets,mob/user = usr) diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm index 7dd9a7c7ab02d..481802bcfc9b1 100644 --- a/code/modules/spells/spell_types/lichdom.dm +++ b/code/modules/spells/spell_types/lichdom.dm @@ -17,7 +17,7 @@ cooldown_min = 10 include_user = TRUE - action_icon = 'icons/mob/actions/actions_spells.dmi' + action_icon = 'icons/hud/actions/actions_spells.dmi' action_icon_state = "skeleton" /obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr) diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm index 2f4947a5a2835..949a0623d7591 100644 --- a/code/modules/spells/spell_types/mime.dm +++ b/code/modules/spells/spell_types/mime.dm @@ -14,7 +14,7 @@ cast_sound = null human_req = TRUE - action_icon = 'icons/mob/actions/actions_mime.dmi' + action_icon = 'icons/hud/actions/actions_mime.dmi' action_icon_state = "invisible_wall" action_background_icon_state = "bg_mime" @@ -44,7 +44,7 @@ cast_sound = null human_req = TRUE - action_icon = 'icons/mob/actions/actions_mime.dmi' + action_icon = 'icons/hud/actions/actions_mime.dmi' action_icon_state = "invisible_chair" action_background_icon_state = "bg_mime" @@ -82,7 +82,7 @@ cast_sound = null human_req = TRUE - action_icon = 'icons/mob/actions/actions_mime.dmi' + action_icon = 'icons/hud/actions/actions_mime.dmi' action_icon_state = "invisible_box" action_background_icon_state = "bg_mime" @@ -117,7 +117,7 @@ range = -1 include_user = TRUE - action_icon = 'icons/mob/actions/actions_mime.dmi' + action_icon = 'icons/hud/actions/actions_mime.dmi' action_icon_state = "mime_speech" action_background_icon_state = "bg_mime" @@ -162,7 +162,7 @@ range = -1 include_user = TRUE - action_icon = 'icons/mob/actions/actions_mime.dmi' + action_icon = 'icons/hud/actions/actions_mime.dmi' action_icon_state = "invisible_blockade" action_background_icon_state = "bg_mime" @@ -190,7 +190,7 @@ invocation_emote_self = "You fire your finger gun!" sound = null - action_icon = 'icons/mob/actions/actions_mime.dmi' + action_icon = 'icons/hud/actions/actions_mime.dmi' action_icon_state = "finger_guns0" action_background_icon_state = "bg_mime" diff --git a/code/modules/spells/spell_types/shadow_walk.dm b/code/modules/spells/spell_types/shadow_walk.dm index 992c303edecda..7dbcc2e0cda41 100644 --- a/code/modules/spells/spell_types/shadow_walk.dm +++ b/code/modules/spells/spell_types/shadow_walk.dm @@ -10,7 +10,7 @@ include_user = TRUE cooldown_min = 0 overlay = null - action_icon = 'icons/mob/actions/actions_minor_antag.dmi' + action_icon = 'icons/hud/actions/actions_minor_antag.dmi' action_icon_state = "ninja_cloak" action_background_icon_state = "bg_alien" diff --git a/code/modules/spells/spell_types/soultap.dm b/code/modules/spells/spell_types/soultap.dm index df978aa488287..2b26b6b180b7c 100644 --- a/code/modules/spells/spell_types/soultap.dm +++ b/code/modules/spells/spell_types/soultap.dm @@ -14,7 +14,7 @@ level_max = 0 cooldown_min = 10 - action_icon = 'icons/mob/actions/actions_spells.dmi' + action_icon = 'icons/hud/actions/actions_spells.dmi' action_icon_state = "soultap" /obj/effect/proc_holder/spell/self/tap/cast(mob/living/user = usr) diff --git a/code/modules/spells/spell_types/telepathy.dm b/code/modules/spells/spell_types/telepathy.dm index 3bb63f14e93df..52b3dcb88ac35 100644 --- a/code/modules/spells/spell_types/telepathy.dm +++ b/code/modules/spells/spell_types/telepathy.dm @@ -5,7 +5,7 @@ clothes_req = 0 range = 7 include_user = 0 - action_icon = 'icons/mob/actions/actions_revenant.dmi' + action_icon = 'icons/hud/actions/actions_revenant.dmi' action_icon_state = "r_transmit" action_background_icon_state = "bg_spell" var/notice = "notice" diff --git a/code/modules/spells/spell_types/voice_of_god.dm b/code/modules/spells/spell_types/voice_of_god.dm index da3256350e57a..4b31ae3d04392 100644 --- a/code/modules/spells/spell_types/voice_of_god.dm +++ b/code/modules/spells/spell_types/voice_of_god.dm @@ -6,7 +6,7 @@ level_max = 1 clothes_req = FALSE antimagic_allowed = TRUE - action_icon = 'icons/mob/actions/actions_items.dmi' + action_icon = 'icons/hud/actions/actions_items.dmi' action_icon_state = "voice_of_god" var/command var/cooldown_mod = 1 diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index 467d6bfef5882..fd80037bdd387 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -306,7 +306,7 @@ cooldown_min = 150 invocation_type = INVOCATION_NONE sparkle_path = /obj/effect/temp_visual/dir_setting/tailsweep - action_icon = 'icons/mob/actions/actions_xeno.dmi' + action_icon = 'icons/hud/actions/actions_xeno.dmi' action_icon_state = "tailsweep" action_background_icon_state = "bg_alien" anti_magic_check = FALSE diff --git a/code/modules/surgery/organs/wings.dm b/code/modules/surgery/organs/wings.dm index 80550e7f9d87c..0f9c1bbdf39b0 100644 --- a/code/modules/surgery/organs/wings.dm +++ b/code/modules/surgery/organs/wings.dm @@ -235,7 +235,7 @@ /datum/action/innate/flight name = "Toggle Flight" check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' button_icon_state = "flight" /datum/action/innate/flight/Activate() diff --git a/code/modules/vehicles/mecha/mecha_actions.dm b/code/modules/vehicles/mecha/mecha_actions.dm index 393ec643fbc01..f5b572ef46df5 100644 --- a/code/modules/vehicles/mecha/mecha_actions.dm +++ b/code/modules/vehicles/mecha/mecha_actions.dm @@ -8,7 +8,7 @@ /datum/action/vehicle/sealed/mecha - icon_icon = 'icons/mob/actions/actions_mecha.dmi' + icon_icon = 'icons/hud/actions/actions_mecha.dmi' var/obj/vehicle/sealed/mecha/chassis /datum/action/vehicle/sealed/mecha/Destroy() diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm index 174b7127ea6cd..d97d774d2fa84 100644 --- a/code/modules/vehicles/vehicle_actions.dm +++ b/code/modules/vehicles/vehicle_actions.dm @@ -93,7 +93,7 @@ /datum/action/vehicle check_flags = AB_CHECK_HANDS_BLOCKED | AB_CHECK_INCAPACITATED | AB_CHECK_CONSCIOUS - icon_icon = 'icons/mob/actions/actions_vehicle.dmi' + icon_icon = 'icons/hud/actions/actions_vehicle.dmi' button_icon_state = "vehicle_eject" var/obj/vehicle/vehicle_target diff --git a/code/modules/wiremod/components/bci/hud/bar_overlay.dm b/code/modules/wiremod/components/bci/hud/bar_overlay.dm index 04552adf19e76..9fabdb7ed580d 100644 --- a/code/modules/wiremod/components/bci/hud/bar_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/bar_overlay.dm @@ -43,7 +43,7 @@ number_clear = round(number_clear / 6.25) * 6.25 else if(current_option == COMP_BAR_OVERLAY_VERTICAL) number_clear = round(number_clear / 10) * 10 - var/image/cool_overlay = image(icon = 'icons/mob/screen_bci.dmi', loc = target_atom, icon_state = "[options_map[current_option]][number_clear]", layer = RIPPLE_LAYER) + var/image/cool_overlay = image(icon = 'icons/hud/screen_bci.dmi', loc = target_atom, icon_state = "[options_map[current_option]][number_clear]", layer = RIPPLE_LAYER) if(image_pixel_x.value) cool_overlay.pixel_x = image_pixel_x.value diff --git a/code/modules/wiremod/components/bci/hud/counter_overlay.dm b/code/modules/wiremod/components/bci/hud/counter_overlay.dm index 9dde0768d6d49..187a127dfb551 100644 --- a/code/modules/wiremod/components/bci/hud/counter_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/counter_overlay.dm @@ -56,7 +56,7 @@ numbers = list() QDEL_NULL(counter_appearance) - var/image/counter = image(icon = 'icons/mob/screen_bci.dmi', icon_state = "hud_numbers", loc = owner) + var/image/counter = image(icon = 'icons/hud/screen_bci.dmi', icon_state = "hud_numbers", loc = owner) if(image_pixel_x.value) counter.pixel_x = image_pixel_x.value if(image_pixel_y.value) @@ -73,7 +73,7 @@ for(var/i = 1 to 3) var/cur_num = round(cleared_number / (10 ** (3 - i))) % 10 - var/image/number = image(icon = 'icons/mob/screen_bci.dmi', icon_state = "hud_number_[cur_num]", loc = owner) + var/image/number = image(icon = 'icons/hud/screen_bci.dmi', icon_state = "hud_number_[cur_num]", loc = owner) if(image_pixel_x.value) number.pixel_x = image_pixel_x.value + (i - 1) * 9 diff --git a/code/modules/wiremod/components/bci/hud/object_overlay.dm b/code/modules/wiremod/components/bci/hud/object_overlay.dm index 669a7a9367cd2..3acd5b51469f2 100644 --- a/code/modules/wiremod/components/bci/hud/object_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/object_overlay.dm @@ -103,7 +103,7 @@ if(active_overlays[target_atom]) QDEL_NULL(active_overlays[target_atom]) - var/image/cool_overlay = image(icon = 'icons/mob/screen_bci.dmi', loc = target_atom, icon_state = options_map[object_overlay_options.value], layer = RIPPLE_LAYER) + var/image/cool_overlay = image(icon = 'icons/hud/screen_bci.dmi', loc = target_atom, icon_state = options_map[object_overlay_options.value], layer = RIPPLE_LAYER) if(image_pixel_x.value) cool_overlay.pixel_x = image_pixel_x.value diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index bce7a4bea6e0e..5a9064031ae23 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -134,7 +134,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/circuit_component/bci_action) /datum/action/innate/bci_action name = "Action" - icon_icon = 'icons/mob/actions/actions_items.dmi' + icon_icon = 'icons/hud/actions/actions_items.dmi' check_flags = AB_CHECK_CONSCIOUS button_icon_state = "bci_power" diff --git a/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm b/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm index 838e504dd9ec7..8bfb1997822da 100644 --- a/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm +++ b/code/modules/xenoarchaeology/traits/xenoartifact_minors.dm @@ -170,7 +170,7 @@ charge_max = 0 SECONDS clothes_req = 0 include_user = 0 - action_icon = 'icons/mob/actions/actions_revenant.dmi' + action_icon = 'icons/hud/actions/actions_revenant.dmi' action_icon_state = "r_transmit" action_background_icon_state = "bg_spell" var/obj/item/xenoartifact/xeno diff --git a/icons/effects/cult_effects.dmi b/icons/effects/cult_effects.dmi index 263893a3ff4fa..0f17e3b0d058c 100644 Binary files a/icons/effects/cult_effects.dmi and b/icons/effects/cult_effects.dmi differ diff --git a/icons/mob/actions.dmi b/icons/hud/actions/action_generic.dmi similarity index 100% rename from icons/mob/actions.dmi rename to icons/hud/actions/action_generic.dmi diff --git a/icons/mob/actions/actions_AI.dmi b/icons/hud/actions/actions_AI.dmi similarity index 100% rename from icons/mob/actions/actions_AI.dmi rename to icons/hud/actions/actions_AI.dmi diff --git a/icons/mob/actions/actions_animal.dmi b/icons/hud/actions/actions_animal.dmi similarity index 100% rename from icons/mob/actions/actions_animal.dmi rename to icons/hud/actions/actions_animal.dmi diff --git a/icons/hud/actions/actions_blob.dmi b/icons/hud/actions/actions_blob.dmi new file mode 100644 index 0000000000000..f7cb72bbcdaae Binary files /dev/null and b/icons/hud/actions/actions_blob.dmi differ diff --git a/icons/mob/actions/actions_changeling.dmi b/icons/hud/actions/actions_changeling.dmi similarity index 100% rename from icons/mob/actions/actions_changeling.dmi rename to icons/hud/actions/actions_changeling.dmi diff --git a/icons/mob/actions/actions_clockcult.dmi b/icons/hud/actions/actions_clockcult.dmi similarity index 100% rename from icons/mob/actions/actions_clockcult.dmi rename to icons/hud/actions/actions_clockcult.dmi diff --git a/icons/mob/actions/actions_construction.dmi b/icons/hud/actions/actions_construction.dmi similarity index 100% rename from icons/mob/actions/actions_construction.dmi rename to icons/hud/actions/actions_construction.dmi diff --git a/icons/mob/actions/actions_cult.dmi b/icons/hud/actions/actions_cult.dmi similarity index 100% rename from icons/mob/actions/actions_cult.dmi rename to icons/hud/actions/actions_cult.dmi diff --git a/icons/mob/actions/actions_elites.dmi b/icons/hud/actions/actions_elites.dmi similarity index 100% rename from icons/mob/actions/actions_elites.dmi rename to icons/hud/actions/actions_elites.dmi diff --git a/icons/mob/actions/actions_ecult.dmi b/icons/hud/actions/actions_heretic.dmi similarity index 100% rename from icons/mob/actions/actions_ecult.dmi rename to icons/hud/actions/actions_heretic.dmi diff --git a/icons/mob/actions/actions_hive.dmi b/icons/hud/actions/actions_hive.dmi similarity index 100% rename from icons/mob/actions/actions_hive.dmi rename to icons/hud/actions/actions_hive.dmi diff --git a/icons/mob/actions/actions_items.dmi b/icons/hud/actions/actions_items.dmi similarity index 100% rename from icons/mob/actions/actions_items.dmi rename to icons/hud/actions/actions_items.dmi diff --git a/icons/mob/actions/actions_mecha.dmi b/icons/hud/actions/actions_mecha.dmi similarity index 100% rename from icons/mob/actions/actions_mecha.dmi rename to icons/hud/actions/actions_mecha.dmi diff --git a/icons/mob/actions/actions_mime.dmi b/icons/hud/actions/actions_mime.dmi similarity index 100% rename from icons/mob/actions/actions_mime.dmi rename to icons/hud/actions/actions_mime.dmi diff --git a/icons/mob/actions/actions_minor_antag.dmi b/icons/hud/actions/actions_minor_antag.dmi similarity index 100% rename from icons/mob/actions/actions_minor_antag.dmi rename to icons/hud/actions/actions_minor_antag.dmi diff --git a/icons/mob/actions/actions_revenant.dmi b/icons/hud/actions/actions_revenant.dmi similarity index 100% rename from icons/mob/actions/actions_revenant.dmi rename to icons/hud/actions/actions_revenant.dmi diff --git a/icons/mob/actions/actions_shuttle.dmi b/icons/hud/actions/actions_shuttle.dmi similarity index 100% rename from icons/mob/actions/actions_shuttle.dmi rename to icons/hud/actions/actions_shuttle.dmi diff --git a/icons/mob/actions/actions_silicon.dmi b/icons/hud/actions/actions_silicon.dmi similarity index 100% rename from icons/mob/actions/actions_silicon.dmi rename to icons/hud/actions/actions_silicon.dmi diff --git a/icons/mob/actions/actions_slime.dmi b/icons/hud/actions/actions_slime.dmi similarity index 100% rename from icons/mob/actions/actions_slime.dmi rename to icons/hud/actions/actions_slime.dmi diff --git a/icons/mob/actions/actions_space_dragon.dmi b/icons/hud/actions/actions_space_dragon.dmi similarity index 100% rename from icons/mob/actions/actions_space_dragon.dmi rename to icons/hud/actions/actions_space_dragon.dmi diff --git a/icons/mob/actions/actions_spacesuit.dmi b/icons/hud/actions/actions_spacesuit.dmi similarity index 100% rename from icons/mob/actions/actions_spacesuit.dmi rename to icons/hud/actions/actions_spacesuit.dmi diff --git a/icons/mob/actions/actions_spells.dmi b/icons/hud/actions/actions_spells.dmi similarity index 100% rename from icons/mob/actions/actions_spells.dmi rename to icons/hud/actions/actions_spells.dmi diff --git a/icons/mob/actions/actions_vehicle.dmi b/icons/hud/actions/actions_vehicle.dmi similarity index 100% rename from icons/mob/actions/actions_vehicle.dmi rename to icons/hud/actions/actions_vehicle.dmi diff --git a/icons/mob/actions/actions_xeno.dmi b/icons/hud/actions/actions_xeno.dmi similarity index 100% rename from icons/mob/actions/actions_xeno.dmi rename to icons/hud/actions/actions_xeno.dmi diff --git a/icons/mob/actions/backgrounds.dmi b/icons/hud/actions/backgrounds.dmi similarity index 100% rename from icons/mob/actions/backgrounds.dmi rename to icons/hud/actions/backgrounds.dmi diff --git a/icons/mob/psychic.dmi b/icons/hud/fullscreen/psychic.dmi similarity index 100% rename from icons/mob/psychic.dmi rename to icons/hud/fullscreen/psychic.dmi diff --git a/icons/mob/screen_full.dmi b/icons/hud/fullscreen/screen_full.dmi similarity index 100% rename from icons/mob/screen_full.dmi rename to icons/hud/fullscreen/screen_full.dmi diff --git a/icons/effects/aiming.dmi b/icons/hud/radials/radial_aiming.dmi similarity index 100% rename from icons/effects/aiming.dmi rename to icons/hud/radials/radial_aiming.dmi diff --git a/icons/mob/radial.dmi b/icons/hud/radials/radial_generic.dmi similarity index 100% rename from icons/mob/radial.dmi rename to icons/hud/radials/radial_generic.dmi diff --git a/icons/obj/radial_tape.dmi b/icons/hud/radials/radial_tape.dmi similarity index 100% rename from icons/obj/radial_tape.dmi rename to icons/hud/radials/radial_tape.dmi diff --git a/icons/obj/radial_taperecorder.dmi b/icons/hud/radials/radial_taperecorder.dmi similarity index 100% rename from icons/obj/radial_taperecorder.dmi rename to icons/hud/radials/radial_taperecorder.dmi diff --git a/icons/mob/screen_ai.dmi b/icons/hud/screen_ai.dmi similarity index 100% rename from icons/mob/screen_ai.dmi rename to icons/hud/screen_ai.dmi diff --git a/icons/mob/screen_alert.dmi b/icons/hud/screen_alert.dmi similarity index 100% rename from icons/mob/screen_alert.dmi rename to icons/hud/screen_alert.dmi diff --git a/icons/mob/screen_alien.dmi b/icons/hud/screen_alien.dmi similarity index 100% rename from icons/mob/screen_alien.dmi rename to icons/hud/screen_alien.dmi diff --git a/icons/mob/screen_bci.dmi b/icons/hud/screen_bci.dmi similarity index 100% rename from icons/mob/screen_bci.dmi rename to icons/hud/screen_bci.dmi diff --git a/icons/mob/screen_construct.dmi b/icons/hud/screen_construct.dmi similarity index 100% rename from icons/mob/screen_construct.dmi rename to icons/hud/screen_construct.dmi diff --git a/icons/mob/screen_cyborg.dmi b/icons/hud/screen_cyborg.dmi similarity index 100% rename from icons/mob/screen_cyborg.dmi rename to icons/hud/screen_cyborg.dmi diff --git a/icons/mob/screen_elite.dmi b/icons/hud/screen_elite.dmi similarity index 100% rename from icons/mob/screen_elite.dmi rename to icons/hud/screen_elite.dmi diff --git a/icons/mob/screen_gen.dmi b/icons/hud/screen_gen.dmi similarity index 100% rename from icons/mob/screen_gen.dmi rename to icons/hud/screen_gen.dmi diff --git a/icons/mob/screen_ghost.dmi b/icons/hud/screen_ghost.dmi similarity index 100% rename from icons/mob/screen_ghost.dmi rename to icons/hud/screen_ghost.dmi diff --git a/icons/mob/screen_pai.dmi b/icons/hud/screen_pai.dmi similarity index 100% rename from icons/mob/screen_pai.dmi rename to icons/hud/screen_pai.dmi diff --git a/icons/mob/screen_slime.dmi b/icons/hud/screen_slime.dmi similarity index 100% rename from icons/mob/screen_slime.dmi rename to icons/hud/screen_slime.dmi diff --git a/icons/mob/screen_clockwork.dmi b/icons/hud/style/screen_clockwork.dmi similarity index 100% rename from icons/mob/screen_clockwork.dmi rename to icons/hud/style/screen_clockwork.dmi diff --git a/icons/mob/screen_midnight.dmi b/icons/hud/style/screen_midnight.dmi similarity index 100% rename from icons/mob/screen_midnight.dmi rename to icons/hud/style/screen_midnight.dmi diff --git a/icons/mob/screen_operative.dmi b/icons/hud/style/screen_operative.dmi similarity index 100% rename from icons/mob/screen_operative.dmi rename to icons/hud/style/screen_operative.dmi diff --git a/icons/mob/screen_plasmafire.dmi b/icons/hud/style/screen_plasmafire.dmi similarity index 100% rename from icons/mob/screen_plasmafire.dmi rename to icons/hud/style/screen_plasmafire.dmi diff --git a/icons/mob/screen_retro.dmi b/icons/hud/style/screen_retro.dmi similarity index 100% rename from icons/mob/screen_retro.dmi rename to icons/hud/style/screen_retro.dmi diff --git a/icons/mob/screen_slimecore.dmi b/icons/hud/style/screen_slimecore.dmi similarity index 100% rename from icons/mob/screen_slimecore.dmi rename to icons/hud/style/screen_slimecore.dmi diff --git a/icons/mob/screen_trasenknox.dmi b/icons/hud/style/screen_trasenknox.dmi similarity index 100% rename from icons/mob/screen_trasenknox.dmi rename to icons/hud/style/screen_trasenknox.dmi diff --git a/icons/mob/actions/actions_flightsuit.dmi b/icons/hud/unused/actions_flightsuit.dmi similarity index 100% rename from icons/mob/actions/actions_flightsuit.dmi rename to icons/hud/unused/actions_flightsuit.dmi diff --git a/icons/mob/actions/actions_genetic.dmi b/icons/hud/unused/actions_genetic.dmi similarity index 100% rename from icons/mob/actions/actions_genetic.dmi rename to icons/hud/unused/actions_genetic.dmi diff --git a/icons/mob/actions/actions_vr.dmi b/icons/hud/unused/actions_vr.dmi similarity index 100% rename from icons/mob/actions/actions_vr.dmi rename to icons/hud/unused/actions_vr.dmi diff --git a/icons/mob/screen_gen_old.dmi b/icons/hud/unused/screen_gen_old.dmi similarity index 100% rename from icons/mob/screen_gen_old.dmi rename to icons/hud/unused/screen_gen_old.dmi diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi index 4a20cb66d7034..a552d0813c2d5 100644 Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi index 278435821084f..7443640fabbbb 100644 Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ