Skip to content

Commit

Permalink
HUD icons sorted into it's own folder (BeeStation#11517)
Browse files Browse the repository at this point in the history
* Sorted all the HUD element into their own folder

God help us all, because it just works

* forgot to rename a thing

* e

---------

Co-authored-by: PigeonVerde322 <[email protected]>
  • Loading branch information
PestoVerde322 and PigeonVerde322 authored Sep 20, 2024
1 parent 7183bd1 commit 2b22806
Show file tree
Hide file tree
Showing 203 changed files with 341 additions and 341 deletions.
4 changes: 2 additions & 2 deletions code/_onclick/click.dm
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
transform = M

/atom/movable/screen/click_catcher
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
icon_state = "catcher"
plane = CLICKCATCHER_PLANE
mouse_opacity = MOUSE_OPACITY_OPAQUE
Expand All @@ -467,7 +467,7 @@
#define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose.

/atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher")
var/icon/newicon = icon('icons/hud/screen_gen.dmi', "catcher")
var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x)
var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y)
var/px = view_size_x * world.icon_size
Expand Down
6 changes: 3 additions & 3 deletions code/_onclick/hud/action_button.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
/atom/movable/screen/movable/action_button/hide_toggle
name = "Hide Buttons"
desc = "Shift-click any button to reset its position, and Control-click it to lock it in place. Alt-click this button to reset all buttons to their default positions."
icon = 'icons/mob/actions.dmi'
icon = 'icons/hud/actions/action_generic.dmi'
icon_state = "bg_default"
var/hidden = FALSE
var/hide_icon = 'icons/mob/actions.dmi'
var/hide_icon = 'icons/hud/actions/action_generic.dmi'
var/hide_state = "hide"
var/show_state = "show"
var/mutable_appearance/hide_appearance
Expand Down Expand Up @@ -176,7 +176,7 @@
.["bg_state"] = "template"

//TODO : Make these fit theme
.["toggle_icon"] = 'icons/mob/actions.dmi'
.["toggle_icon"] = 'icons/hud/actions/action_generic.dmi'
.["toggle_hide"] = "hide"
.["toggle_show"] = "show"

Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/hud/ai.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/atom/movable/screen/ai
icon = 'icons/mob/screen_ai.dmi'
icon = 'icons/hud/screen_ai.dmi'

/atom/movable/screen/ai/Click()
if(isobserver(usr) || usr.incapacitated())
Expand Down Expand Up @@ -201,7 +201,7 @@
upwards = FALSE

/datum/hud/ai
ui_style = 'icons/mob/screen_ai.dmi'
ui_style = 'icons/hud/screen_ai.dmi'

/datum/hud/ai/New(mob/owner)
..()
Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/hud/alert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
qdel(alert)

/atom/movable/screen/alert
icon = 'icons/mob/screen_alert.dmi'
icon = 'icons/hud/screen_alert.dmi'
icon_state = "default"
name = "Alert"
desc = "Something seems to have gone wrong with this alert, so report this bug please"
Expand Down Expand Up @@ -388,7 +388,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."

/atom/movable/screen/alert/bloodsense/Initialize(mapload)
. = ..()
narnar = new('icons/mob/screen_alert.dmi', "mini_nar")
narnar = new('icons/hud/screen_alert.dmi', "mini_nar")
START_PROCESSING(SSprocessing, src)

/atom/movable/screen/alert/bloodsense/Destroy()
Expand Down
8 changes: 4 additions & 4 deletions code/_onclick/hud/alien.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/atom/movable/screen/alien
icon = 'icons/mob/screen_alien.dmi'
icon = 'icons/hud/screen_alien.dmi'

/atom/movable/screen/alien/leap
name = "toggle leap"
Expand All @@ -11,21 +11,21 @@
AH.toggle_leap()

/atom/movable/screen/alien/plasma_display
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
icon_state = "power_display2"
name = "plasma stored"
screen_loc = ui_alienplasmadisplay


/atom/movable/screen/alien/alien_queen_finder
icon = 'icons/mob/screen_alien.dmi'
icon = 'icons/hud/screen_alien.dmi'
icon_state = "queen_finder"
name = "queen sense"
desc = "Allows you to sense the general direction of your Queen."
screen_loc = ui_alien_queen_finder

/datum/hud/alien
ui_style = 'icons/mob/screen_alien.dmi'
ui_style = 'icons/hud/screen_alien.dmi'

/datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner)
..()
Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/hud/alien_larva.dm
Original file line number Diff line number Diff line change
@@ -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)
..()
Expand All @@ -20,7 +20,7 @@
infodisplay += alien_queen_finder

pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = 'icons/mob/screen_alien.dmi'
pull_icon.icon = 'icons/hud/screen_alien.dmi'
pull_icon.update_icon()
pull_icon.screen_loc = ui_above_movement
pull_icon.hud = src
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/blob_overmind.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/atom/movable/screen/blob
icon = 'icons/mob/blob.dmi'
icon = 'icons/hud/actions/actions_blob.dmi'

/atom/movable/screen/blob/MouseEntered(location,control,params)
openToolTip(usr,src,params,title = name,content = desc, theme = "blob")
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/constructs.dm
Original file line number Diff line number Diff line change
@@ -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)
..()
Expand Down
16 changes: 8 additions & 8 deletions code/_onclick/hud/fullscreen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
client.screen -= screen

/atom/movable/screen/fullscreen
icon = 'icons/mob/screen_full.dmi'
icon = 'icons/hud/fullscreen/screen_full.dmi'
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
layer = FULLSCREEN_LAYER
Expand Down Expand Up @@ -134,27 +134,27 @@
icon_state = "impairedoverlay"

/atom/movable/screen/fullscreen/flash
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"

/atom/movable/screen/fullscreen/flash/black
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "black"

/atom/movable/screen/fullscreen/flash/static
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "noise"

/atom/movable/screen/fullscreen/high
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "druggy"

/atom/movable/screen/fullscreen/color_vision
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
alpha = 80
Expand All @@ -169,7 +169,7 @@
color = "#0000ff"

/atom/movable/screen/fullscreen/lighting_backdrop
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
icon_state = "flash"
transform = matrix(200, 0, 0, 0, 200, 0)
plane = LIGHTING_PLANE
Expand Down Expand Up @@ -216,7 +216,7 @@

/atom/movable/screen/fullscreen/blind_context_disable/Initialize(mapload)
. = ..()
var/icon/mask = icon('icons/mob/psychic.dmi', "click_mask")
var/icon/mask = icon('icons/hud/fullscreen/psychic.dmi', "click_mask")
add_filter("click_mask", 1, alpha_mask_filter(icon = mask, flags = MASK_INVERSE))

/atom/movable/screen/fullscreen/blind_context_disable/Destroy()
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/ghost.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/atom/movable/screen/ghost
icon = 'icons/mob/screen_ghost.dmi'
icon = 'icons/hud/screen_ghost.dmi'

/atom/movable/screen/ghost/MouseEntered()
flick(icon_state + "_anim", src)
Expand Down
14 changes: 7 additions & 7 deletions code/_onclick/hud/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

// The default UI style is the first one in the list
GLOBAL_LIST_INIT(available_ui_styles, list(
"Midnight" = 'icons/mob/screen_midnight.dmi',
"Plasmafire" = 'icons/mob/screen_plasmafire.dmi',
"Slimecore" = 'icons/mob/screen_slimecore.dmi',
"Operative" = 'icons/mob/screen_operative.dmi',
"Clockwork" = 'icons/mob/screen_clockwork.dmi',
"Trasen-Knox" = 'icons/mob/screen_trasenknox.dmi',
"Retro" = 'icons/mob/screen_retro.dmi'
"Midnight" = 'icons/hud/style/screen_midnight.dmi',
"Plasmafire" = 'icons/hud/style/screen_plasmafire.dmi',
"Slimecore" = 'icons/hud/style/screen_slimecore.dmi',
"Operative" = 'icons/hud/style/screen_operative.dmi',
"Clockwork" = 'icons/hud/style/screen_clockwork.dmi',
"Trasen-Knox" = 'icons/hud/style/screen_trasenknox.dmi',
"Retro" = 'icons/hud/style/screen_retro.dmi'
))

/proc/ui_style2icon(ui_style)
Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/hud/human.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/atom/movable/screen/human
icon = 'icons/mob/screen_midnight.dmi'
icon = 'icons/hud/style/screen_midnight.dmi'

/atom/movable/screen/human/toggle
name = "toggle"
Expand Down Expand Up @@ -35,7 +35,7 @@
invisibility = INVISIBILITY_ABSTRACT

/atom/movable/screen/devil/soul_counter
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
name = "souls owned"
icon_state = "Devil-6"
screen_loc = ui_devilsouldisplay
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/lavaland_elite.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/hud/lavaland_elite
ui_style = 'icons/mob/screen_slime.dmi'
ui_style = 'icons/hud/screen_slime.dmi'

/datum/hud/lavaland_elite/New(mob/living/simple_animal/hostile/asteroid/elite)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/minebot.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/hud/minebot
ui_style = 'icons/mob/screen_cyborg.dmi'
ui_style = 'icons/hud/screen_cyborg.dmi'

/datum/hud/minebot/New(mob/living/simple_animal/hostile/mining_drone)
..()
Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/hud/pai.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#define PAI_MISSING_SOFTWARE_MESSAGE "<span class='warning'>You must download the required software to use this.</span>"

/atom/movable/screen/pai
icon = 'icons/mob/screen_pai.dmi'
icon = 'icons/hud/screen_pai.dmi'
var/required_software

/atom/movable/screen/pai/Click()
Expand Down Expand Up @@ -168,7 +168,7 @@

/atom/movable/screen/pai/radio
name = "radio"
icon = 'icons/mob/screen_cyborg.dmi'
icon = 'icons/hud/screen_cyborg.dmi'
icon_state = "radio"

/atom/movable/screen/pai/radio/Click()
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/radial.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
GLOBAL_LIST_EMPTY(radial_menus)

/atom/movable/screen/radial
icon = 'icons/mob/radial.dmi'
icon = 'icons/hud/radials/radial_generic.dmi'
appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
plane = ABOVE_HUD_PLANE
var/datum/radial_menu/parent
Expand Down
10 changes: 5 additions & 5 deletions code/_onclick/hud/robot.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/atom/movable/screen/robot
icon = 'icons/mob/screen_cyborg.dmi'
icon = 'icons/hud/screen_cyborg.dmi'

/atom/movable/screen/robot/module
name = "cyborg module"
Expand Down Expand Up @@ -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)
..()
Expand Down Expand Up @@ -168,7 +168,7 @@
module_store_icon.hud = src

pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = 'icons/mob/screen_cyborg.dmi'
pull_icon.icon = 'icons/hud/screen_cyborg.dmi'
pull_icon.screen_loc = ui_borg_pull
pull_icon.hud = src
pull_icon.update_icon()
Expand Down Expand Up @@ -303,7 +303,7 @@

/atom/movable/screen/robot/alerts
name = "Alert Panel"
icon = 'icons/mob/screen_ai.dmi'
icon = 'icons/hud/screen_ai.dmi'
icon_state = "alerts"

/atom/movable/screen/robot/alerts/Click()
Expand All @@ -315,7 +315,7 @@

/atom/movable/screen/robot/crew_manifest
name = "Crew Manifest"
icon = 'icons/mob/screen_ai.dmi'
icon = 'icons/hud/screen_ai.dmi'
icon_state = "manifest"

/atom/movable/screen/robot/crew_manifest/Click()
Expand Down
Loading

0 comments on commit 2b22806

Please sign in to comment.