From 9d6b304ac7b792ad0b4c33d734896434991dd604 Mon Sep 17 00:00:00 2001 From: Batrachophreno Date: Mon, 18 May 2026 15:19:40 -0400 Subject: [PATCH] [IDB Ignore] Centralize HUD icon file location (#22464) Moves all HUD screen object icon files from various scattered locations to icons/hud. No changes made to any icon_states in this PR, no player-facing changes. Part of larger icon organization work and in preparation for action button rework. --- code/_onclick/click.dm | 2 +- code/_onclick/hud/ability_screen_objects.dm | 4 +-- code/_onclick/hud/action.dm | 8 ++--- code/_onclick/hud/alert.dm | 2 +- code/_onclick/hud/captive_brain_hud.dm | 2 +- code/_onclick/hud/fullscreen.dm | 12 ++++---- code/_onclick/hud/gun_mode.dm | 2 +- code/_onclick/hud/hud.dm | 2 +- code/_onclick/hud/human.dm | 28 +++++++++--------- code/_onclick/hud/morph.dm | 10 +++---- code/_onclick/hud/nymph_hud.dm | 4 +-- code/_onclick/hud/other_mobs.dm | 14 ++++----- code/_onclick/hud/radial.dm | 2 +- code/_onclick/hud/robot.dm | 26 ++++++++-------- .../hud/screen_object_types/ai_screen_objs.dm | 4 +-- .../_onclick/hud/screen_object_types/borer.dm | 2 +- .../hud/screen_object_types/vampire.dm | 2 +- code/_onclick/hud/screen_objects.dm | 14 ++++----- code/_onclick/hud/spell_screen_objects.dm | 4 +-- code/game/machinery/iv_drip.dm | 22 +++++++------- code/game/objects/effects/bump_teleporter.dm | 2 +- code/game/objects/effects/decals/misc.dm | 2 +- code/game/objects/effects/landmarks.dm | 4 +-- code/game/objects/effects/manifest.dm | 2 +- .../objects/effects/spawners/bombspawner.dm | 2 +- code/game/objects/effects/step_triggers.dm | 2 +- code/game/objects/items/devices/auto_cpr.dm | 4 +-- code/game/objects/items/weapons/RFD.dm | 8 ++--- .../objects/items/weapons/storage/internal.dm | 2 +- .../structures/stool_bed_chair_nest/bed.dm | 8 ++--- code/modules/admin/buildmode/buttons.dm | 2 +- code/modules/awaymissions/loot.dm | 2 +- code/modules/cargo/randomstock.dm | 2 +- code/modules/client/ui_style.dm | 10 +++---- code/modules/clothing/clothing.dm | 2 +- .../machinery/cooking_machines/_cooker.dm | 2 +- .../machinery/cooking_machines/microwave.dm | 2 +- .../maze_generation/maze_helper_atoms.dm | 2 +- .../ghostroles/spawnpoint/spawnpoint.dm | 2 +- .../heavy_vehicle/interface/_interface.dm | 4 +-- .../heavy_vehicle/interface/screen_objects.dm | 10 +++---- .../mining/machine_input_output_plates.dm | 4 +-- code/modules/mob/abstract/new_player/menu.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../living/carbon/human/human_attackhand.dm | 8 ++--- code/modules/mob/living/carbon/human/life.dm | 10 +++---- code/modules/mob/mob.dm | 2 +- code/modules/mob/mob_grab.dm | 2 +- code/modules/psionics/interface/ui.dm | 2 +- code/modules/supermatter/setup_supermatter.dm | 2 +- code/unit_tests/mob_tests.dm | 2 +- html/changelogs/Bat-HudIconMove.yml | 4 +++ icons/{obj => hud}/action_buttons/actions.dmi | Bin .../{obj => hud}/action_buttons/implants.dmi | Bin icons/{obj => hud}/action_buttons/organs.dmi | Bin icons/hud/buildmode.dmi | Bin 0 -> 1483 bytes icons/{effects => hud}/cursor/throw_mode.dmi | Bin icons/{ => hud}/mecha/mecha_hud.dmi | Bin icons/{mob/screen => hud/mob}/action.dmi | Bin icons/{mob/screen => hud/mob}/ai.dmi | Bin icons/{mob/screen => hud/mob}/borer.dmi | Bin .../{mob/screen => hud/mob}/captive_brain.dmi | Bin icons/{mob/screen => hud/mob}/construct.dmi | Bin icons/{mob/screen => hud/mob}/diona_nymph.dmi | Bin icons/{mob/screen => hud/mob}/effects.dmi | Bin icons/{mob/screen => hud/mob}/full.dmi | Bin icons/{mob/screen => hud/mob}/generic.dmi | Bin icons/{mob/screen => hud/mob}/hud_status.dmi | Bin icons/{mob/screen => hud/mob}/midnight.dmi | Bin icons/{mob/screen => hud/mob}/morph.dmi | Bin .../{mob/screen => hud/mob}/old-noborder.dmi | Bin icons/{mob/screen => hud/mob}/old.dmi | Bin icons/{mob/screen => hud/mob}/orange.dmi | Bin icons/{mob/screen => hud/mob}/psi.dmi | Bin icons/{mob/screen => hud/mob}/radial.dmi | Bin icons/{mob/screen => hud/mob}/robot.dmi | Bin icons/{mob/screen => hud/mob}/robot_pain.dmi | Bin icons/{ => hud}/mob/screen1_health.dmi | Bin icons/{ => hud}/mob/screen_alert.dmi | Bin icons/{ => hud}/mob/screen_gen.dmi | Bin icons/{ => hud}/mob/screen_spells.dmi | Bin icons/{mob/screen => hud/mob}/spells.dmi | Bin icons/{ => hud}/mob/status_hunger.dmi | Bin icons/{ => hud}/mob/status_indicators.dmi | Bin icons/{mob/screen => hud/mob}/triage_tag.dmi | Bin icons/{mob/screen => hud/mob}/vampire.dmi | Bin icons/{mob/screen => hud/mob}/white.dmi | Bin icons/{ => hud}/mob/zone_sel.dmi | Bin 88 files changed, 143 insertions(+), 139 deletions(-) create mode 100644 html/changelogs/Bat-HudIconMove.yml rename icons/{obj => hud}/action_buttons/actions.dmi (100%) rename icons/{obj => hud}/action_buttons/implants.dmi (100%) rename icons/{obj => hud}/action_buttons/organs.dmi (100%) create mode 100644 icons/hud/buildmode.dmi rename icons/{effects => hud}/cursor/throw_mode.dmi (100%) rename icons/{ => hud}/mecha/mecha_hud.dmi (100%) rename icons/{mob/screen => hud/mob}/action.dmi (100%) rename icons/{mob/screen => hud/mob}/ai.dmi (100%) rename icons/{mob/screen => hud/mob}/borer.dmi (100%) rename icons/{mob/screen => hud/mob}/captive_brain.dmi (100%) rename icons/{mob/screen => hud/mob}/construct.dmi (100%) rename icons/{mob/screen => hud/mob}/diona_nymph.dmi (100%) rename icons/{mob/screen => hud/mob}/effects.dmi (100%) rename icons/{mob/screen => hud/mob}/full.dmi (100%) rename icons/{mob/screen => hud/mob}/generic.dmi (100%) rename icons/{mob/screen => hud/mob}/hud_status.dmi (100%) rename icons/{mob/screen => hud/mob}/midnight.dmi (100%) rename icons/{mob/screen => hud/mob}/morph.dmi (100%) rename icons/{mob/screen => hud/mob}/old-noborder.dmi (100%) rename icons/{mob/screen => hud/mob}/old.dmi (100%) rename icons/{mob/screen => hud/mob}/orange.dmi (100%) rename icons/{mob/screen => hud/mob}/psi.dmi (100%) rename icons/{mob/screen => hud/mob}/radial.dmi (100%) rename icons/{mob/screen => hud/mob}/robot.dmi (100%) rename icons/{mob/screen => hud/mob}/robot_pain.dmi (100%) rename icons/{ => hud}/mob/screen1_health.dmi (100%) rename icons/{ => hud}/mob/screen_alert.dmi (100%) rename icons/{ => hud}/mob/screen_gen.dmi (100%) rename icons/{ => hud}/mob/screen_spells.dmi (100%) rename icons/{mob/screen => hud/mob}/spells.dmi (100%) rename icons/{ => hud}/mob/status_hunger.dmi (100%) rename icons/{ => hud}/mob/status_indicators.dmi (100%) rename icons/{mob/screen => hud/mob}/triage_tag.dmi (100%) rename icons/{mob/screen => hud/mob}/vampire.dmi (100%) rename icons/{mob/screen => hud/mob}/white.dmi (100%) rename icons/{ => hud}/mob/zone_sel.dmi (100%) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 7f989b82c03..93ff94ebd89 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -421,7 +421,7 @@ GLOBAL_LIST(click_catchers) /atom/movable/screen/click_catcher - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/mob/screen_gen.dmi' icon_state = "click_catcher" plane = CLICKCATCHER_PLANE mouse_opacity = MOUSE_OPACITY_OPAQUE diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm index 03715dfb34b..b15a313b834 100644 --- a/code/_onclick/hud/ability_screen_objects.dm +++ b/code/_onclick/hud/ability_screen_objects.dm @@ -1,6 +1,6 @@ /atom/movable/screen/movable/ability_master name = "Abilities" - icon = 'icons/mob/screen_spells.dmi' + icon = 'icons/hud/mob/screen_spells.dmi' icon_state = "grey_spell_ready" var/list/atom/movable/screen/ability/ability_objects = list() var/showing = FALSE // If we're 'open' or not. @@ -153,7 +153,7 @@ //This is what you click to do things// /////////////////////////////////////// /atom/movable/screen/ability - icon = 'icons/mob/screen_spells.dmi' + icon = 'icons/hud/mob/screen_spells.dmi' icon_state = "grey_spell_base" maptext_x = 3 var/background_base_state = "grey" diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index f6df12e0109..928e2889317 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -26,7 +26,7 @@ var/processing = 0 var/active = 0 var/atom/movable/screen/movable/action_button/button = null - var/button_icon = 'icons/obj/action_buttons/actions.dmi' + var/button_icon = 'icons/hud/action_buttons/actions.dmi' var/button_icon_state = "default" var/button_icon_color var/background_icon_state = "bg_default" @@ -175,7 +175,7 @@ //Hide/Show Action Buttons ... Button /atom/movable/screen/movable/action_button/hide_toggle name = "Hide Buttons" - icon = 'icons/obj/action_buttons/actions.dmi' + icon = 'icons/hud/action_buttons/actions.dmi' icon_state = "bg_default" var/hidden = 0 @@ -245,7 +245,7 @@ /datum/action/item_action/hands_free/activate/implant action_type = AB_ITEM_USE_ICON - button_icon = 'icons/obj/action_buttons/implants.dmi' + button_icon = 'icons/hud/action_buttons/implants.dmi' button_icon_state = "default" /datum/action/item_action/hands_free/activate/implant/adrenaline @@ -268,7 +268,7 @@ /datum/action/item_action/organ action_type = AB_ITEM_USE_ICON - button_icon = 'icons/obj/action_buttons/organs.dmi' + button_icon = 'icons/hud/action_buttons/organs.dmi' /datum/action/item_action/organ/SetTarget(var/atom/Target) . = ..() diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index c2391b807da..d3e34891e44 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -87,7 +87,7 @@ qdel(alert) /atom/movable/screen/alert - icon = 'icons/mob/screen_alert.dmi' + icon = 'icons/hud/mob/screen_alert.dmi' icon_state = "default" name = "Alert" desc = "Something seems to have gone wrong with this alert, so report this bug please." diff --git a/code/_onclick/hud/captive_brain_hud.dm b/code/_onclick/hud/captive_brain_hud.dm index c2052872255..027f2ac2803 100644 --- a/code/_onclick/hud/captive_brain_hud.dm +++ b/code/_onclick/hud/captive_brain_hud.dm @@ -6,7 +6,7 @@ var/atom/movable/screen/resist = new /atom/movable/screen() resist.name = "resist" - resist.icon = 'icons/mob/screen/captive_brain.dmi' + resist.icon = 'icons/hud/mob/captive_brain.dmi' resist.icon_state = "resist" resist.screen_loc = "EAST-8,BOTTOM:8" resist.layer = HUD_ABOVE_ITEM_LAYER diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 4dbad26adcf..6694329a6c1 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -61,7 +61,7 @@ client.screen |= screens[category] /atom/movable/screen/fullscreen - icon = 'icons/mob/screen/full.dmi' + icon = 'icons/hud/mob/full.dmi' icon_state = "default" screen_loc = "CENTER-7,CENTER-7" mouse_opacity = MOUSE_OPACITY_TRANSPARENT @@ -105,7 +105,7 @@ icon_state = "impairedoverlay2" /atom/movable/screen/fullscreen/blurry - icon = 'icons/mob/screen/effects.dmi' + icon = 'icons/hud/mob/effects.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "blurry" alpha = 100 @@ -115,11 +115,11 @@ alpha = 0 /atom/movable/screen/fullscreen/robot_pain - icon = 'icons/mob/screen/robot_pain.dmi' + icon = 'icons/hud/mob/robot_pain.dmi' alpha = 255 /atom/movable/screen/fullscreen/flash - icon = 'icons/mob/screen/effects.dmi' + icon = 'icons/hud/mob/effects.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" @@ -134,7 +134,7 @@ alpha = 127 /atom/movable/screen/fullscreen/fadeout - icon = 'icons/mob/screen/effects.dmi' + icon = 'icons/hud/mob/effects.dmi' icon_state = "black" screen_loc = ui_entire_screen alpha = 0 @@ -167,7 +167,7 @@ alpha = 35 /atom/movable/screen/fullscreen/lighting_backdrop - icon = 'icons/mob/screen/white.dmi' + icon = 'icons/hud/mob/white.dmi' icon_state = "flash" transform = matrix(200, 0, 0, 0, 200, 0) plane = LIGHTING_PLANE diff --git a/code/_onclick/hud/gun_mode.dm b/code/_onclick/hud/gun_mode.dm index ef2b8bd110a..87aa93f7141 100644 --- a/code/_onclick/hud/gun_mode.dm +++ b/code/_onclick/hud/gun_mode.dm @@ -1,6 +1,6 @@ /atom/movable/screen/gun name = "gun" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' master = null dir = 2 diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 497394a6480..b097111884d 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -51,7 +51,7 @@ GLOBAL_LIST(global_huds) blurry.alpha = 100 vr_control = new /atom/movable/screen() - vr_control.icon = 'icons/mob/screen/full.dmi' + vr_control.icon = 'icons/hud/mob/full.dmi' vr_control.icon_state = "vr_control" vr_control.screen_loc = "1,1" vr_control.mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 80fead9f6ff..fb64c0b36a3 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -1,7 +1,7 @@ /mob/living/carbon/human/instantiate_hud(datum/hud/HUD, ui_style, ui_color, ui_alpha) HUD.human_hud(ui_style, ui_color, ui_alpha, src) -/datum/hud/proc/human_hud(var/ui_style='icons/mob/screen/white.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255, var/mob/living/carbon/human/target) +/datum/hud/proc/human_hud(var/ui_style='icons/hud/mob/white.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255, var/mob/living/carbon/human/target) var/datum/hud_data/hud_data if(!istype(target)) hud_data = new() @@ -238,21 +238,21 @@ if(hud_data.has_warnings) mymob.oxygen = new /atom/movable/screen/oxygen() - mymob.oxygen.icon = 'icons/mob/status_indicators.dmi' + mymob.oxygen.icon = 'icons/hud/mob/status_indicators.dmi' mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_temp hud_elements |= mymob.oxygen mymob.toxin = new /atom/movable/screen/toxins() - mymob.toxin.icon = 'icons/mob/status_indicators.dmi' + mymob.toxin.icon = 'icons/hud/mob/status_indicators.dmi' mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_temp hud_elements |= mymob.toxin mymob.paralysis_indicator = new /atom/movable/screen/paralysis() - mymob.paralysis_indicator.icon = 'icons/mob/status_indicators.dmi' + mymob.paralysis_indicator.icon = 'icons/hud/mob/status_indicators.dmi' mymob.paralysis_indicator.icon_state = "paralysis0" mymob.paralysis_indicator.name = "paralysis" mymob.paralysis_indicator.screen_loc = ui_paralysis @@ -270,7 +270,7 @@ if(hud_data.has_pressure) mymob.pressure = new /atom/movable/screen/pressure() - mymob.pressure.icon = 'icons/mob/status_indicators.dmi' + mymob.pressure.icon = 'icons/hud/mob/status_indicators.dmi' mymob.pressure.icon_state = "pressure0" mymob.pressure.name = "pressure" mymob.pressure.screen_loc = ui_temp @@ -278,7 +278,7 @@ if(hud_data.has_bodytemp) mymob.bodytemp = new /atom/movable/screen/bodytemp() - mymob.bodytemp.icon = 'icons/mob/status_indicators.dmi' + mymob.bodytemp.icon = 'icons/hud/mob/status_indicators.dmi' mymob.bodytemp.icon_state = "temp1" mymob.bodytemp.name = "body temperature" mymob.bodytemp.screen_loc = ui_temp @@ -286,7 +286,7 @@ if(hud_data.has_cell) mymob.cells = new /atom/movable/screen() - mymob.cells.icon = 'icons/mob/screen/robot.dmi' + mymob.cells.icon = 'icons/hud/mob/robot.dmi' mymob.cells.icon_state = "charge-empty" mymob.cells.name = "cell" mymob.cells.screen_loc = ui_nutrition @@ -294,7 +294,7 @@ if(hud_data.has_nutrition) mymob.nutrition_icon = new /atom/movable/screen/food() - mymob.nutrition_icon.icon = 'icons/mob/status_hunger.dmi' + mymob.nutrition_icon.icon = 'icons/hud/mob/status_hunger.dmi' mymob.nutrition_icon.pixel_w = 8 mymob.nutrition_icon.icon_state = "nutrition0" mymob.nutrition_icon.name = "nutrition" @@ -303,7 +303,7 @@ if(hud_data.has_hydration) mymob.hydration_icon = new /atom/movable/screen/thirst() - mymob.hydration_icon.icon = 'icons/mob/status_hunger.dmi' + mymob.hydration_icon.icon = 'icons/hud/mob/status_hunger.dmi' mymob.hydration_icon.icon_state = "thirst0" mymob.hydration_icon.name = "thirst" mymob.hydration_icon.screen_loc = ui_nutrition @@ -339,7 +339,7 @@ mymob.zone_sel.color = ui_color mymob.zone_sel.alpha = ui_alpha mymob.zone_sel.ClearOverlays() - mymob.zone_sel.AddOverlays(image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) + mymob.zone_sel.AddOverlays(image('icons/hud/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) hud_elements |= mymob.zone_sel //Handle the gun settings buttons @@ -509,24 +509,24 @@ /atom/movable/screen/instability name = "instability" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/mob/screen_gen.dmi' icon_state = "instability-1" invisibility = 101 /atom/movable/screen/energy name = "energy" - icon = 'icons/mob/screen_gen.dmi' + icon = 'icons/hud/mob/screen_gen.dmi' icon_state = "wiz_energy" invisibility = 101 /atom/movable/screen/status - icon = 'icons/mob/screen/midnight.dmi' + icon = 'icons/hud/mob/midnight.dmi' icon_state = "status_template" var/status_message /atom/movable/screen/status/Initialize(mapload, var/set_icon, var/set_overlay, var/set_status_message) icon = set_icon - var/image/status_overlay = image('icons/mob/screen/hud_status.dmi', null, set_overlay) + var/image/status_overlay = image('icons/hud/mob/hud_status.dmi', null, set_overlay) status_overlay.appearance_flags = RESET_COLOR AddOverlays(status_overlay) status_message = set_status_message diff --git a/code/_onclick/hud/morph.dm b/code/_onclick/hud/morph.dm index d51a176213c..2f1e52c40d3 100644 --- a/code/_onclick/hud/morph.dm +++ b/code/_onclick/hud/morph.dm @@ -4,24 +4,24 @@ /datum/hud/proc/morph_hud() var/atom/movable/screen/mov_intent = new /atom/movable/screen/movement_intent() mov_intent.set_dir(SOUTHWEST) - mov_intent.icon = 'icons/mob/screen/morph.dmi' + mov_intent.icon = 'icons/hud/mob/morph.dmi' mov_intent.icon_state = (mymob.m_intent == M_RUN ? "running" : "walking") move_intent = mov_intent mymob.healths = new /atom/movable/screen() mymob.healths.name = "health" - mymob.healths.icon = 'icons/mob/screen/morph.dmi' + mymob.healths.icon = 'icons/hud/mob/morph.dmi' mymob.healths.icon_state = "health0" mymob.healths.screen_loc = ui_alien_health mymob.zone_sel = new /atom/movable/screen/zone_sel() - mymob.zone_sel.icon = 'icons/mob/screen/morph.dmi' + mymob.zone_sel.icon = 'icons/hud/mob/morph.dmi' mymob.zone_sel.ClearOverlays() - mymob.zone_sel.AddOverlays(image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) + mymob.zone_sel.AddOverlays(image('icons/hud/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) var/atom/movable/screen/resist = new /atom/movable/screen() resist.name = "resist" - resist.icon = 'icons/mob/screen/morph.dmi' + resist.icon = 'icons/hud/mob/morph.dmi' resist.icon_state = "act_resist" resist.screen_loc = ui_morph_resist hotkeybuttons += resist diff --git a/code/_onclick/hud/nymph_hud.dm b/code/_onclick/hud/nymph_hud.dm index 706d0f71511..c3ba75edbba 100644 --- a/code/_onclick/hud/nymph_hud.dm +++ b/code/_onclick/hud/nymph_hud.dm @@ -10,13 +10,13 @@ using = new /atom/movable/screen/movement_intent() using.set_dir(SOUTHWEST) - using.icon = 'icons/mob/screen/diona_nymph.dmi' + using.icon = 'icons/hud/mob/diona_nymph.dmi' using.icon_state = (mymob.m_intent == M_RUN ? "running" : "walking") src.adding += using move_intent = using mymob.healths = new /atom/movable/screen() - mymob.healths.icon = 'icons/mob/screen/diona_nymph.dmi' + mymob.healths.icon = 'icons/hud/mob/diona_nymph.dmi' mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_alien_health diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm index 685c3e95195..79a53ed01ee 100644 --- a/code/_onclick/hud/other_mobs.dm +++ b/code/_onclick/hud/other_mobs.dm @@ -14,7 +14,7 @@ /mob/living/silicon/ai/instantiate_hud(datum/hud/HUD) HUD.ai_hud() -/datum/hud/proc/blob_hud(ui_style = 'icons/mob/screen/midnight.dmi') +/datum/hud/proc/blob_hud(ui_style = 'icons/hud/mob/midnight.dmi') blobpwrdisplay = new /atom/movable/screen() blobpwrdisplay.name = "blob power" @@ -33,7 +33,7 @@ /mob/living/carbon/slime/instantiate_hud(datum/hud/HUD) HUD.slime_hud() -/datum/hud/proc/slime_hud(ui_style = 'icons/mob/screen/midnight.dmi') +/datum/hud/proc/slime_hud(ui_style = 'icons/hud/mob/midnight.dmi') src.adding = list() @@ -114,25 +114,25 @@ if(constructtype) mymob.healths = new /atom/movable/screen() - mymob.healths.icon = 'icons/mob/screen/construct.dmi' + mymob.healths.icon = 'icons/hud/mob/construct.dmi' mymob.healths.icon_state = "[constructtype]_health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_construct_health mymob.pullin = new /atom/movable/screen() - mymob.pullin.icon = 'icons/mob/screen/construct.dmi' + mymob.pullin.icon = 'icons/hud/mob/construct.dmi' mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_construct_pull mymob.zone_sel = new /atom/movable/screen/zone_sel() - mymob.zone_sel.icon = 'icons/mob/screen/construct.dmi' + mymob.zone_sel.icon = 'icons/hud/mob/construct.dmi' mymob.zone_sel.ClearOverlays() - mymob.zone_sel.AddOverlays(image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) + mymob.zone_sel.AddOverlays(image('icons/hud/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) mymob.purged = new /atom/movable/screen() - mymob.purged.icon = 'icons/mob/screen/construct.dmi' + mymob.purged.icon = 'icons/hud/mob/construct.dmi' mymob.purged.icon_state = "purge0" mymob.purged.name = "purged" mymob.purged.screen_loc = ui_construct_purge diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index bd59f45e1d6..4c7f7d2cee5 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/screen/radial.dmi' + icon = 'icons/hud/mob/radial.dmi' layer = RADIAL_BASE_LAYER var/datum/radial_menu/parent diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index eca83ed3f1b..9950ad6a4bb 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -19,7 +19,7 @@ GLOBAL_DATUM(robot_inventory, /atom/movable/screen) using = new /atom/movable/screen() using.name = "radio" using.set_dir(SOUTHWEST) - using.icon = 'icons/mob/screen/robot.dmi' + using.icon = 'icons/hud/mob/robot.dmi' using.icon_state = "radio" using.screen_loc = ui_movi src.adding += using @@ -44,7 +44,7 @@ GLOBAL_DATUM(robot_inventory, /atom/movable/screen) using = new /atom/movable/screen() using.name = "act_intent" using.set_dir(SOUTHWEST) - using.icon = 'icons/mob/screen/robot.dmi' + using.icon = 'icons/hud/mob/robot.dmi' using.icon_state = mymob.a_intent using.screen_loc = ui_acti src.adding += using @@ -52,28 +52,28 @@ GLOBAL_DATUM(robot_inventory, /atom/movable/screen) // Up Hint mymob.up_hint = new /atom/movable/screen() - mymob.up_hint.icon = 'icons/mob/screen/robot.dmi' + mymob.up_hint.icon = 'icons/hud/mob/robot.dmi' mymob.up_hint.icon_state = "uphint0" mymob.up_hint.name = "up hint" mymob.up_hint.screen_loc = ui_up_hint //Cell r.cells = new /atom/movable/screen() - r.cells.icon = 'icons/mob/screen/robot.dmi' + r.cells.icon = 'icons/hud/mob/robot.dmi' r.cells.icon_state = "charge-empty" r.cells.name = "cell" r.cells.screen_loc = ui_toxin //Health mymob.healths = new /atom/movable/screen() - mymob.healths.icon = 'icons/mob/screen/robot.dmi' + mymob.healths.icon = 'icons/hud/mob/robot.dmi' mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_borg_health //Installed Module mymob.hands = new /atom/movable/screen() - mymob.hands.icon = 'icons/mob/screen/robot.dmi' + mymob.hands.icon = 'icons/hud/mob/robot.dmi' mymob.hands.icon_state = "nomod" mymob.hands.name = "module" mymob.hands.screen_loc = ui_borg_module @@ -82,21 +82,21 @@ GLOBAL_DATUM(robot_inventory, /atom/movable/screen) mymob.hands.icon_state = lowertext(r.mod_type) if (istype(mymob, /mob/living/silicon/robot/shell)) - mymob.hands.icon = 'icons/mob/screen/ai.dmi' + mymob.hands.icon = 'icons/hud/mob/ai.dmi' mymob.hands.icon_state = "remote_mech" mymob.hands.name = "Return-to-core" //Module Panel using = new /atom/movable/screen() using.name = "panel" - using.icon = 'icons/mob/screen/robot.dmi' + using.icon = 'icons/hud/mob/robot.dmi' using.icon_state = "panel" using.screen_loc = ui_borg_panel src.adding += using //Store mymob.throw_icon = new /atom/movable/screen() - mymob.throw_icon.icon = 'icons/mob/screen/robot.dmi' + mymob.throw_icon.icon = 'icons/hud/mob/robot.dmi' mymob.throw_icon.icon_state = "store" mymob.throw_icon.name = "store" mymob.throw_icon.screen_loc = ui_borg_store @@ -104,22 +104,22 @@ GLOBAL_DATUM(robot_inventory, /atom/movable/screen) //Inventory GLOB.robot_inventory = new /atom/movable/screen() GLOB.robot_inventory.name = "inventory" - GLOB.robot_inventory.icon = 'icons/mob/screen/robot.dmi' + GLOB.robot_inventory.icon = 'icons/hud/mob/robot.dmi' GLOB.robot_inventory.icon_state = "inventory" GLOB.robot_inventory.screen_loc = ui_borg_inventory //Temp mymob.pullin = new /atom/movable/screen() - mymob.pullin.icon = 'icons/mob/screen/robot.dmi' + mymob.pullin.icon = 'icons/hud/mob/robot.dmi' mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_borg_pull mymob.zone_sel = new /atom/movable/screen/zone_sel() - mymob.zone_sel.icon = 'icons/mob/screen/robot.dmi' + mymob.zone_sel.icon = 'icons/hud/mob/robot.dmi' mymob.zone_sel.ClearOverlays() - mymob.zone_sel.AddOverlays(image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) + mymob.zone_sel.AddOverlays(image('icons/hud/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]")) // Computer device hud if(r.computer) diff --git a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm index 4c918c29b9f..bd03113cf50 100644 --- a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm +++ b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm @@ -2,7 +2,7 @@ /atom/movable/screen/module dir = SOUTHWEST - icon = 'icons/mob/screen/robot.dmi' + icon = 'icons/hud/mob/robot.dmi' var/mod_pos /atom/movable/screen/module/one @@ -33,7 +33,7 @@ R.toggle_module(mod_pos) /atom/movable/screen/ai - icon = 'icons/mob/screen/ai.dmi' + icon = 'icons/hud/mob/ai.dmi' /atom/movable/screen/ai/core name = "AI Core" diff --git a/code/_onclick/hud/screen_object_types/borer.dm b/code/_onclick/hud/screen_object_types/borer.dm index 0950cb42469..e5c6e3e8a56 100644 --- a/code/_onclick/hud/screen_object_types/borer.dm +++ b/code/_onclick/hud/screen_object_types/borer.dm @@ -1,5 +1,5 @@ /atom/movable/screen/borer - icon = 'icons/mob/screen/borer.dmi' + icon = 'icons/hud/mob/borer.dmi' maptext_x = 5 maptext_y = 16 diff --git a/code/_onclick/hud/screen_object_types/vampire.dm b/code/_onclick/hud/screen_object_types/vampire.dm index abcb017a1a3..21caf8a5e9f 100644 --- a/code/_onclick/hud/screen_object_types/vampire.dm +++ b/code/_onclick/hud/screen_object_types/vampire.dm @@ -1,5 +1,5 @@ /atom/movable/screen/vampire - icon = 'icons/mob/screen/vampire.dmi' + icon = 'icons/hud/mob/vampire.dmi' maptext_x = 5 maptext_y = 16 diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 314bcea6670..704cb328c68 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -8,7 +8,7 @@ */ /atom/movable/screen name = "" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' plane = HUD_PLANE layer = HUD_BASE_LAYER /// A reference to the object in the slot. Grabs or items, generally. @@ -228,7 +228,7 @@ /obj/effect/overlay/zone_sel - icon = 'icons/mob/zone_sel.dmi' + icon = 'icons/hud/mob/zone_sel.dmi' mouse_opacity = MOUSE_OPACITY_TRANSPARENT alpha = 128 anchored = TRUE @@ -293,7 +293,7 @@ /atom/movable/screen/zone_sel/update_icon() ClearOverlays() - selecting_appearance = mutable_appearance('icons/mob/zone_sel.dmi', "[selecting]") + selecting_appearance = mutable_appearance('icons/hud/mob/zone_sel.dmi', "[selecting]") AddOverlays(selecting_appearance) /atom/movable/screen/Click(location, control, params) @@ -361,7 +361,7 @@ var/turf/above_turf = GET_TURF_ABOVE(T) if(!isopenturf(above_turf)) continue - var/image/point_up = image(icon = 'icons/mob/screen/generic.dmi', icon_state = "arrow_up", loc = T) + var/image/point_up = image(icon = 'icons/hud/mob/generic.dmi', icon_state = "arrow_up", loc = T) point_up.plane = GAME_PLANE point_up.layer = POINTER_LAYER viewer_client?.images += point_up @@ -553,13 +553,13 @@ return if(!handcuff_overlay) var/state = (hud.l_hand_hud_object == src) ? "l_hand_hud_handcuffs" : "r_hand_hud_handcuffs" - handcuff_overlay = image("icon"='icons/mob/screen_gen.dmi', "icon_state" = state) + handcuff_overlay = image("icon"='icons/hud/mob/screen_gen.dmi', "icon_state" = state) if(!disabled_hand_overlay) var/state = (hud.l_hand_hud_object == src) ? "l_hand_disabled" : "r_hand_disabled" - disabled_hand_overlay = image("icon" = 'icons/mob/screen_gen.dmi', "icon_state" = state) + disabled_hand_overlay = image("icon" = 'icons/hud/mob/screen_gen.dmi', "icon_state" = state) if(!removed_hand_overlay) var/state = (hud.l_hand_hud_object == src) ? "l_hand_removed" : "r_hand_removed" - removed_hand_overlay = image("icon" = 'icons/mob/screen_gen.dmi', "icon_state" = state) + removed_hand_overlay = image("icon" = 'icons/hud/mob/screen_gen.dmi', "icon_state" = state) ClearOverlays() if(hud.mymob && ishuman(hud.mymob)) var/mob/living/carbon/human/H = hud.mymob diff --git a/code/_onclick/hud/spell_screen_objects.dm b/code/_onclick/hud/spell_screen_objects.dm index 4dc17f170ad..c65b00ef362 100644 --- a/code/_onclick/hud/spell_screen_objects.dm +++ b/code/_onclick/hud/spell_screen_objects.dm @@ -1,6 +1,6 @@ /atom/movable/screen/movable/spell_master name = "Spells" - icon = 'icons/mob/screen/spells.dmi' + icon = 'icons/hud/mob/spells.dmi' icon_state = "wiz_spell_ready" var/list/atom/movable/screen/spell/spell_objects = list() var/showing = 0 @@ -146,7 +146,7 @@ //This is what you click to cast things// ///////////////////////////////////////// /atom/movable/screen/spell - icon = 'icons/mob/screen/spells.dmi' + icon = 'icons/hud/mob/spells.dmi' icon_state = "wiz_spell_base" var/spell_base = "wiz" var/last_charge = 0 //not a time, but the last remembered charge value diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 69a47d0be50..ac64a4ca06a 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -325,8 +325,8 @@ return if(in_range(src, user) && ishuman(over) && in_range(over, src)) var/list/options = list( - "IV drip" = image('icons/mob/screen/radial.dmi', "iv_drip"), - "Breath mask" = image('icons/mob/screen/radial.dmi', "iv_mask")) + "IV drip" = image('icons/hud/mob/radial.dmi', "iv_drip"), + "Breath mask" = image('icons/hud/mob/radial.dmi', "iv_mask")) var/chosen_action = show_radial_menu(user, src, options, require_near = TRUE, radius = 42, tooltips = TRUE) if(!chosen_action) return @@ -397,10 +397,10 @@ if(isDrone(user)) return var/list/options = list( - "Transfer Rate" = image('icons/mob/screen/radial.dmi', "radial_transrate"), - "Remove Container" = image('icons/mob/screen/radial.dmi', "iv_beaker"), - "Remove Tank" = image('icons/mob/screen/radial.dmi', "iv_tank"), - "Remove Breath Mask" = image('icons/mob/screen/radial.dmi', "iv_mask")) + "Transfer Rate" = image('icons/hud/mob/radial.dmi', "radial_transrate"), + "Remove Container" = image('icons/hud/mob/radial.dmi', "iv_beaker"), + "Remove Tank" = image('icons/hud/mob/radial.dmi', "iv_tank"), + "Remove Breath Mask" = image('icons/hud/mob/radial.dmi', "iv_mask")) var/chosen_action = show_radial_menu(user, src, options, require_near = TRUE, radius = 42, tooltips = TRUE) if(!chosen_action) return @@ -526,11 +526,11 @@ do_crash() return var/list/options = list( - "Transfer Rate" = image('icons/mob/screen/radial.dmi', "radial_transrate"), - "Toggle Mode" = image('icons/mob/screen/radial.dmi', "iv_mode"), - "Toggle Stop" = image('icons/mob/screen/radial.dmi', "iv_stop"), - "Toggle Valve" = image('icons/mob/screen/radial.dmi', "iv_valve"), - "Toggle EPP" = image('icons/mob/screen/radial.dmi', "iv_epp")) + "Transfer Rate" = image('icons/hud/mob/radial.dmi', "radial_transrate"), + "Toggle Mode" = image('icons/hud/mob/radial.dmi', "iv_mode"), + "Toggle Stop" = image('icons/hud/mob/radial.dmi', "iv_stop"), + "Toggle Valve" = image('icons/hud/mob/radial.dmi', "iv_valve"), + "Toggle EPP" = image('icons/hud/mob/radial.dmi', "iv_epp")) var/chosen_action = show_radial_menu(user, src, options, require_near = TRUE, radius = 42, tooltips = TRUE) if(!chosen_action) return diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 79ce7c4092c..117f723ddef 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT_TYPED(bump_teleporters, /obj/effect/bump_teleporter, list()) /obj/effect/bump_teleporter name = "bump-teleporter" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.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/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 63ad4552793..eeb713e516f 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -7,7 +7,7 @@ /obj/effect/decal/point name = "arrow" desc = "It's an arrow hanging in mid-air. There may be a wizard about." - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "arrow" layer = POINTER_LAYER anchored = 1 diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index c6f3adc9f8b..72e1db58b73 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -1,6 +1,6 @@ /obj/effect/landmark name = "landmark" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x2" anchored = TRUE unacidable = TRUE @@ -92,7 +92,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) */ /obj/effect/landmark/start name = "start (rename me to match the job title)" //This is checked in the maplint `tools\maplint\lints\startmarker_unset.yml` file, if you change the name here, do there too - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x" /obj/effect/landmark/start/Initialize(mapload) diff --git a/code/game/objects/effects/manifest.dm b/code/game/objects/effects/manifest.dm index d6969045c2e..76f56c36486 100644 --- a/code/game/objects/effects/manifest.dm +++ b/code/game/objects/effects/manifest.dm @@ -1,6 +1,6 @@ /obj/effect/manifest name = "manifest" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x" unacidable = 1//Just to be sure. diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 0613429e4c7..9749aebb2c7 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -20,7 +20,7 @@ /obj/effect/spawner/newbomb name = "TTV bomb" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x" var/assembly_type = /obj/item/assembly/signaler diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index b60d28e3b2f..3394958fb06 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -115,7 +115,7 @@ /* Tosses things in a certain direction */ /obj/effect/step_trigger/thrower - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "dir_arrow" var/direction = SOUTH // the direction of throw var/tiles = 3 // if 0: forever until atom hits a stopper diff --git a/code/game/objects/items/devices/auto_cpr.dm b/code/game/objects/items/devices/auto_cpr.dm index ab4375dae80..50d18b6d280 100644 --- a/code/game/objects/items/devices/auto_cpr.dm +++ b/code/game/objects/items/devices/auto_cpr.dm @@ -274,8 +274,8 @@ update_icon() return var/list/options = list( - "Toggle CPR" = image('icons/mob/screen/radial.dmi', "cpr_mode"), - "Toggle EPP" = image('icons/mob/screen/radial.dmi', "iv_epp")) + "Toggle CPR" = image('icons/hud/mob/radial.dmi', "cpr_mode"), + "Toggle EPP" = image('icons/hud/mob/radial.dmi', "iv_epp")) var/chosen_action = show_radial_menu(user, src, options, require_near = TRUE, radius = 42, tooltips = TRUE) if(!chosen_action) return diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index a7657dfaba8..271e3b40021 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -209,10 +209,10 @@ ABSTRACT_TYPE(/obj/item/rfd) /obj/item/rfd/construction/Initialize() . = ..() radial_modes = list( - "Floor and Wall" = image(icon = 'icons/mob/screen/radial.dmi', icon_state = "wallfloor"), - "Window and Window Frame" = image(icon = 'icons/mob/screen/radial.dmi', icon_state = "windowframe"), - "Airlock" = image(icon = 'icons/mob/screen/radial.dmi', icon_state = "airlock"), - "Deconstruct" = image(icon = 'icons/mob/screen/radial.dmi', icon_state = "delete") + "Floor and Wall" = image(icon = 'icons/hud/mob/radial.dmi', icon_state = "wallfloor"), + "Window and Window Frame" = image(icon = 'icons/hud/mob/radial.dmi', icon_state = "windowframe"), + "Airlock" = image(icon = 'icons/hud/mob/radial.dmi', icon_state = "airlock"), + "Deconstruct" = image(icon = 'icons/hud/mob/radial.dmi', icon_state = "delete") ) /obj/item/rfd/construction/attack_self(mob/user) diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index e44a364e8b7..f8e7b1e4930 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -105,7 +105,7 @@ /obj/item/storage/internal/skrell name = "headtail storage" - icon = 'icons/obj/action_buttons/organs.dmi' + icon = 'icons/hud/action_buttons/organs.dmi' icon_state = "skrell_headpocket" storage_slots = 1 max_storage_space = 2 diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 2c0b418698b..1b1ba3f793e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -572,10 +572,10 @@ return if(buckled) var/list/options = list( - "Transfer Rate" = image('icons/mob/screen/radial.dmi', "radial_transrate"), - "Remove Container" = image('icons/mob/screen/radial.dmi', "iv_beaker"), - "Remove Vitals Monitor" = image('icons/mob/screen/radial.dmi', "vitals_monitor"), - "Remove Scan" = image('icons/mob/screen/radial.dmi', "med_scan")) + "Transfer Rate" = image('icons/hud/mob/radial.dmi', "radial_transrate"), + "Remove Container" = image('icons/hud/mob/radial.dmi', "iv_beaker"), + "Remove Vitals Monitor" = image('icons/hud/mob/radial.dmi', "vitals_monitor"), + "Remove Scan" = image('icons/hud/mob/radial.dmi', "med_scan")) var/chosen_action = show_radial_menu(user, src, options, require_near = TRUE, radius = 42, tooltips = TRUE) if(!chosen_action) return diff --git a/code/modules/admin/buildmode/buttons.dm b/code/modules/admin/buildmode/buttons.dm index a99d55eb816..ad1ff86edb8 100644 --- a/code/modules/admin/buildmode/buttons.dm +++ b/code/modules/admin/buildmode/buttons.dm @@ -5,7 +5,7 @@ layer = HUD_BASE_LAYER plane = HUD_PLANE mouse_opacity = MOUSE_OPACITY_OPAQUE - icon = 'icons/misc/buildmode.dmi' + icon = 'icons/hud/buildmode.dmi' var/datum/click_handler/build_mode/host /obj/effect/bmode/New(var/host) diff --git a/code/modules/awaymissions/loot.dm b/code/modules/awaymissions/loot.dm index f89a06cdbe4..2660aa3cc8a 100644 --- a/code/modules/awaymissions/loot.dm +++ b/code/modules/awaymissions/loot.dm @@ -1,5 +1,5 @@ /obj/effect/spawner/lootdrop - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x2" var/lootcount = 1 //how many items will be spawned var/lootdoubles = 0 //if the same item can be spawned twice diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 70e094a9e9b..51e82f771c8 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -242,7 +242,7 @@ GLOBAL_LIST_EMPTY_TYPED(large_stock_markers, /obj/effect/large_stock_marker) /obj/effect/large_stock_marker name = "Large Stock Marker" desc = "This marks a place where a large object could spawn in cargo" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x3" /obj/effect/large_stock_marker/Initialize(mapload, ...) diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm index 721169b4e9d..85bb0cb80d2 100644 --- a/code/modules/client/ui_style.dm +++ b/code/modules/client/ui_style.dm @@ -1,9 +1,9 @@ GLOBAL_LIST_INIT(all_ui_styles, list( - "Midnight" = 'icons/mob/screen/midnight.dmi', - "Orange" = 'icons/mob/screen/orange.dmi', - "old" = 'icons/mob/screen/old.dmi', - "White" = 'icons/mob/screen/white.dmi', - "old-noborder" = 'icons/mob/screen/old-noborder.dmi' + "Midnight" = 'icons/hud/mob/midnight.dmi', + "Orange" = 'icons/hud/mob/orange.dmi', + "old" = 'icons/hud/mob/old.dmi', + "White" = 'icons/hud/mob/white.dmi', + "old-noborder" = 'icons/hud/mob/old-noborder.dmi' )) GLOBAL_LIST_INIT(all_tooltip_styles, list( diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 52efd388e77..a781e0a0450 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -457,7 +457,7 @@ /obj/item/clothing/ears/offear name = "Other ear" w_class = WEIGHT_CLASS_HUGE - icon = 'icons/mob/screen/midnight.dmi' + icon = 'icons/hud/mob/midnight.dmi' icon_state = "blocked" slot_flags = SLOT_EARS | SLOT_TWOEARS diff --git a/code/modules/cooking/machinery/cooking_machines/_cooker.dm b/code/modules/cooking/machinery/cooking_machines/_cooker.dm index 2583ac17a8a..928abc48fd1 100644 --- a/code/modules/cooking/machinery/cooking_machines/_cooker.dm +++ b/code/modules/cooking/machinery/cooking_machines/_cooker.dm @@ -77,7 +77,7 @@ . = ..() var/interval = (optimal_temp - min_temp)/temp_settings for(var/newtemp = min_temp - interval, newtemp<=optimal_temp, newtemp+=interval) - var/image/disp_image = image('icons/mob/screen/radial.dmi', "radial_temp") + var/image/disp_image = image('icons/hud/mob/radial.dmi', "radial_temp") var/hue = RotateHue(hsv(0, 255, 255), 120 * (1 - (newtemp-min_temp)/(optimal_temp-min_temp))) disp_image.color = HSVtoRGB(hue) temp_options["[newtemp - T0C]"] = disp_image diff --git a/code/modules/cooking/machinery/cooking_machines/microwave.dm b/code/modules/cooking/machinery/cooking_machines/microwave.dm index 95c9a69997d..46cc3d270e7 100644 --- a/code/modules/cooking/machinery/cooking_machines/microwave.dm +++ b/code/modules/cooking/machinery/cooking_machines/microwave.dm @@ -42,7 +42,7 @@ microwave_loop = new(src) temp_options = list() for(var/newtime = 1 to 6) - var/image/disp_image = image('icons/mob/screen/radial.dmi', "radial_time") + var/image/disp_image = image('icons/hud/mob/radial.dmi', "radial_time") var/hue = RotateHue(hsv(0, 255, 255), 120 * (1 - (newtime-5)/(6))) disp_image.color = HSVtoRGB(hue) temp_options["[30 * newtime]"] = disp_image diff --git a/code/modules/effects/maze_generation/maze_helper_atoms.dm b/code/modules/effects/maze_generation/maze_helper_atoms.dm index e2437ced64c..f6ef755e03b 100644 --- a/code/modules/effects/maze_generation/maze_helper_atoms.dm +++ b/code/modules/effects/maze_generation/maze_helper_atoms.dm @@ -1,6 +1,6 @@ // Initial declaration /obj/effect/mazegen desc = "You should not be seeing this!" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x2" color = "#00FF00" diff --git a/code/modules/ghostroles/spawnpoint/spawnpoint.dm b/code/modules/ghostroles/spawnpoint/spawnpoint.dm index 6d42d4d73f7..f0f5b7edcff 100644 --- a/code/modules/ghostroles/spawnpoint/spawnpoint.dm +++ b/code/modules/ghostroles/spawnpoint/spawnpoint.dm @@ -132,7 +132,7 @@ /obj/effect/ghostspawpoint/repeat name = "invisible ghost spawner - repeat" desc = "A Invisible ghost spawner" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x3" icon_unavailable = "x3" //Icon to use when unavailable diff --git a/code/modules/heavy_vehicle/interface/_interface.dm b/code/modules/heavy_vehicle/interface/_interface.dm index fbb0429d4b1..ba3d0c19bf3 100644 --- a/code/modules/heavy_vehicle/interface/_interface.dm +++ b/code/modules/heavy_vehicle/interface/_interface.dm @@ -79,7 +79,7 @@ if(!body.diagnostics || !body.diagnostics.is_functional() || ((emp_damage>EMP_GUI_DISRUPT) && prob(emp_damage*2))) if(!GLOB.mecha_damage_overlay_cache["critfail"]) - GLOB.mecha_damage_overlay_cache["critfail"] = image(icon='icons/mecha/mecha_hud.dmi',icon_state="dam_error") + GLOB.mecha_damage_overlay_cache["critfail"] = image(icon='icons/hud/mecha/mecha_hud.dmi',icon_state="dam_error") hud_health?.overlays |= GLOB.mecha_damage_overlay_cache["critfail"] return @@ -93,7 +93,7 @@ else state = MC.damage_state if(!GLOB.mecha_damage_overlay_cache["[part]-[state]"]) - var/image/I = image(icon='icons/mecha/mecha_hud.dmi',icon_state="dam_[part]") + var/image/I = image(icon='icons/hud/mecha/mecha_hud.dmi',icon_state="dam_[part]") switch(state) if(1) I.color = "#00ff00" diff --git a/code/modules/heavy_vehicle/interface/screen_objects.dm b/code/modules/heavy_vehicle/interface/screen_objects.dm index 2b0faf64527..7f380066c3c 100644 --- a/code/modules/heavy_vehicle/interface/screen_objects.dm +++ b/code/modules/heavy_vehicle/interface/screen_objects.dm @@ -1,7 +1,7 @@ // Screen objects hereon out. /atom/movable/screen/mecha name = "hardpoint" - icon = 'icons/mecha/mecha_hud.dmi' + icon = 'icons/hud/mecha/mecha_hud.dmi' icon_state = "hardpoint" var/mob/living/heavy_vehicle/owner maptext_y = 11 @@ -100,19 +100,19 @@ // Draw background. if(!default_hardpoint_background) - default_hardpoint_background = image(icon = 'icons/mecha/mecha_hud.dmi', icon_state = "bar_bkg") + default_hardpoint_background = image(icon = 'icons/hud/mecha/mecha_hud.dmi', icon_state = "bar_bkg") default_hardpoint_background.pixel_x = 34 new_overlays |= default_hardpoint_background if(value == 0) if(!hardpoint_bar_empty) - hardpoint_bar_empty = image(icon='icons/mecha/mecha_hud.dmi',icon_state="bar_flash") + hardpoint_bar_empty = image(icon='icons/hud/mecha/mecha_hud.dmi',icon_state="bar_flash") hardpoint_bar_empty.pixel_x = 24 hardpoint_bar_empty.color = "#FF0000" new_overlays |= hardpoint_bar_empty else if(value < 0) if(!hardpoint_error_icon) - hardpoint_error_icon = image(icon='icons/mecha/mecha_hud.dmi',icon_state="bar_error") + hardpoint_error_icon = image(icon='icons/hud/mecha/mecha_hud.dmi',icon_state="bar_error") hardpoint_error_icon.pixel_x = 34 new_overlays |= hardpoint_error_icon else @@ -120,7 +120,7 @@ // Draw statbar. if(!LAZYLEN(GLOB.hardpoint_bar_cache)) for(var/i=0;i5) bar.color = "#00ff00" diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm index 8ae12d15258..0abd6318b92 100644 --- a/code/modules/mining/machine_input_output_plates.dm +++ b/code/modules/mining/machine_input_output_plates.dm @@ -1,7 +1,7 @@ /**********************Input and output plates**************************/ /obj/machinery/mineral/input - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x2" name = "Input Area" invisibility = INVISIBILITY_ABSTRACT @@ -13,7 +13,7 @@ icon_state = "blank" /obj/machinery/mineral/output - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x" name = "Output Area" invisibility = INVISIBILITY_ABSTRACT diff --git a/code/modules/mob/abstract/new_player/menu.dm b/code/modules/mob/abstract/new_player/menu.dm index 77043d0eb48..88649b11b44 100644 --- a/code/modules/mob/abstract/new_player/menu.dm +++ b/code/modules/mob/abstract/new_player/menu.dm @@ -8,7 +8,7 @@ inventory_shown = FALSE hotkey_ui_hidden = FALSE -/datum/hud/proc/new_player_hud(var/ui_style='icons/mob/screen/white.dmi', var/ui_color = "#fffffe", var/ui_alpha = 255) +/datum/hud/proc/new_player_hud(var/ui_style='icons/hud/mob/white.dmi', var/ui_color = "#fffffe", var/ui_alpha = 255) SHOULD_NOT_SLEEP(TRUE) adding = list() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6ca069b0800..d194899f8c8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -828,7 +828,7 @@ var/static/list/tags = list() if(!length(tags)) for(var/thing in list(TRIAGE_NONE, TRIAGE_GREEN, TRIAGE_YELLOW, TRIAGE_RED, TRIAGE_BLACK)) - tags[thing] = image(icon = 'icons/mob/screen/triage_tag.dmi', icon_state = thing) + tags[thing] = image(icon = 'icons/hud/mob/triage_tag.dmi', icon_state = thing) var/chosen_tag = show_radial_menu(usr, src, tags, radius = 42, tooltips = TRUE) if(chosen_tag) triage_tag = chosen_tag diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 4e5b0e99978..88e28965ed0 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -497,9 +497,9 @@ return else if (starting) var/list/options = list( - "Full CPR" = image('icons/mob/screen/radial.dmi', "cpro2"), - "Compressions" = image('icons/mob/screen/generic.dmi', "cpr"), - "Mouth-to-Mouth" = image('icons/mob/screen/radial.dmi', "iv_tank") + "Full CPR" = image('icons/hud/mob/radial.dmi', "cpro2"), + "Compressions" = image('icons/hud/mob/generic.dmi', "cpr"), + "Mouth-to-Mouth" = image('icons/hud/mob/radial.dmi', "iv_tank") ) cpr_mode = show_radial_menu(H, src, options, require_near = TRUE, tooltips = TRUE, no_repeat_close = TRUE) if(!cpr_mode) @@ -512,7 +512,7 @@ to_chat(H, cpr_attempt_message) - H.do_attack_animation(src, null, image('icons/mob/screen/generic.dmi', src, "cpr", src.layer + 1)) + H.do_attack_animation(src, null, image('icons/hud/mob/generic.dmi', src, "cpr", src.layer + 1)) var/starting_pixel_y = pixel_y animate(src, pixel_y = starting_pixel_y + 4, time = 2) animate(src, pixel_y = starting_pixel_y, time = 2) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e8dc3736706..e2e5e65e95d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1037,24 +1037,24 @@ // Apply a fire overlay if we're burning. if(on_fire) - var/image/burning_image = image('icons/mob/screen1_health.dmi', "burning", pixel_x = species.healths_overlay_x) + var/image/burning_image = image('icons/hud/mob/screen1_health.dmi', "burning", pixel_x = species.healths_overlay_x) var/midway_point = FIRE_MAX_STACKS / 2 burning_image.color = color_rotation((midway_point - fire_stacks) * 3) // Show a general pain/crit indicator if needed. if(is_asystole()) - var/image/hardcrit_image = image('icons/mob/screen1_health.dmi', "hardcrit", pixel_x = species.healths_overlay_x) + var/image/hardcrit_image = image('icons/hud/mob/screen1_health.dmi', "hardcrit", pixel_x = species.healths_overlay_x) health_images += hardcrit_image else if(trauma_val) if(can_feel_pain()) if(trauma_val > 0.7) - var/image/softcrit_image = image('icons/mob/screen1_health.dmi', "softcrit", pixel_x = species.healths_overlay_x) + var/image/softcrit_image = image('icons/hud/mob/screen1_health.dmi', "softcrit", pixel_x = species.healths_overlay_x) health_images += softcrit_image if(trauma_val >= 1) - var/image/hardcrit_image = image('icons/mob/screen1_health.dmi', "hardcrit", pixel_x = species.healths_overlay_x) + var/image/hardcrit_image = image('icons/hud/mob/screen1_health.dmi', "hardcrit", pixel_x = species.healths_overlay_x) health_images += hardcrit_image else if(no_damage) - var/image/fullhealth_image = image('icons/mob/screen1_health.dmi', "fullhealth", pixel_x = species.healths_overlay_x) + var/image/fullhealth_image = image('icons/hud/mob/screen1_health.dmi', "fullhealth", pixel_x = species.healths_overlay_x) health_images += fullhealth_image healths.overlays += health_images diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 04187874a17..e83dad6e238 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1317,7 +1317,7 @@ else throw_mode_on() -#define THROW_MODE_ICON 'icons/effects/cursor/throw_mode.dmi' +#define THROW_MODE_ICON 'icons/hud/cursor/throw_mode.dmi' /mob/proc/throw_mode_off() src.in_throw_mode = 0 diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index d77c6830c27..2d3b401c55b 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -12,7 +12,7 @@ /obj/item/grab name = "grab" - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "reinforce" atom_flags = 0 var/atom/movable/screen/grab/hud = null diff --git a/code/modules/psionics/interface/ui.dm b/code/modules/psionics/interface/ui.dm index 925bd11fc12..9886bdc2881 100644 --- a/code/modules/psionics/interface/ui.dm +++ b/code/modules/psionics/interface/ui.dm @@ -1,5 +1,5 @@ /atom/movable/screen/psi - icon = 'icons/mob/screen/psi.dmi' + icon = 'icons/hud/mob/psi.dmi' var/mob/living/owner var/hidden = TRUE diff --git a/code/modules/supermatter/setup_supermatter.dm b/code/modules/supermatter/setup_supermatter.dm index 3ea3c57ebf6..e16e8ff4476 100644 --- a/code/modules/supermatter/setup_supermatter.dm +++ b/code/modules/supermatter/setup_supermatter.dm @@ -186,7 +186,7 @@ invisibility = 101 anchored = 1 density = 0 - icon = 'icons/mob/screen/generic.dmi' + icon = 'icons/hud/mob/generic.dmi' icon_state = "x4" /obj/effect/landmark/engine_setup/proc/activate(var/last = 0) diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm index 42a1ee7b45d..1420dd455a8 100644 --- a/code/unit_tests/mob_tests.dm +++ b/code/unit_tests/mob_tests.dm @@ -526,7 +526,7 @@ name = "MOB: Robot module icon check" groups = list("mob") - var/icon_file = 'icons/mob/screen/robot.dmi' + var/icon_file = 'icons/hud/mob/robot.dmi' /datum/unit_test/robot_module_icons/start_test() var/failed = 0 diff --git a/html/changelogs/Bat-HudIconMove.yml b/html/changelogs/Bat-HudIconMove.yml new file mode 100644 index 00000000000..958d3955143 --- /dev/null +++ b/html/changelogs/Bat-HudIconMove.yml @@ -0,0 +1,4 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - code_imp: "Moves scattered HUD screen object icon files to dedicated HUD folder." diff --git a/icons/obj/action_buttons/actions.dmi b/icons/hud/action_buttons/actions.dmi similarity index 100% rename from icons/obj/action_buttons/actions.dmi rename to icons/hud/action_buttons/actions.dmi diff --git a/icons/obj/action_buttons/implants.dmi b/icons/hud/action_buttons/implants.dmi similarity index 100% rename from icons/obj/action_buttons/implants.dmi rename to icons/hud/action_buttons/implants.dmi diff --git a/icons/obj/action_buttons/organs.dmi b/icons/hud/action_buttons/organs.dmi similarity index 100% rename from icons/obj/action_buttons/organs.dmi rename to icons/hud/action_buttons/organs.dmi diff --git a/icons/hud/buildmode.dmi b/icons/hud/buildmode.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2550a1a486c633f9e2e9c2ad3a6f8cd601e2b5a0 GIT binary patch literal 1483 zcmV;+1vL7JP)004jl0{{R3eocQU0000RP)t-sz`(!; zArAvp9R)iU3tc4uP#FM77iP==z`($XGe~s+0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DXBCwCq;>iGbOXA7|6Ha;!G<_%uNNc4bfEP=BK0@B9t1UDCNw_ z&o98C$%q_H#^h)+AxD!bIhxGK(PU1JCJS;jS(2(LBQ>XhR6T{InI(kvC@Z-7xq#Cq z0LUA@`*`jieE4j{k+!VXvhRj$%EKd=I<4G8u2>2AH> zaxALmW0b(;jy?8C>(N)8h!3B#_VKP3k8fFf-qqsqOmFab-qqsq`AFLL=UpuxUw@sU z{rUNHTA5sz#|y0hjMd`tCB4Isr_%trE|2FL^l?aFjf7{?=#FQ+W6P7_Jd2f4V1R&`v~bw;O8MP5-O`re!g)7k$$cd zN}#4WX7*(ylv2|9TI+VZK0^EVdkAAp)wzX`)F<{GVCIO@ z-_128IHiCyU9Cmw@8%kFoaQGo*IJbRZmtz(VEl(f%G6qv{%)=j#1S33)}r)xD|$kh z`@0pb^B87Yl>Tl(11d!i7t>6O(%;SXbR6dXZm!c6y4IrfcXM46;z2lM*r(+FZmw;I zgQ17Z%L=6mc{%rYb4?0)Y1sLhgfBsAh%rq3-CX0Cy@XjIkcPkpB%7Ke>9m9z~AR!F?ZbfVI2{|FqO!uoz=I`bjXNEaV+RMc_%>CVh zp3Rip->vA$Ov(M-ik=YW{%%S8*3EjAgPrLS;k!S4_lIxBANEK7Ro$zKq*_jnQ`5;@ z97Jam+EwGJ^?OkIX>K8I*BdYZ79Q z@(M1~cO;Kk6=8R*;=aTv#3i%UA+&IjP=T|Mfe_dtFB7^LBBh&2ywMsG5+0C)=@L@F z!1M@<7+&q=n$Y%g+}kaTLuV)A`6=P$aoEb!lBe_QGo>QDu-dc;`{%C_hA=I34tl2K=EY+wHelUGQ!vR2RJK2dfLN%@pX)jOv1m zmGoGNm$4Q`wXT{lUoF}iY-P#smtCXPr$ac|%Sl^N@Xo=zG2X#938@sLOrMY{3J|nM zv|gr3$T?Pa3E9Jf4%#A0Tc>Fea`o@*=VgXxE~mi(_6WJeaU7GZ)~*^i38~C$6ckyF z3}2!XLVgX-u{H=Peo||nGbC4$tZhyRlNge)dxJJ%*oSxr%VjPKX+oIv@|k+2{2UFTfJO-GKuyU z`h@7NwA6Aq4s$~4V%O`PameMsk-N$XeWj^K$o^OkYg-wi9fPi-*&^f)<>9zSXvd&} zE+OAvrZb^6mxJ~jXzQt)gx9_S1m4j?mvBr}#4zsgp`BBfvR?8ntKYFE`}cLiuC6b5 l*AG?~+-^m7o2A`$?jMq)&^$dT6W9O%002ovPDHLkV1l(d(SiT~ literal 0 HcmV?d00001 diff --git a/icons/effects/cursor/throw_mode.dmi b/icons/hud/cursor/throw_mode.dmi similarity index 100% rename from icons/effects/cursor/throw_mode.dmi rename to icons/hud/cursor/throw_mode.dmi diff --git a/icons/mecha/mecha_hud.dmi b/icons/hud/mecha/mecha_hud.dmi similarity index 100% rename from icons/mecha/mecha_hud.dmi rename to icons/hud/mecha/mecha_hud.dmi diff --git a/icons/mob/screen/action.dmi b/icons/hud/mob/action.dmi similarity index 100% rename from icons/mob/screen/action.dmi rename to icons/hud/mob/action.dmi diff --git a/icons/mob/screen/ai.dmi b/icons/hud/mob/ai.dmi similarity index 100% rename from icons/mob/screen/ai.dmi rename to icons/hud/mob/ai.dmi diff --git a/icons/mob/screen/borer.dmi b/icons/hud/mob/borer.dmi similarity index 100% rename from icons/mob/screen/borer.dmi rename to icons/hud/mob/borer.dmi diff --git a/icons/mob/screen/captive_brain.dmi b/icons/hud/mob/captive_brain.dmi similarity index 100% rename from icons/mob/screen/captive_brain.dmi rename to icons/hud/mob/captive_brain.dmi diff --git a/icons/mob/screen/construct.dmi b/icons/hud/mob/construct.dmi similarity index 100% rename from icons/mob/screen/construct.dmi rename to icons/hud/mob/construct.dmi diff --git a/icons/mob/screen/diona_nymph.dmi b/icons/hud/mob/diona_nymph.dmi similarity index 100% rename from icons/mob/screen/diona_nymph.dmi rename to icons/hud/mob/diona_nymph.dmi diff --git a/icons/mob/screen/effects.dmi b/icons/hud/mob/effects.dmi similarity index 100% rename from icons/mob/screen/effects.dmi rename to icons/hud/mob/effects.dmi diff --git a/icons/mob/screen/full.dmi b/icons/hud/mob/full.dmi similarity index 100% rename from icons/mob/screen/full.dmi rename to icons/hud/mob/full.dmi diff --git a/icons/mob/screen/generic.dmi b/icons/hud/mob/generic.dmi similarity index 100% rename from icons/mob/screen/generic.dmi rename to icons/hud/mob/generic.dmi diff --git a/icons/mob/screen/hud_status.dmi b/icons/hud/mob/hud_status.dmi similarity index 100% rename from icons/mob/screen/hud_status.dmi rename to icons/hud/mob/hud_status.dmi diff --git a/icons/mob/screen/midnight.dmi b/icons/hud/mob/midnight.dmi similarity index 100% rename from icons/mob/screen/midnight.dmi rename to icons/hud/mob/midnight.dmi diff --git a/icons/mob/screen/morph.dmi b/icons/hud/mob/morph.dmi similarity index 100% rename from icons/mob/screen/morph.dmi rename to icons/hud/mob/morph.dmi diff --git a/icons/mob/screen/old-noborder.dmi b/icons/hud/mob/old-noborder.dmi similarity index 100% rename from icons/mob/screen/old-noborder.dmi rename to icons/hud/mob/old-noborder.dmi diff --git a/icons/mob/screen/old.dmi b/icons/hud/mob/old.dmi similarity index 100% rename from icons/mob/screen/old.dmi rename to icons/hud/mob/old.dmi diff --git a/icons/mob/screen/orange.dmi b/icons/hud/mob/orange.dmi similarity index 100% rename from icons/mob/screen/orange.dmi rename to icons/hud/mob/orange.dmi diff --git a/icons/mob/screen/psi.dmi b/icons/hud/mob/psi.dmi similarity index 100% rename from icons/mob/screen/psi.dmi rename to icons/hud/mob/psi.dmi diff --git a/icons/mob/screen/radial.dmi b/icons/hud/mob/radial.dmi similarity index 100% rename from icons/mob/screen/radial.dmi rename to icons/hud/mob/radial.dmi diff --git a/icons/mob/screen/robot.dmi b/icons/hud/mob/robot.dmi similarity index 100% rename from icons/mob/screen/robot.dmi rename to icons/hud/mob/robot.dmi diff --git a/icons/mob/screen/robot_pain.dmi b/icons/hud/mob/robot_pain.dmi similarity index 100% rename from icons/mob/screen/robot_pain.dmi rename to icons/hud/mob/robot_pain.dmi diff --git a/icons/mob/screen1_health.dmi b/icons/hud/mob/screen1_health.dmi similarity index 100% rename from icons/mob/screen1_health.dmi rename to icons/hud/mob/screen1_health.dmi diff --git a/icons/mob/screen_alert.dmi b/icons/hud/mob/screen_alert.dmi similarity index 100% rename from icons/mob/screen_alert.dmi rename to icons/hud/mob/screen_alert.dmi diff --git a/icons/mob/screen_gen.dmi b/icons/hud/mob/screen_gen.dmi similarity index 100% rename from icons/mob/screen_gen.dmi rename to icons/hud/mob/screen_gen.dmi diff --git a/icons/mob/screen_spells.dmi b/icons/hud/mob/screen_spells.dmi similarity index 100% rename from icons/mob/screen_spells.dmi rename to icons/hud/mob/screen_spells.dmi diff --git a/icons/mob/screen/spells.dmi b/icons/hud/mob/spells.dmi similarity index 100% rename from icons/mob/screen/spells.dmi rename to icons/hud/mob/spells.dmi diff --git a/icons/mob/status_hunger.dmi b/icons/hud/mob/status_hunger.dmi similarity index 100% rename from icons/mob/status_hunger.dmi rename to icons/hud/mob/status_hunger.dmi diff --git a/icons/mob/status_indicators.dmi b/icons/hud/mob/status_indicators.dmi similarity index 100% rename from icons/mob/status_indicators.dmi rename to icons/hud/mob/status_indicators.dmi diff --git a/icons/mob/screen/triage_tag.dmi b/icons/hud/mob/triage_tag.dmi similarity index 100% rename from icons/mob/screen/triage_tag.dmi rename to icons/hud/mob/triage_tag.dmi diff --git a/icons/mob/screen/vampire.dmi b/icons/hud/mob/vampire.dmi similarity index 100% rename from icons/mob/screen/vampire.dmi rename to icons/hud/mob/vampire.dmi diff --git a/icons/mob/screen/white.dmi b/icons/hud/mob/white.dmi similarity index 100% rename from icons/mob/screen/white.dmi rename to icons/hud/mob/white.dmi diff --git a/icons/mob/zone_sel.dmi b/icons/hud/mob/zone_sel.dmi similarity index 100% rename from icons/mob/zone_sel.dmi rename to icons/hud/mob/zone_sel.dmi