[MIRROR] Moves screen objects from mob to hud (#1336)

* Moves screen objects from mob to hud (#54400)

This moves screen images from icons/mob to icons/hud
Makes more sense and it is easier to find

* Moves screen objects from mob to hud

* Update radial.dm

Co-authored-by: nicbn <nicolas.nattis@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>

code/_onclick/click.dm

@@ -413,7 +413,7 @@
 	transform = M
 
 /obj/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
@@ -423,7 +423,7 @@
 #define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32)			//Not using world.icon_size on purpose.
 
 /obj/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

code/_onclick/hud/action_button.dm

@@ -66,10 +66,10 @@
 /obj/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.dmi'
 	icon_state = "bg_default"
 	var/hidden = FALSE
-	var/hide_icon = 'icons/mob/actions.dmi'
+	var/hide_icon = 'icons/hud/actions.dmi'
 	var/hide_state = "hide"
 	var/show_state = "show"
 	var/mutable_appearance/hide_appearance
@@ -174,7 +174,7 @@
 	.["bg_state"] = "template"
 
 	//TODO : Make these fit theme
-	.["toggle_icon"] = 'icons/mob/actions.dmi'
+	.["toggle_icon"] = 'icons/hud/actions.dmi'
 	.["toggle_hide"] = "hide"
 	.["toggle_show"] = "show"
 

code/_onclick/hud/ai.dm

@@ -1,5 +1,5 @@
 /obj/screen/ai
-	icon = 'icons/mob/screen_ai.dmi'
+	icon = 'icons/hud/screen_ai.dmi'
 
 /obj/screen/ai/Click()
 	if(isobserver(usr) || usr.incapacitated())
@@ -183,7 +183,7 @@
 
 
 /datum/hud/ai
-	ui_style = 'icons/mob/screen_ai.dmi'
+	ui_style = 'icons/hud/screen_ai.dmi'
 
 /datum/hud/ai/New(mob/owner)
 	..()

code/_onclick/hud/alert.dm

@@ -88,7 +88,7 @@
 	qdel(alert)
 
 /obj/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"
@@ -377,7 +377,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 
 /obj/screen/alert/bloodsense/Initialize()
 	. = ..()
-	narnar = new('icons/mob/screen_alert.dmi', "mini_nar")
+	narnar = new('icons/hud/screen_alert.dmi', "mini_nar")
 	START_PROCESSING(SSprocessing, src)
 
 /obj/screen/alert/bloodsense/Destroy()

code/_onclick/hud/alien.dm

@@ -1,5 +1,5 @@
 /obj/screen/alien
-	icon = 'icons/mob/screen_alien.dmi'
+	icon = 'icons/hud/screen_alien.dmi'
 
 /obj/screen/alien/leap
 	name = "toggle leap"
@@ -22,7 +22,7 @@
 	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)
 	..()

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)
 	..()
@@ -18,9 +18,9 @@
 	alien_queen_finder = new /obj/screen/alien/alien_queen_finder()
 	alien_queen_finder.hud = src
 	infodisplay += alien_queen_finder
-	
+
 	pull_icon = new /obj/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

code/_onclick/hud/blob_overmind.dm

@@ -1,6 +1,6 @@
 
 /obj/screen/blob
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/hud/blob.dmi'
 
 /obj/screen/blob/MouseEntered(location,control,params)
 	openToolTip(usr,src,params,title = name,content = desc, theme = "blob")

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)
 	..()

code/_onclick/hud/fullscreen.dm

@@ -57,7 +57,7 @@
 				client.screen -= screen
 
 /obj/screen/fullscreen
-	icon = 'icons/mob/screen_full.dmi'
+	icon = 'icons/hud/screen_full.dmi'
 	icon_state = "default"
 	screen_loc = "CENTER-7,CENTER-7"
 	layer = FULLSCREEN_LAYER
@@ -115,22 +115,22 @@
 	icon_state = "impairedoverlay"
 
 /obj/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"
 
 /obj/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"
 
 /obj/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"
 
 /obj/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
@@ -145,7 +145,7 @@
 	color = "#0000ff"
 
 /obj/screen/fullscreen/cinematic_backdrop
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	screen_loc = "WEST,SOUTH to EAST,NORTH"
 	icon_state = "flash"
 	plane = SPLASHSCREEN_PLANE
@@ -154,7 +154,7 @@
 	show_when_dead = TRUE
 
 /obj/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

code/_onclick/hud/ghost.dm

@@ -1,5 +1,5 @@
 /obj/screen/ghost
-	icon = 'icons/mob/screen_ghost.dmi'
+	icon = 'icons/hud/screen_ghost.dmi'
 
 /obj/screen/ghost/MouseEntered()
 	flick(icon_state + "_anim", src)

code/_onclick/hud/guardian.dm

@@ -1,5 +1,5 @@
 /datum/hud/guardian
-	ui_style = 'icons/mob/guardian.dmi'
+	ui_style = 'icons/hud/guardian.dmi'
 
 /datum/hud/guardian/New(mob/living/simple_animal/hostile/guardian/owner)
 	..()
@@ -69,7 +69,7 @@
 		static_inventory += using
 
 	pull_icon = new /obj/screen/pull()
-	pull_icon.icon = 'icons/mob/guardian.dmi'
+	pull_icon.icon = 'icons/hud/guardian.dmi'
 	pull_icon.update_icon()
 	pull_icon.screen_loc = ui_living_pull
 	pull_icon.hud = src
@@ -116,7 +116,7 @@
 	..()
 
 /obj/screen/guardian
-	icon = 'icons/mob/guardian.dmi'
+	icon = 'icons/hud/guardian.dmi'
 
 /obj/screen/guardian/manifest
 	icon_state = "manifest"

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',
-	"Retro" = 'icons/mob/screen_retro.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',
-	"Glass" = 'icons/mob/screen_glass.dmi'
+	"Midnight" = 'icons/hud/screen_midnight.dmi',
+	"Retro" = 'icons/hud/screen_retro.dmi',
+	"Plasmafire" = 'icons/hud/screen_plasmafire.dmi',
+	"Slimecore" = 'icons/hud/screen_slimecore.dmi',
+	"Operative" = 'icons/hud/screen_operative.dmi',
+	"Clockwork" = 'icons/hud/screen_clockwork.dmi',
+	"Glass" = 'icons/hud/screen_glass.dmi'
 ))
 
 /proc/ui_style2icon(ui_style)

code/_onclick/hud/human.dm

@@ -1,5 +1,5 @@
 /obj/screen/human
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 
 /obj/screen/human/toggle
 	name = "toggle"
@@ -34,7 +34,7 @@
 	H.quick_equip()
 
 /obj/screen/ling
-	icon = 'icons/mob/screen_changeling.dmi'
+	icon = 'icons/hud/screen_changeling.dmi'
 	invisibility = INVISIBILITY_ABSTRACT
 
 /obj/screen/ling/sting

code/_onclick/hud/living.dm

@@ -1,5 +1,5 @@
 /datum/hud/living
-	ui_style = 'icons/mob/screen_gen.dmi'
+	ui_style = 'icons/hud/screen_gen.dmi'
 
 /datum/hud/living/New(mob/living/owner)
 	..()

code/_onclick/hud/map_popups.dm

@@ -14,7 +14,7 @@
  */
 /obj/screen/background
 	name = "background"
-	icon = 'icons/mob/map_backgrounds.dmi'
+	icon = 'icons/hud/map_backgrounds.dmi'
 	icon_state = "clear"
 	layer = GAME_PLANE
 	plane = GAME_PLANE

code/_onclick/hud/ooze.dm

@@ -13,7 +13,7 @@
 	infodisplay += alien_plasma_display
 
 /obj/screen/ooze_nutrition_display
-	icon = 'icons/mob/screen_alien.dmi'
+	icon = 'icons/hud/screen_alien.dmi'
 	icon_state = "power_display"
 	name = "nutrition"
 	screen_loc = ui_alienplasmadisplay

code/_onclick/hud/pai.dm

@@ -1,7 +1,7 @@
 #define PAI_MISSING_SOFTWARE_MESSAGE "<span class='warning'>You must download the required software to use this.</span>"
 
 /obj/screen/pai
-	icon = 'icons/mob/screen_pai.dmi'
+	icon = 'icons/hud/screen_pai.dmi'
 	var/required_software
 
 /obj/screen/pai/Click()
@@ -160,7 +160,7 @@
 
 /obj/screen/pai/radio
 	name = "radio"
-	icon = 'icons/mob/screen_cyborg.dmi'
+	icon = 'icons/hud/screen_cyborg.dmi'
 	icon_state = "radio"
 
 /obj/screen/pai/radio/Click()

code/_onclick/hud/radial.dm

@@ -4,7 +4,7 @@
 GLOBAL_LIST_EMPTY(radial_menus)
 
 /obj/screen/radial
-	icon = 'icons/mob/radial.dmi'
+	icon = 'icons/hud/radial.dmi'
 	layer = ABOVE_HUD_LAYER
 	plane = ABOVE_HUD_PLANE
 	var/datum/radial_menu/parent
@@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	var/hudfix_method = TRUE //TRUE to change anchor to user, FALSE to shift by py_shift
 	var/py_shift = 0
 	var/entry_animation = TRUE
-	var/icon_path = 'icons/mob/radial.dmi' //SKYRAT EDIT ADDITION - GUNPOINT
+	var/icon_path = 'icons/hud/radial.dmi' //SKYRAT EDIT ADDITION - GUNPOINT
 
 //If we swap to vis_contens inventory these will need a redo
 /datum/radial_menu/proc/check_screen_border(mob/user)

code/_onclick/hud/revenanthud.dm

@@ -1,5 +1,5 @@
 /datum/hud/revenant
-	ui_style = 'icons/mob/screen_gen.dmi'
+	ui_style = 'icons/hud/screen_gen.dmi'
 
 /datum/hud/revenant/New(mob/owner)
 	..()

code/_onclick/hud/robot.dm

@@ -1,5 +1,5 @@
 /obj/screen/robot
-	icon = 'icons/mob/screen_cyborg.dmi'
+	icon = 'icons/hud/screen_cyborg.dmi'
 
 /obj/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)
 	..()
@@ -165,7 +165,7 @@
 	module_store_icon.hud = src
 
 	pull_icon = new /obj/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()
@@ -301,7 +301,7 @@
 
 /obj/screen/robot/alerts
 	name = "Alert Panel"
-	icon = 'icons/mob/screen_ai.dmi'
+	icon = 'icons/hud/screen_ai.dmi'
 	icon_state = "alerts"
 
 /obj/screen/robot/alerts/Click()

code/_onclick/hud/screen_objects.dm

@@ -8,7 +8,7 @@
 */
 /obj/screen
 	name = ""
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	layer = HUD_LAYER
 	plane = HUD_PLANE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -75,7 +75,7 @@
 
 /obj/screen/skills
 	name = "skills"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "skills"
 	screen_loc = ui_skill_menu
 
@@ -86,13 +86,13 @@
 
 /obj/screen/craft
 	name = "crafting menu"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "craft"
 	screen_loc = ui_crafting
 
 /obj/screen/area_creator
 	name = "create new area"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "area_edit"
 	screen_loc = ui_building
 
@@ -107,7 +107,7 @@
 
 /obj/screen/language_menu
 	name = "language menu"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "talk_wheel"
 	screen_loc = ui_language_menu
 
@@ -192,7 +192,7 @@
 
 /obj/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
 
 /obj/screen/inventory/hand/update_overlays()
@@ -200,7 +200,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
@@ -256,7 +256,7 @@
 
 /obj/screen/drop
 	name = "drop"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "act_drop"
 	layer = HUD_LAYER
 	plane = HUD_PLANE
@@ -293,11 +293,11 @@
 		return ..()
 
 /obj/screen/act_intent/alien
-	icon = 'icons/mob/screen_alien.dmi'
+	icon = 'icons/hud/screen_alien.dmi'
 	screen_loc = ui_movi
 
 /obj/screen/act_intent/robot
-	icon = 'icons/mob/screen_cyborg.dmi'
+	icon = 'icons/hud/screen_cyborg.dmi'
 	screen_loc = ui_borg_intents
 
 /obj/screen/internals
@@ -367,7 +367,7 @@
 
 /obj/screen/mov_intent
 	name = "run/walk toggle"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "running"
 
 /obj/screen/mov_intent/Click()
@@ -387,7 +387,7 @@
 
 /obj/screen/pull
 	name = "stop pulling"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "pull"
 
 /obj/screen/pull/Click()
@@ -403,7 +403,7 @@
 
 /obj/screen/resist
 	name = "resist"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "act_resist"
 	layer = HUD_LAYER
 	plane = HUD_PLANE
@@ -415,7 +415,7 @@
 
 /obj/screen/rest
 	name = "rest"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "act_rest"
 	layer = HUD_LAYER
 	plane = HUD_PLANE
@@ -460,7 +460,7 @@
 
 /obj/screen/throw_catch
 	name = "throw/catch"
-	icon = 'icons/mob/screen_midnight.dmi'
+	icon = 'icons/hud/screen_midnight.dmi'
 	icon_state = "act_throw_off"
 
 /obj/screen/throw_catch/Click()
@@ -472,7 +472,7 @@
 	name = "damage zone"
 	icon_state = "zone_sel"
 	screen_loc = ui_zonesel
-	var/overlay_icon = 'icons/mob/screen_gen.dmi'
+	var/overlay_icon = 'icons/hud/screen_gen.dmi'
 	var/static/list/hover_overlays_cache = list()
 	var/hovering
 
@@ -514,7 +514,7 @@
 	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
@@ -581,11 +581,11 @@
 	. += mutable_appearance(overlay_icon, "[hud.mymob.zone_selected]")
 
 /obj/screen/zone_sel/alien
-	icon = 'icons/mob/screen_alien.dmi'
-	overlay_icon = 'icons/mob/screen_alien.dmi'
+	icon = 'icons/hud/screen_alien.dmi'
+	overlay_icon = 'icons/hud/screen_alien.dmi'
 
 /obj/screen/zone_sel/robot
-	icon = 'icons/mob/screen_cyborg.dmi'
+	icon = 'icons/hud/screen_cyborg.dmi'
 
 /obj/screen/flash
 	name = "flash"
@@ -596,7 +596,7 @@
 	plane = FULLSCREEN_PLANE
 
 /obj/screen/damageoverlay
-	icon = 'icons/mob/screen_full.dmi'
+	icon = 'icons/hud/screen_full.dmi'
 	icon_state = "oxydamageoverlay0"
 	name = "dmg"
 	blend_mode = BLEND_MULTIPLY
@@ -611,11 +611,11 @@
 	screen_loc = ui_health
 
 /obj/screen/healths/alien
-	icon = 'icons/mob/screen_alien.dmi'
+	icon = 'icons/hud/screen_alien.dmi'
 	screen_loc = ui_alien_health
 
 /obj/screen/healths/robot
-	icon = 'icons/mob/screen_cyborg.dmi'
+	icon = 'icons/hud/screen_cyborg.dmi'
 	screen_loc = ui_borg_health
 
 /obj/screen/healths/blob
@@ -626,7 +626,7 @@
 
 /obj/screen/healths/blob/naut
 	name = "health"
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/hud/blob.dmi'
 	icon_state = "nauthealth"
 
 /obj/screen/healths/blob/naut/core
@@ -647,7 +647,7 @@
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/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

code/_onclick/hud/swarmer.dm

@@ -1,5 +1,5 @@
 /obj/screen/swarmer
-	icon = 'icons/mob/swarmer.dmi'
+	icon = 'icons/hud/swarmer.dmi'
 
 /obj/screen/swarmer/fabricate_trap
 	icon_state = "ui_trap"

code/datums/action.dm

@@ -16,7 +16,7 @@
 	var/button_icon = 'icons/mob/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.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
 

code/game/machinery/suit_storage_unit.dm

@@ -226,9 +226,9 @@
 	var/list/choices = list()
 
 	if (locked)
-		choices["unlock"] = icon('icons/mob/radial.dmi', "radial_unlock")
+		choices["unlock"] = icon('icons/hud/radial.dmi', "radial_unlock")
 	else if (state_open)
-		choices["close"] = icon('icons/mob/radial.dmi', "radial_close")
+		choices["close"] = icon('icons/hud/radial.dmi', "radial_close")
 
 		for (var/item_key in items)
 			var/item = vars[item_key]
@@ -238,9 +238,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/radial.dmi', "radial_open")
+		choices["disinfect"] = icon('icons/hud/radial.dmi', "radial_disinfect")
+		choices["lock"] = icon('icons/hud/radial.dmi', "radial_lock")
 
 	var/choice = show_radial_menu(
 		user,

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.

code/game/objects/effects/decals/misc.dm

@@ -1,6 +1,6 @@
 /obj/effect/temp_visual/point
 	name = "pointer"
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	icon_state = "arrow"
 	layer = POINT_LAYER
 	duration = 25

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

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"
 

code/game/objects/items/RCD.dm

@@ -308,10 +308,10 @@ RLD
 	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/radial.dmi', icon_state = "cnorth"),
+		"EAST" = image(icon = 'icons/hud/radial.dmi', icon_state = "ceast"),
+		"SOUTH" = image(icon = 'icons/hud/radial.dmi', icon_state = "csouth"),
+		"WEST" = image(icon = 'icons/hud/radial.dmi', icon_state = "cwest")
 		)
 	var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
 	if(!check_menu(user))
@@ -333,8 +333,8 @@ RLD
 	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/radial.dmi', icon_state = "windoor"),
+		"Secure Windoor" = image(icon = 'icons/hud/radial.dmi', icon_state = "secure_windoor")
 	)
 
 	var/list/solid_choices = list(
@@ -470,10 +470,10 @@ RLD
 	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/radial.dmi', icon_state = "chair"),
+		"Stool" = image(icon = 'icons/hud/radial.dmi', icon_state = "stool"),
+		"Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "table"),
+		"Glass Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "glass_table")
 		)
 	var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
 	if(!check_menu(user))
@@ -528,15 +528,15 @@ RLD
 /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/radial.dmi', icon_state = "airlock"),
+		"Deconstruct" = image(icon= 'icons/hud/radial.dmi', icon_state = "delete"),
+		"Grilles & Windows" = image(icon = 'icons/hud/radial.dmi', icon_state = "grillewindow"),
+		"Floors & Walls" = image(icon = 'icons/hud/radial.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"),
+		"Machine Frames" = image(icon = 'icons/hud/radial.dmi', icon_state = "machine"),
+		"Computer Frames" = image(icon = 'icons/hud/radial.dmi', icon_state = "computer_dir"),
 		)
 	if(upgrade & RCD_UPGRADE_SILO_LINK)
 		choices += list(
@@ -544,21 +544,21 @@ RLD
 		)
 	if(upgrade & RCD_UPGRADE_FURNISHING)
 		choices += list(
-		"Furnishing" = image(icon = 'icons/mob/radial.dmi', icon_state = "chair")
+		"Furnishing" = image(icon = 'icons/hud/radial.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/radial.dmi', icon_state = "access"),
+		"Change Airlock Type" = image(icon = 'icons/hud/radial.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/radial.dmi', icon_state = "windowtype"),
+		"Change Window Size" = image(icon = 'icons/hud/radial.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/radial.dmi', icon_state = "chair")
 		)
 	var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
 	if(!check_menu(user))

code/game/objects/items/RCL.dm

@@ -246,7 +246,7 @@
 		var/pipe_cleanersuffix = "[min(fromdir,dirnum)]-[max(fromdir,dirnum)]"
 		if(fromdir == dirnum) //pipe_cleaners can't loop back on themselves
 			pipe_cleanersuffix = "invalid"
-		var/image/img = image(icon = 'icons/mob/radial.dmi', icon_state = "cable_[pipe_cleanersuffix]")
+		var/image/img = image(icon = 'icons/hud/radial.dmi', icon_state = "cable_[pipe_cleanersuffix]")
 		img.color = GLOB.pipe_cleaner_colors[colors[current_color_index]]
 		wiredirs[icondir] = img
 	return wiredirs

code/game/objects/items/tcg/tcg.dm

@@ -55,9 +55,9 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
 	var/list/choices = GLOB.tcgcard_radial_choices
 	if(!length(choices))
 		choices = GLOB.tcgcard_radial_choices = list(
-		"Pickup" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup"),
-		"Tap" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_tap"),
-		"Flip" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_flip"),
+		"Pickup" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup"),
+		"Tap" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_tap"),
+		"Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"),
 		)
 	var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
 	if(!check_menu(user))
@@ -171,9 +171,9 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
 	icon_state = "deck_up"
 	obj_flags = UNIQUE_RENAME
 	var/flipped = FALSE
-	var/static/radial_draw = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_draw")
-	var/static/radial_shuffle = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_shuffle")
-	var/static/radial_pickup = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup")
+	var/static/radial_draw = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_draw")
+	var/static/radial_shuffle = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_shuffle")
+	var/static/radial_pickup = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup")
 
 /obj/item/tcgcard_deck/Initialize()
 	. = ..()
@@ -198,10 +198,10 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
 
 /obj/item/tcgcard_deck/attack_hand(mob/user)
 	var/list/choices = list(
-		"Draw" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_draw"),
-		"Shuffle" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_shuffle"),
-		"Pickup" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup"),
-		"Flip" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_flip"),
+		"Draw" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_draw"),
+		"Shuffle" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_shuffle"),
+		"Pickup" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup"),
+		"Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"),
 		)
 	var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
 	if(!check_menu(user))

code/modules/admin/verbs/mapping.dm

@@ -56,7 +56,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."
 
@@ -312,7 +312,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()

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -139,7 +139,7 @@
 		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

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/radial.dmi', icon_state = "radial_examine")
+	var/static/radial_eject = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_eject")
+	var/static/radial_use = image(icon = 'icons/hud/radial.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)

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
 

code/modules/mining/equipment/survival_pod.dm

@@ -277,7 +277,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,

code/modules/mob/living/carbon/alien/screen.dm

@@ -26,7 +26,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()

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

@@ -901,11 +901,11 @@
 					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]"))
 				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"
 

code/modules/mob/living/living.dm

@@ -596,7 +596,7 @@
 			var/icon/mob_mask = icon(icon, icon_state)
 			if(mob_mask.Height() > world.icon_size || mob_mask.Width() > world.icon_size)
 				var/health_doll_icon_state = health_doll_icon ? health_doll_icon : "megasprite"
-				mob_mask = icon('icons/mob/screen_gen.dmi', health_doll_icon_state) //swap to something generic if they have no special doll
+				mob_mask = icon('icons/hud/screen_gen.dmi', health_doll_icon_state) //swap to something generic if they have no special doll
 			livingdoll.filters += filter(type="alpha", icon = mob_mask)
 			livingdoll.filters += filter(type="drop_shadow", size = -1)
 	if(severity > 0)

code/modules/power/cable.dm

@@ -455,9 +455,9 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
 	restraints_icon.maptext = "<span class='maptext' [amount >= CABLE_RESTRAINTS_COST ? "" : "style='color: red'"]>[CABLE_RESTRAINTS_COST]</span>"
 
 	var/list/radial_menu = list(
-	"Layer 1" = image(icon = 'icons/mob/radial.dmi', icon_state = "coil-red"),
-	"Layer 2" = image(icon = 'icons/mob/radial.dmi', icon_state = "coil-yellow"),
-	"Layer 3" = image(icon = 'icons/mob/radial.dmi', icon_state = "coil-blue"),
+	"Layer 1" = image(icon = 'icons/hud/radial.dmi', icon_state = "coil-red"),
+	"Layer 2" = image(icon = 'icons/hud/radial.dmi', icon_state = "coil-yellow"),
+	"Layer 3" = image(icon = 'icons/hud/radial.dmi', icon_state = "coil-blue"),
 	"Multilayer cable hub" = image(icon = 'icons/obj/power.dmi', icon_state = "cable_bridge"),
 	"Multi Z layer cable hub" = image(icon = 'icons/obj/power.dmi', icon_state = "cablerelay-broken-cable"),
 	"Cable restraints" = restraints_icon
@@ -701,9 +701,9 @@ GLOBAL_LIST(hub_radial_layer_list)
 		return
 	if(!GLOB.hub_radial_layer_list)
 		GLOB.hub_radial_layer_list = list(
-			"Layer 1" = image(icon = 'icons/mob/radial.dmi', icon_state = "coil-red"),
-			"Layer 2" = image(icon = 'icons/mob/radial.dmi', icon_state = "coil-yellow"),
-			"Layer 3" = image(icon = 'icons/mob/radial.dmi', icon_state = "coil-blue"),
+			"Layer 1" = image(icon = 'icons/hud/radial.dmi', icon_state = "coil-red"),
+			"Layer 2" = image(icon = 'icons/hud/radial.dmi', icon_state = "coil-yellow"),
+			"Layer 3" = image(icon = 'icons/hud/radial.dmi', icon_state = "coil-blue"),
 			"Machinery" = image(icon = 'icons/obj/power.dmi', icon_state = "smes")
 			)
 

code/modules/reagents/chemistry/machinery/reagentgrinder.dm

@@ -18,11 +18,11 @@
 	var/speed = 1
 	var/list/holdingitems
 
-	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/radial.dmi', icon_state = "radial_examine")
+	var/static/radial_eject = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_eject")
+	var/static/radial_grind = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_grind")
+	var/static/radial_juice = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_juice")
+	var/static/radial_mix = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_mix")
 
 /obj/machinery/reagentgrinder/Initialize()
 	. = ..()