From 59f0b11a421b2bf026cd9b26cca1aafb94c4d252 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 10 May 2021 23:47:02 +0200 Subject: [PATCH] [MIRROR] Tidy HTML folder (#5597) * Tidy HTML folder (#58761) This PR aims to make the HTML folder a little more organized, as well as remove a few unused files. Why It's Good For The Game Doesn't change anything for the player, however makes the files more organized. * Tidy HTML folder Co-authored-by: Celotajs <81999976+celotajstg@users.noreply.github.com> --- code/datums/achievements/_awards.dm | 2 +- code/datums/ai/dog/dog_controller.dm | 2 +- code/datums/chatmessage.dm | 4 +- code/modules/asset_cache/asset_list_items.dm | 226 +++++++++--------- code/modules/mob/dead/new_player/poll.dm | 2 +- html/browser/scannernew.css | 46 ---- html/browser/techwebs.css | 20 -- html/chevron-expand.png | Bin 354 -> 0 bytes html/chevron.png | Bin 345 -> 0 bytes html/dna_discovered.gif | Bin 15032 -> 0 bytes html/dna_extra.gif | Bin 14101 -> 0 bytes html/dna_undiscovered.gif | Bin 14265 -> 0 bytes ....custom-core-widgit-mouse-sortable.min.js} | 0 html/{ => jquery}/jquery.min.js | 0 html/mapbase1024.png | Bin 159152 -> 0 bytes .../asteroiddustoverlay.psd | Bin icons/{PSD files => psd_files}/door.psd | Bin .../{PSD files => psd_files}/large-stamps.psd | Bin .../locker_template.psd | Bin .../window_spawners.psd | Bin icons/{Testing => testing}/turf_analysis.dmi | Bin .../achievements}/baseboss.png | Bin .../achievements}/basemafia.png | Bin .../achievements}/basemisc.png | Bin .../achievements}/baseskill.png | Bin .../achievements/boss}/bbgum.png | Bin .../achievements/boss}/colossus.png | Bin .../achievements/boss}/drake.png | Bin .../achievements/boss}/hierophant.png | Bin .../achievements/boss}/legion.png | Bin .../achievements/boss}/miner.png | Bin .../achievements/boss}/swarmer.png | Bin .../achievements/boss}/tendril.png | Bin .../achievements}/default.png | Bin .../achievements/mafia}/hated.png | Bin .../achievements/mafia}/mafia.png | Bin .../achievements/mafia}/neutral.png | Bin .../achievements/mafia}/town.png | Bin .../achievements/misc}/ascension.png | Bin .../achievements/misc}/ashascend.png | Bin .../achievements/misc}/cayenne_disk.png | Bin .../achievements/misc}/chem_tut.png | Bin .../achievements/misc}/clownking.png | Bin .../achievements/misc}/clownthanks.png | Bin .../achievements/misc}/featofstrength.png | Bin .../achievements/misc}/fleshascend.png | Bin .../achievements/misc}/frenchingthebubble.png | Bin .../achievements/misc}/helbital.png | Bin .../achievements/misc}/hotdamn.png | Bin .../achievements/misc}/jackpot.png | Bin .../achievements/misc}/longshift.png | Bin .../achievements/misc}/meteors.png | Bin .../achievements/misc}/rule8.png | Bin .../achievements/misc}/rustascend.png | Bin .../achievements/misc}/snail.png | Bin .../achievements/misc}/timewaste.png | Bin .../achievements/misc}/toolbox_soul.png | Bin .../achievements/misc}/tram_surfer.png | Bin .../achievements/misc}/upgrade.png | Bin .../achievements/misc}/voidascend.png | Bin .../achievements/skills}/mining.png | Bin .../adventure/default.png | Bin .../{UI_Icons => ui_icons}/adventure/grue.png | Bin .../adventure/signal_lost.png | Bin .../adventure/trade.png | Bin .../advisors}/chem_help_advisor.gif | Bin .../Arcade => ui_icons/arcade}/boss1.gif | Bin .../Arcade => ui_icons/arcade}/boss2.gif | Bin .../Arcade => ui_icons/arcade}/boss3.gif | Bin .../Arcade => ui_icons/arcade}/boss4.gif | Bin .../Arcade => ui_icons/arcade}/boss5.gif | Bin .../Arcade => ui_icons/arcade}/boss6.gif | Bin .../chat/chat_icons.dmi | Bin {html => icons/ui_icons/common}/padlock.png | Bin .../condiments}/bbqsauce.png | Bin .../condiments}/coldsauce.png | Bin .../condiments}/condi_empty.png | Bin .../condiments}/emptycondiment.png | Bin .../condiments}/enzyme.png | Bin .../condiments}/flour.png | Bin .../condiments}/hotsauce.png | Bin .../condiments}/ketchup.png | Bin .../condiments}/mayonnaise.png | Bin .../condiments}/milk.png | Bin .../condiments}/oliveoil.png | Bin .../condiments}/peppermillsmall.png | Bin .../condiments}/rice.png | Bin .../condiments}/saltshakersmall.png | Bin .../condiments}/soymilk.png | Bin .../condiments}/soysauce.png | Bin .../condiments}/sugar.png | Bin icons/ui_icons/dna/dna_discovered.gif | Bin 0 -> 7109 bytes icons/ui_icons/dna/dna_extra.gif | Bin 0 -> 6673 bytes icons/ui_icons/dna/dna_undiscovered.gif | Bin 0 -> 6815 bytes .../{UI_Icons => ui_icons}/inventory/back.png | Bin .../{UI_Icons => ui_icons}/inventory/belt.png | Bin .../inventory/collar.png | Bin .../{UI_Icons => ui_icons}/inventory/ears.png | Bin .../inventory/glasses.png | Bin .../inventory/gloves.png | Bin .../inventory/hand_l.png | Bin .../inventory/hand_r.png | Bin .../{UI_Icons => ui_icons}/inventory/head.png | Bin icons/{UI_Icons => ui_icons}/inventory/id.png | Bin .../{UI_Icons => ui_icons}/inventory/mask.png | Bin .../{UI_Icons => ui_icons}/inventory/neck.png | Bin .../inventory/pocket.png | Bin .../inventory/shoes.png | Bin .../{UI_Icons => ui_icons}/inventory/suit.png | Bin .../inventory/suit_storage.png | Bin .../inventory/uniform.png | Bin .../ui_icons/notes}/high_button.png | Bin .../ui_icons/notes}/medium_button.png | Bin .../ui_icons/notes}/minor_button.png | Bin .../ui_icons/notes}/none_button.png | Bin {html => icons/ui_icons/orbit}/ghost.png | Bin .../Pills => ui_icons/pills}/pill1.png | Bin .../Pills => ui_icons/pills}/pill10.png | Bin .../Pills => ui_icons/pills}/pill11.png | Bin .../Pills => ui_icons/pills}/pill12.png | Bin .../Pills => ui_icons/pills}/pill13.png | Bin .../Pills => ui_icons/pills}/pill14.png | Bin .../Pills => ui_icons/pills}/pill15.png | Bin .../Pills => ui_icons/pills}/pill16.png | Bin .../Pills => ui_icons/pills}/pill17.png | Bin .../Pills => ui_icons/pills}/pill18.png | Bin .../Pills => ui_icons/pills}/pill19.png | Bin .../Pills => ui_icons/pills}/pill2.png | Bin .../Pills => ui_icons/pills}/pill20.png | Bin .../Pills => ui_icons/pills}/pill21.png | Bin .../Pills => ui_icons/pills}/pill22.png | Bin .../Pills => ui_icons/pills}/pill3.png | Bin .../Pills => ui_icons/pills}/pill4.png | Bin .../Pills => ui_icons/pills}/pill5.png | Bin .../Pills => ui_icons/pills}/pill6.png | Bin .../Pills => ui_icons/pills}/pill7.png | Bin .../Pills => ui_icons/pills}/pill8.png | Bin .../Pills => ui_icons/pills}/pill9.png | Bin {html => icons/ui_icons/safe}/safe_dial.png | Bin .../tgui/ntosradar_background.png | Bin .../tgui/ntosradar_pointer.png | Bin .../tgui/ntosradar_pointer_S.png | Bin 142 files changed, 118 insertions(+), 184 deletions(-) delete mode 100644 html/browser/scannernew.css delete mode 100644 html/browser/techwebs.css delete mode 100644 html/chevron-expand.png delete mode 100644 html/chevron.png delete mode 100644 html/dna_discovered.gif delete mode 100644 html/dna_extra.gif delete mode 100644 html/dna_undiscovered.gif rename html/{IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js => jquery/jquery-ui.custom-core-widgit-mouse-sortable.min.js} (100%) rename html/{ => jquery}/jquery.min.js (100%) delete mode 100644 html/mapbase1024.png rename icons/{PSD files => psd_files}/asteroiddustoverlay.psd (100%) rename icons/{PSD files => psd_files}/door.psd (100%) rename icons/{PSD files => psd_files}/large-stamps.psd (100%) rename icons/{PSD files => psd_files}/locker_template.psd (100%) rename icons/{PSD files => psd_files}/window_spawners.psd (100%) rename icons/{Testing => testing}/turf_analysis.dmi (100%) rename icons/{UI_Icons/Achievements => ui_icons/achievements}/baseboss.png (100%) rename icons/{UI_Icons/Achievements => ui_icons/achievements}/basemafia.png (100%) rename icons/{UI_Icons/Achievements => ui_icons/achievements}/basemisc.png (100%) rename icons/{UI_Icons/Achievements => ui_icons/achievements}/baseskill.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/bbgum.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/colossus.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/drake.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/hierophant.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/legion.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/miner.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/swarmer.png (100%) rename icons/{UI_Icons/Achievements/Boss => ui_icons/achievements/boss}/tendril.png (100%) rename icons/{UI_Icons/Achievements => ui_icons/achievements}/default.png (100%) rename icons/{UI_Icons/Achievements/Mafia => ui_icons/achievements/mafia}/hated.png (100%) rename icons/{UI_Icons/Achievements/Mafia => ui_icons/achievements/mafia}/mafia.png (100%) rename icons/{UI_Icons/Achievements/Mafia => ui_icons/achievements/mafia}/neutral.png (100%) rename icons/{UI_Icons/Achievements/Mafia => ui_icons/achievements/mafia}/town.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/ascension.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/ashascend.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/cayenne_disk.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/chem_tut.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/clownking.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/clownthanks.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/featofstrength.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/fleshascend.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/frenchingthebubble.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/helbital.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/hotdamn.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/jackpot.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/longshift.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/meteors.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/rule8.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/rustascend.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/snail.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/timewaste.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/toolbox_soul.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/tram_surfer.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/upgrade.png (100%) rename icons/{UI_Icons/Achievements/Misc => ui_icons/achievements/misc}/voidascend.png (100%) rename icons/{UI_Icons/Achievements/Skills => ui_icons/achievements/skills}/mining.png (100%) rename icons/{UI_Icons => ui_icons}/adventure/default.png (100%) rename icons/{UI_Icons => ui_icons}/adventure/grue.png (100%) rename icons/{UI_Icons => ui_icons}/adventure/signal_lost.png (100%) rename icons/{UI_Icons => ui_icons}/adventure/trade.png (100%) rename icons/{UI_Icons/Advisors => ui_icons/advisors}/chem_help_advisor.gif (100%) rename icons/{UI_Icons/Arcade => ui_icons/arcade}/boss1.gif (100%) rename icons/{UI_Icons/Arcade => ui_icons/arcade}/boss2.gif (100%) rename icons/{UI_Icons/Arcade => ui_icons/arcade}/boss3.gif (100%) rename icons/{UI_Icons/Arcade => ui_icons/arcade}/boss4.gif (100%) rename icons/{UI_Icons/Arcade => ui_icons/arcade}/boss5.gif (100%) rename icons/{UI_Icons/Arcade => ui_icons/arcade}/boss6.gif (100%) rename icons/{UI_Icons => ui_icons}/chat/chat_icons.dmi (100%) rename {html => icons/ui_icons/common}/padlock.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/bbqsauce.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/coldsauce.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/condi_empty.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/emptycondiment.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/enzyme.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/flour.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/hotsauce.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/ketchup.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/mayonnaise.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/milk.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/oliveoil.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/peppermillsmall.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/rice.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/saltshakersmall.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/soymilk.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/soysauce.png (100%) rename icons/{UI_Icons/Condiments => ui_icons/condiments}/sugar.png (100%) create mode 100644 icons/ui_icons/dna/dna_discovered.gif create mode 100644 icons/ui_icons/dna/dna_extra.gif create mode 100644 icons/ui_icons/dna/dna_undiscovered.gif rename icons/{UI_Icons => ui_icons}/inventory/back.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/belt.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/collar.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/ears.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/glasses.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/gloves.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/hand_l.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/hand_r.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/head.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/id.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/mask.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/neck.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/pocket.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/shoes.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/suit.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/suit_storage.png (100%) rename icons/{UI_Icons => ui_icons}/inventory/uniform.png (100%) rename {html => icons/ui_icons/notes}/high_button.png (100%) rename {html => icons/ui_icons/notes}/medium_button.png (100%) rename {html => icons/ui_icons/notes}/minor_button.png (100%) rename {html => icons/ui_icons/notes}/none_button.png (100%) rename {html => icons/ui_icons/orbit}/ghost.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill1.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill10.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill11.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill12.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill13.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill14.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill15.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill16.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill17.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill18.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill19.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill2.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill20.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill21.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill22.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill3.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill4.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill5.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill6.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill7.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill8.png (100%) rename icons/{UI_Icons/Pills => ui_icons/pills}/pill9.png (100%) rename {html => icons/ui_icons/safe}/safe_dial.png (100%) rename icons/{UI_Icons => ui_icons}/tgui/ntosradar_background.png (100%) rename icons/{UI_Icons => ui_icons}/tgui/ntosradar_pointer.png (100%) rename icons/{UI_Icons => ui_icons}/tgui/ntosradar_pointer_S.png (100%) diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm index 77485de8ba1..633ee625144 100644 --- a/code/datums/achievements/_awards.dm +++ b/code/datums/achievements/_awards.dm @@ -2,7 +2,7 @@ ///Name of the achievement, If null it won't show up in the achievement browser. (Handy for inheritance trees) var/name var/desc = "You did it." - ///Found in UI_Icons/Achievements + ///Found in ui_icons/achievements var/icon = "default" var/category = "Normal" diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm index 14110dc1e5d..3a3e46c26fe 100644 --- a/code/datums/ai/dog/dog_controller.dm +++ b/code/datums/ai/dog/dog_controller.dm @@ -224,7 +224,7 @@ /// Show the command radial menu /datum/ai_controller/dog/proc/command_radial(mob/living/clicker) var/list/commands = list( - COMMAND_HEEL = image(icon = 'icons/Testing/turf_analysis.dmi', icon_state = "red_arrow"), + COMMAND_HEEL = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow"), COMMAND_FETCH = image(icon = 'icons/mob/actions/actions_spells.dmi', icon_state = "summons"), COMMAND_ATTACK = image(icon = 'icons/effects/effects.dmi', icon_state = "bite"), COMMAND_DIE = image(icon = 'icons/mob/pets.dmi', icon_state = "puppy_dead") diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 4345bc70858..89b2b1d6351 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -145,10 +145,10 @@ // Append radio icon if from a virtual speaker if (extra_classes.Find("virtual-speaker")) - var/image/r_icon = image('icons/UI_Icons/chat/chat_icons.dmi', icon_state = "radio") + var/image/r_icon = image('icons/ui_icons/chat/chat_icons.dmi', icon_state = "radio") LAZYADD(prefixes, "\icon[r_icon]") else if (extra_classes.Find("emote")) - var/image/r_icon = image('icons/UI_Icons/chat/chat_icons.dmi', icon_state = "emote") + var/image/r_icon = image('icons/ui_icons/chat/chat_icons.dmi', icon_state = "emote") LAZYADD(prefixes, "\icon[r_icon]") // Append language icon if the language uses one diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 4b0713257a9..ca8da7e8cd3 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -54,9 +54,9 @@ /datum/asset/simple/radar_assets assets = list( - "ntosradarbackground.png" = 'icons/UI_Icons/tgui/ntosradar_background.png', - "ntosradarpointer.png" = 'icons/UI_Icons/tgui/ntosradar_pointer.png', - "ntosradarpointerS.png" = 'icons/UI_Icons/tgui/ntosradar_pointer_S.png' + "ntosradarbackground.png" = 'icons/ui_icons/tgui/ntosradar_background.png', + "ntosradarpointer.png" = 'icons/ui_icons/tgui/ntosradar_pointer.png', + "ntosradarpointerS.png" = 'icons/ui_icons/tgui/ntosradar_pointer_S.png' ) /datum/asset/spritesheet/simple/pda @@ -117,7 +117,7 @@ /datum/asset/simple/irv assets = list( - "jquery-ui.custom-core-widgit-mouse-sortable-min.js" = 'html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js', + "jquery-ui.custom-core-widgit-mouse-sortable.min.js" = 'html/jquery/jquery-ui.custom-core-widgit-mouse-sortable.min.js', ) /datum/asset/group/irv @@ -129,7 +129,7 @@ /datum/asset/simple/jquery legacy = TRUE assets = list( - "jquery.min.js" = 'html/jquery.min.js', + "jquery.min.js" = 'html/jquery/jquery.min.js', ) /datum/asset/simple/namespaced/fontawesome @@ -171,7 +171,7 @@ ) /datum/asset/simple/namespaced/common - assets = list("padlock.png" = 'html/padlock.png') + assets = list("padlock.png" = 'icons/ui_icons/common/padlock.png') parents = list("common.css" = 'html/browser/common.css') /datum/asset/simple/permissions @@ -188,105 +188,105 @@ /datum/asset/simple/notes assets = list( - "high_button.png" = 'html/high_button.png', - "medium_button.png" = 'html/medium_button.png', - "minor_button.png" = 'html/minor_button.png', - "none_button.png" = 'html/none_button.png', + "high_button.png" = 'icons/ui_icons/notes/high_button.png', + "medium_button.png" = 'icons/ui_icons/notes/medium_button.png', + "minor_button.png" = 'icons/ui_icons/notes/minor_button.png', + "none_button.png" = 'icons/ui_icons/notes/none_button.png', ) /datum/asset/simple/arcade assets = list( - "boss1.gif" = 'icons/UI_Icons/Arcade/boss1.gif', - "boss2.gif" = 'icons/UI_Icons/Arcade/boss2.gif', - "boss3.gif" = 'icons/UI_Icons/Arcade/boss3.gif', - "boss4.gif" = 'icons/UI_Icons/Arcade/boss4.gif', - "boss5.gif" = 'icons/UI_Icons/Arcade/boss5.gif', - "boss6.gif" = 'icons/UI_Icons/Arcade/boss6.gif', + "boss1.gif" = 'icons/ui_icons/arcade/boss1.gif', + "boss2.gif" = 'icons/ui_icons/arcade/boss2.gif', + "boss3.gif" = 'icons/ui_icons/arcade/boss3.gif', + "boss4.gif" = 'icons/ui_icons/arcade/boss4.gif', + "boss5.gif" = 'icons/ui_icons/arcade/boss5.gif', + "boss6.gif" = 'icons/ui_icons/arcade/boss6.gif', ) /datum/asset/spritesheet/simple/achievements name ="achievements" assets = list( - "default" = 'icons/UI_Icons/Achievements/default.png', - "basemisc" = 'icons/UI_Icons/Achievements/basemisc.png', - "baseboss" = 'icons/UI_Icons/Achievements/baseboss.png', - "baseskill" = 'icons/UI_Icons/Achievements/baseskill.png', - "bbgum" = 'icons/UI_Icons/Achievements/Boss/bbgum.png', - "colossus" = 'icons/UI_Icons/Achievements/Boss/colossus.png', - "hierophant" = 'icons/UI_Icons/Achievements/Boss/hierophant.png', - "legion" = 'icons/UI_Icons/Achievements/Boss/legion.png', - "miner" = 'icons/UI_Icons/Achievements/Boss/miner.png', - "swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png', - "tendril" = 'icons/UI_Icons/Achievements/Boss/tendril.png', - "featofstrength" = 'icons/UI_Icons/Achievements/Misc/featofstrength.png', - "helbital" = 'icons/UI_Icons/Achievements/Misc/helbital.png', - "jackpot" = 'icons/UI_Icons/Achievements/Misc/jackpot.png', - "meteors" = 'icons/UI_Icons/Achievements/Misc/meteors.png', - "timewaste" = 'icons/UI_Icons/Achievements/Misc/timewaste.png', - "upgrade" = 'icons/UI_Icons/Achievements/Misc/upgrade.png', - "clownking" = 'icons/UI_Icons/Achievements/Misc/clownking.png', - "clownthanks" = 'icons/UI_Icons/Achievements/Misc/clownthanks.png', - "rule8" = 'icons/UI_Icons/Achievements/Misc/rule8.png', - "snail" = 'icons/UI_Icons/Achievements/Misc/snail.png', - "ascension" = 'icons/UI_Icons/Achievements/Misc/ascension.png', - "ashascend" = 'icons/UI_Icons/Achievements/Misc/ashascend.png', - "fleshascend" = 'icons/UI_Icons/Achievements/Misc/fleshascend.png', - "rustascend" = 'icons/UI_Icons/Achievements/Misc/rustascend.png', - "voidascend" = 'icons/UI_Icons/Achievements/Misc/voidascend.png', - "mining" = 'icons/UI_Icons/Achievements/Skills/mining.png', - "changeling" = 'icons/UI_Icons/Achievements/Mafia/mafia.png', - "chaplain" = 'icons/UI_Icons/Achievements/Mafia/town.png', - "clown" = 'icons/UI_Icons/Achievements/Mafia/neutral.png', - "basemafia" ='icons/UI_Icons/Achievements/basemafia.png', - "frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png' + "default" = 'icons/ui_icons/achievements/default.png', + "basemisc" = 'icons/ui_icons/achievements/basemisc.png', + "baseboss" = 'icons/ui_icons/achievements/baseboss.png', + "baseskill" = 'icons/ui_icons/achievements/baseskill.png', + "bbgum" = 'icons/ui_icons/achievements/boss/bbgum.png', + "colossus" = 'icons/ui_icons/achievements/boss/colossus.png', + "hierophant" = 'icons/ui_icons/achievements/boss/hierophant.png', + "legion" = 'icons/ui_icons/achievements/boss/legion.png', + "miner" = 'icons/ui_icons/achievements/boss/miner.png', + "swarmer" = 'icons/ui_icons/achievements/boss/swarmer.png', + "tendril" = 'icons/ui_icons/achievements/boss/tendril.png', + "featofstrength" = 'icons/ui_icons/achievements/misc/featofstrength.png', + "helbital" = 'icons/ui_icons/achievements/misc/helbital.png', + "jackpot" = 'icons/ui_icons/achievements/misc/jackpot.png', + "meteors" = 'icons/ui_icons/achievements/misc/meteors.png', + "timewaste" = 'icons/ui_icons/achievements/misc/timewaste.png', + "upgrade" = 'icons/ui_icons/achievements/misc/upgrade.png', + "clownking" = 'icons/ui_icons/achievements/misc/clownking.png', + "clownthanks" = 'icons/ui_icons/achievements/misc/clownthanks.png', + "rule8" = 'icons/ui_icons/achievements/misc/rule8.png', + "snail" = 'icons/ui_icons/achievements/misc/snail.png', + "ascension" = 'icons/ui_icons/achievements/misc/ascension.png', + "ashascend" = 'icons/ui_icons/achievements/misc/ashascend.png', + "fleshascend" = 'icons/ui_icons/achievements/misc/fleshascend.png', + "rustascend" = 'icons/ui_icons/achievements/misc/rustascend.png', + "voidascend" = 'icons/ui_icons/achievements/misc/voidascend.png', + "mining" = 'icons/ui_icons/achievements/skills/mining.png', + "changeling" = 'icons/ui_icons/achievements/mafia/mafia.png', + "chaplain" = 'icons/ui_icons/achievements/mafia/town.png', + "clown" = 'icons/ui_icons/achievements/mafia/neutral.png', + "basemafia" ='icons/ui_icons/achievements/basemafia.png', + "frenching" = 'icons/ui_icons/achievements/misc/frenchingthebubble.png' ) /datum/asset/spritesheet/simple/pills name = "pills" assets = list( - "pill1" = 'icons/UI_Icons/Pills/pill1.png', - "pill2" = 'icons/UI_Icons/Pills/pill2.png', - "pill3" = 'icons/UI_Icons/Pills/pill3.png', - "pill4" = 'icons/UI_Icons/Pills/pill4.png', - "pill5" = 'icons/UI_Icons/Pills/pill5.png', - "pill6" = 'icons/UI_Icons/Pills/pill6.png', - "pill7" = 'icons/UI_Icons/Pills/pill7.png', - "pill8" = 'icons/UI_Icons/Pills/pill8.png', - "pill9" = 'icons/UI_Icons/Pills/pill9.png', - "pill10" = 'icons/UI_Icons/Pills/pill10.png', - "pill11" = 'icons/UI_Icons/Pills/pill11.png', - "pill12" = 'icons/UI_Icons/Pills/pill12.png', - "pill13" = 'icons/UI_Icons/Pills/pill13.png', - "pill14" = 'icons/UI_Icons/Pills/pill14.png', - "pill15" = 'icons/UI_Icons/Pills/pill15.png', - "pill16" = 'icons/UI_Icons/Pills/pill16.png', - "pill17" = 'icons/UI_Icons/Pills/pill17.png', - "pill18" = 'icons/UI_Icons/Pills/pill18.png', - "pill19" = 'icons/UI_Icons/Pills/pill19.png', - "pill20" = 'icons/UI_Icons/Pills/pill20.png', - "pill21" = 'icons/UI_Icons/Pills/pill21.png', - "pill22" = 'icons/UI_Icons/Pills/pill22.png', + "pill1" = 'icons/ui_icons/pills/pill1.png', + "pill2" = 'icons/ui_icons/pills/pill2.png', + "pill3" = 'icons/ui_icons/pills/pill3.png', + "pill4" = 'icons/ui_icons/pills/pill4.png', + "pill5" = 'icons/ui_icons/pills/pill5.png', + "pill6" = 'icons/ui_icons/pills/pill6.png', + "pill7" = 'icons/ui_icons/pills/pill7.png', + "pill8" = 'icons/ui_icons/pills/pill8.png', + "pill9" = 'icons/ui_icons/pills/pill9.png', + "pill10" = 'icons/ui_icons/pills/pill10.png', + "pill11" = 'icons/ui_icons/pills/pill11.png', + "pill12" = 'icons/ui_icons/pills/pill12.png', + "pill13" = 'icons/ui_icons/pills/pill13.png', + "pill14" = 'icons/ui_icons/pills/pill14.png', + "pill15" = 'icons/ui_icons/pills/pill15.png', + "pill16" = 'icons/ui_icons/pills/pill16.png', + "pill17" = 'icons/ui_icons/pills/pill17.png', + "pill18" = 'icons/ui_icons/pills/pill18.png', + "pill19" = 'icons/ui_icons/pills/pill19.png', + "pill20" = 'icons/ui_icons/pills/pill20.png', + "pill21" = 'icons/ui_icons/pills/pill21.png', + "pill22" = 'icons/ui_icons/pills/pill22.png', ) /datum/asset/spritesheet/simple/condiments name = "condiments" assets = list( - CONDIMASTER_STYLE_FALLBACK = 'icons/UI_Icons/Condiments/emptycondiment.png', - "enzyme" = 'icons/UI_Icons/Condiments/enzyme.png', - "flour" = 'icons/UI_Icons/Condiments/flour.png', - "mayonnaise" = 'icons/UI_Icons/Condiments/mayonnaise.png', - "milk" = 'icons/UI_Icons/Condiments/milk.png', - "blackpepper" = 'icons/UI_Icons/Condiments/peppermillsmall.png', - "rice" = 'icons/UI_Icons/Condiments/rice.png', - "sodiumchloride" = 'icons/UI_Icons/Condiments/saltshakersmall.png', - "soymilk" = 'icons/UI_Icons/Condiments/soymilk.png', - "soysauce" = 'icons/UI_Icons/Condiments/soysauce.png', - "sugar" = 'icons/UI_Icons/Condiments/sugar.png', - "ketchup" = 'icons/UI_Icons/Condiments/ketchup.png', - "capsaicin" = 'icons/UI_Icons/Condiments/hotsauce.png', - "frostoil" = 'icons/UI_Icons/Condiments/coldsauce.png', - "bbqsauce" = 'icons/UI_Icons/Condiments/bbqsauce.png', - "cornoil" = 'icons/UI_Icons/Condiments/oliveoil.png', + CONDIMASTER_STYLE_FALLBACK = 'icons/ui_icons/condiments/emptycondiment.png', + "enzyme" = 'icons/ui_icons/condiments/enzyme.png', + "flour" = 'icons/ui_icons/condiments/flour.png', + "mayonnaise" = 'icons/ui_icons/condiments/mayonnaise.png', + "milk" = 'icons/ui_icons/condiments/milk.png', + "blackpepper" = 'icons/ui_icons/condiments/peppermillsmall.png', + "rice" = 'icons/ui_icons/condiments/rice.png', + "sodiumchloride" = 'icons/ui_icons/condiments/saltshakersmall.png', + "soymilk" = 'icons/ui_icons/condiments/soymilk.png', + "soysauce" = 'icons/ui_icons/condiments/soysauce.png', + "sugar" = 'icons/ui_icons/condiments/sugar.png', + "ketchup" = 'icons/ui_icons/condiments/ketchup.png', + "capsaicin" = 'icons/ui_icons/condiments/hotsauce.png', + "frostoil" = 'icons/ui_icons/condiments/coldsauce.png', + "bbqsauce" = 'icons/ui_icons/condiments/bbqsauce.png', + "cornoil" = 'icons/ui_icons/condiments/oliveoil.png', ) //this exists purely to avoid meta by pre-loading all language icons. @@ -432,14 +432,14 @@ /datum/asset/simple/genetics assets = list( - "dna_discovered.gif" = 'html/dna_discovered.gif', - "dna_undiscovered.gif" = 'html/dna_undiscovered.gif', - "dna_extra.gif" = 'html/dna_extra.gif' + "dna_discovered.gif" = 'icons/ui_icons/dna/dna_discovered.gif', + "dna_undiscovered.gif" = 'icons/ui_icons/dna/dna_undiscovered.gif', + "dna_extra.gif" = 'icons/ui_icons/dna/dna_extra.gif' ) /datum/asset/simple/orbit assets = list( - "ghost.png" = 'html/ghost.png' + "ghost.png" = 'icons/ui_icons/orbit/ghost.png' ) /datum/asset/simple/vv @@ -490,7 +490,7 @@ /datum/asset/simple/safe assets = list( - "safe_dial.png" = 'html/safe_dial.png' + "safe_dial.png" = 'icons/ui_icons/safe/safe_dial.png' ) /datum/asset/spritesheet/fish @@ -509,31 +509,31 @@ /datum/asset/simple/adventure assets = list( - "default" = 'icons/UI_Icons/adventure/default.png', - "grue" = 'icons/UI_Icons/adventure/grue.png', - "signal_lost" ='icons/UI_Icons/adventure/signal_lost.png', - "trade" = 'icons/UI_Icons/adventure/trade.png', + "default" = 'icons/ui_icons/adventure/default.png', + "grue" = 'icons/ui_icons/adventure/grue.png', + "signal_lost" ='icons/ui_icons/adventure/signal_lost.png', + "trade" = 'icons/ui_icons/adventure/trade.png', ) /datum/asset/simple/inventory assets = list( - "inventory-glasses.png" = 'icons/UI_Icons/inventory/glasses.png', - "inventory-head.png" = 'icons/UI_Icons/inventory/head.png', - "inventory-neck.png" = 'icons/UI_Icons/inventory/neck.png', - "inventory-mask.png" = 'icons/UI_Icons/inventory/mask.png', - "inventory-ears.png" = 'icons/UI_Icons/inventory/ears.png', - "inventory-uniform.png" = 'icons/UI_Icons/inventory/uniform.png', - "inventory-suit.png" = 'icons/UI_Icons/inventory/suit.png', - "inventory-gloves.png" = 'icons/UI_Icons/inventory/gloves.png', - "inventory-hand_l.png" = 'icons/UI_Icons/inventory/hand_l.png', - "inventory-hand_r.png" = 'icons/UI_Icons/inventory/hand_r.png', - "inventory-shoes.png" = 'icons/UI_Icons/inventory/shoes.png', - "inventory-suit_storage.png" = 'icons/UI_Icons/inventory/suit_storage.png', - "inventory-id.png" = 'icons/UI_Icons/inventory/id.png', - "inventory-belt.png" = 'icons/UI_Icons/inventory/belt.png', - "inventory-back.png" = 'icons/UI_Icons/inventory/back.png', - "inventory-pocket.png" = 'icons/UI_Icons/inventory/pocket.png', - "inventory-collar.png" = 'icons/UI_Icons/inventory/collar.png', + "inventory-glasses.png" = 'icons/ui_icons/inventory/glasses.png', + "inventory-head.png" = 'icons/ui_icons/inventory/head.png', + "inventory-neck.png" = 'icons/ui_icons/inventory/neck.png', + "inventory-mask.png" = 'icons/ui_icons/inventory/mask.png', + "inventory-ears.png" = 'icons/ui_icons/inventory/ears.png', + "inventory-uniform.png" = 'icons/ui_icons/inventory/uniform.png', + "inventory-suit.png" = 'icons/ui_icons/inventory/suit.png', + "inventory-gloves.png" = 'icons/ui_icons/inventory/gloves.png', + "inventory-hand_l.png" = 'icons/ui_icons/inventory/hand_l.png', + "inventory-hand_r.png" = 'icons/ui_icons/inventory/hand_r.png', + "inventory-shoes.png" = 'icons/ui_icons/inventory/shoes.png', + "inventory-suit_storage.png" = 'icons/ui_icons/inventory/suit_storage.png', + "inventory-id.png" = 'icons/ui_icons/inventory/id.png', + "inventory-belt.png" = 'icons/ui_icons/inventory/belt.png', + "inventory-back.png" = 'icons/ui_icons/inventory/back.png', + "inventory-pocket.png" = 'icons/ui_icons/inventory/pocket.png', + "inventory-collar.png" = 'icons/ui_icons/inventory/collar.png', ) /// Removes all non-alphanumerics from the text, keep in mind this can lead to id conflicts @@ -543,7 +543,7 @@ /datum/asset/simple/tutorial_advisors assets = list( - "chem_help_advisor.gif" = 'icons/UI_Icons/Advisors/chem_help_advisor.gif', + "chem_help_advisor.gif" = 'icons/ui_icons/advisors/chem_help_advisor.gif', ) /datum/asset/spritesheet/moods diff --git a/code/modules/mob/dead/new_player/poll.dm b/code/modules/mob/dead/new_player/poll.dm index 7436fc14c9d..63e9ecc705d 100644 --- a/code/modules/mob/dead/new_player/poll.dm +++ b/code/modules/mob/dead/new_player/poll.dm @@ -252,7 +252,7 @@ var/list/output = list({"
- +