From f40d2abb13f7aa273bf3b015a3a66813d04c29dd Mon Sep 17 00:00:00 2001 From: fake_vm_user Date: Mon, 2 May 2022 22:05:16 -0700 Subject: [PATCH] change code refs --- code/__DEFINES/rendering/atom_huds.dm | 14 +++++++------- code/_onclick/hud/action.dm | 4 ++-- code/_onclick/hud/ghost.dm | 2 +- code/_rendering/clickcatcher/clickcatcher.dm | 2 +- code/_rendering/fullscreen/fullscreen.dm | 4 ++-- code/_rendering/parallax/parallax_object.dm | 2 +- code/game/objects/mob_spawner.dm | 8 ++++---- code/modules/mapping/map_helpers/_map_helpers.dm | 2 +- .../network_builder/_network_builder.dm | 2 +- code/modules/mapping/preloader.dm | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/code/__DEFINES/rendering/atom_huds.dm b/code/__DEFINES/rendering/atom_huds.dm index cacc396e9d1..281319fac79 100644 --- a/code/__DEFINES/rendering/atom_huds.dm +++ b/code/__DEFINES/rendering/atom_huds.dm @@ -16,13 +16,13 @@ // constant list lookup of hud to icon GLOBAL_LIST_INIT(hud_icon_files, list( - STATUS_HUD = 'icons/hud/atom_hud/status.dmi', - LIFE_HUD = 'icons/hud/atom_hud/health.dmi', - WANTED_HUD = 'icons/hud/atom_hud/security.dmi', - IMPLOYAL_HUD = 'icons/hud/atom_hud/implant.dmi', - IMPCHEM_HUD = 'icons/hud/atom_hud/implant.dmi', - IMPTRACK_HUD = 'icons/hud/atom_hud/implant.dmi', - ANTAG_HUD = 'icons/hud/atom_hud/antag.dmi', + STATUS_HUD = 'icons/screen/atom_hud/status.dmi', + LIFE_HUD = 'icons/screen/atom_hud/health.dmi', + WANTED_HUD = 'icons/screen/atom_hud/security.dmi', + IMPLOYAL_HUD = 'icons/screen/atom_hud/implant.dmi', + IMPCHEM_HUD = 'icons/screen/atom_hud/implant.dmi', + IMPTRACK_HUD = 'icons/screen/atom_hud/implant.dmi', + ANTAG_HUD = 'icons/screen/atom_hud/antag.dmi', ID_HUD = 'icons/hud/atom_hud/job.dmi' )) diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index c7f099c1f7c..9db0c833d76 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -19,7 +19,7 @@ var/processing = 0 var/active = 0 var/atom/movable/screen/movable/action_button/button = null - var/button_icon = 'icons/mob/actions.dmi' + var/button_icon = 'icons/screen/actions/actions.dmi' var/button_icon_state = "default" var/background_icon_state = "bg_default" var/mob/living/owner @@ -150,7 +150,7 @@ //Hide/Show Action Buttons ... Button /atom/movable/screen/movable/action_button/hide_toggle name = "Hide Buttons" - icon = 'icons/mob/actions.dmi' + icon = 'icons/screen/actions/actions.dmi' icon_state = "bg_default" var/hidden = 0 diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index f9e11b35cca..f5d560552c2 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -1,5 +1,5 @@ /atom/movable/screen/ghost - icon = 'icons/hud/common/observer.dmi' + icon = 'icons/screen/hud/common/observer.dmi' /atom/movable/screen/ghost/MouseEntered(location,control,params) flick(icon_state + "_anim", src) diff --git a/code/_rendering/clickcatcher/clickcatcher.dm b/code/_rendering/clickcatcher/clickcatcher.dm index 050a1685907..6823f0c7d0b 100644 --- a/code/_rendering/clickcatcher/clickcatcher.dm +++ b/code/_rendering/clickcatcher/clickcatcher.dm @@ -1,5 +1,5 @@ /atom/movable/screen/click_catcher - icon = 'icons/screen/clickcatcher.dmi' + icon = 'icons/screen/rendering/clickcatcher.dmi' icon_state = "catcher" appearance_flags = TILE_BOUND | NO_CLIENT_COLOR | RESET_TRANSFORM | RESET_COLOR | RESET_ALPHA plane = CLICKCATCHER_PLANE diff --git a/code/_rendering/fullscreen/fullscreen.dm b/code/_rendering/fullscreen/fullscreen.dm index 1acaacf14aa..0126cc8636c 100644 --- a/code/_rendering/fullscreen/fullscreen.dm +++ b/code/_rendering/fullscreen/fullscreen.dm @@ -76,7 +76,7 @@ client.screen -= screen /atom/movable/screen/fullscreen - icon = 'icons/screen/fullscreen_15x15.dmi' + icon = 'icons/screen/fullscreen/fullscreen_15x15.dmi' icon_state = "default" screen_loc = "CENTER-7,CENTER-7" layer = FULLSCREEN_LAYER @@ -110,7 +110,7 @@ return ..() /atom/movable/screen/fullscreen/scaled - icon = 'icons/screen/fullscreen_15x15.dmi' + icon = 'icons/screen/fullscreen/fullscreen_15x15.dmi' screen_loc = "CENTER-7,CENTER-7" /// size of sprite in tiles var/size_x = 15 diff --git a/code/_rendering/parallax/parallax_object.dm b/code/_rendering/parallax/parallax_object.dm index cdacf2052c7..e0c909fba6c 100644 --- a/code/_rendering/parallax/parallax_object.dm +++ b/code/_rendering/parallax/parallax_object.dm @@ -1,6 +1,6 @@ /atom/movable/screen/parallax_layer - icon = 'icons/screen/parallax.dmi' + icon = 'icons/screen/parallax/parallax.dmi' blend_mode = BLEND_ADD plane = PARALLAX_PLANE screen_loc = "CENTER-7,CENTER-7" diff --git a/code/game/objects/mob_spawner.dm b/code/game/objects/mob_spawner.dm index 67ca629b688..fb18a60bd3e 100644 --- a/code/game/objects/mob_spawner.dm +++ b/code/game/objects/mob_spawner.dm @@ -175,7 +175,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are. destructible = 1 health = 50 anchored = 1 - icon = 'icons/mob/actions.dmi' + icon = 'icons/screen/actions/actions.dmi' icon_state = "alien_egg" spawn_types = list( /mob/living/simple_mob/animal/space/alien/drone = 20, @@ -194,7 +194,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are. destructible = 1 health = 50 anchored = 1 - icon = 'icons/mob/actions.dmi' + icon = 'icons/screen/actions/actions.dmi' icon_state = "alien_egg" spawn_types = list( /mob/living/simple_mob/animal/space/alien/queen = 5 @@ -425,7 +425,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are. destructible = 1 health = 50 anchored = 1 - icon = 'icons/mob/actions.dmi' + icon = 'icons/screen/actions/actions.dmi' icon_state = "alien_egg" spawn_types = list( /mob/living/simple_mob/animal/space/alien/drone = 20, @@ -444,7 +444,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are. destructible = 1 health = 50 anchored = 1 - icon = 'icons/mob/actions.dmi' + icon = 'icons/screen/actions/actions.dmi' icon_state = "alien_egg" spawn_types = list( /mob/living/simple_mob/animal/space/alien/queen = 5, diff --git a/code/modules/mapping/map_helpers/_map_helpers.dm b/code/modules/mapping/map_helpers/_map_helpers.dm index 5e6d4c1bcb3..c52c2340598 100644 --- a/code/modules/mapping/map_helpers/_map_helpers.dm +++ b/code/modules/mapping/map_helpers/_map_helpers.dm @@ -1,6 +1,6 @@ //Landmarks and other helpers which speed up the mapping process and reduce the number of unique instances/subtypes of items/turf/ect /obj/effect/map_helper - icon = 'icons/map/mapping_helpers.dmi' + icon = 'icons/mapping/helpers/mapping_helpers.dmi' icon_state = "" var/late = FALSE diff --git a/code/modules/mapping/map_helpers/network_builder/_network_builder.dm b/code/modules/mapping/map_helpers/network_builder/_network_builder.dm index 1c748b9517a..994d11e5910 100644 --- a/code/modules/mapping/map_helpers/network_builder/_network_builder.dm +++ b/code/modules/mapping/map_helpers/network_builder/_network_builder.dm @@ -4,7 +4,7 @@ /// set var to true to not del on lateload var/custom_spawned = FALSE - icon = 'icons/map/mapping_helpers.dmi' + icon = 'icons/mapping/helpers/mapping_helpers.dmi' late = TRUE /// what directions we know connections are in diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm index 127559f55ca..ae37879ad72 100644 --- a/code/modules/mapping/preloader.dm +++ b/code/modules/mapping/preloader.dm @@ -32,17 +32,17 @@ GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new) /area/template_noop name = "Area Passthrough" - icon = 'icons/map/maploader_objects.dmi' + icon = 'icons/mapping/helpers/maploader_objects.dmi' icon_state = "area_noop" /turf/template_noop name = "Turf Passthrough" - icon = 'icons/map/maploader_objects.dmi' + icon = 'icons/mapping/helpers/maploader_objects.dmi' icon_state = "turf_noop" /* No sane way to implement. /atom/template_no_annihilate name = "Block In-Load Tile Annihilation" - icon = 'icons/map/maploader_objects.dmi' + icon = 'icons/mapping/helpers/maploader_objects.dmi' icon_state = "no_annihilate" */