From 510ce05992e06d9bf44e7128bc641ed9076ee76f Mon Sep 17 00:00:00 2001
From: san7890 <34697715+san7890@users.noreply.github.com>
Date: Sat, 29 Jan 2022 00:45:17 -0700
Subject: [PATCH] Re-organizes the files in the root of the icons/ folder into
it's substituents #6441
About The Pull Request
Same vein (although a lot larger than) #64118
On the tin. This moves them into their own folders and the paths were updated in the code.
Why It's Good For The Game
It's not exactly good visuals for stuff that can be placed elsewhere to just be sitting in the root. Organization is nice.
Changelog
cl
fix: For those of you into code, some stuff with the icon pathing has been shuffled around so it's no longer in the roots of the icon/ folder. If you aren't into code, that's fine too.
/cl
---
code/__DEFINES/fonts.dm | 2 +-
code/_onclick/hud/screen_objects.dm | 2 +-
code/game/objects/effects/wanted_poster.dm | 2 +-
code/game/turfs/closed/_closed.dm | 2 +-
code/modules/client/verbs/ooc.dm | 2 +-
icons/{ => blanks}/blank_title.png | Bin
icons/{ => misc}/Font_Minimal.dmi | Bin
icons/{ => ui_icons/chat}/member_content.dmi | Bin
icons/{ => ui_icons/common}/tg_32.png | Bin
icons/{ => ui_icons/emoji}/emoji.dmi | Bin
interface/skin.dmf | 2 +-
11 files changed, 6 insertions(+), 6 deletions(-)
rename icons/{ => blanks}/blank_title.png (100%)
rename icons/{ => misc}/Font_Minimal.dmi (100%)
rename icons/{ => ui_icons/chat}/member_content.dmi (100%)
rename icons/{ => ui_icons/common}/tg_32.png (100%)
rename icons/{ => ui_icons/emoji}/emoji.dmi (100%)
diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm
index 9c823992d20..4a2368fef54 100644
--- a/code/__DEFINES/fonts.dm
+++ b/code/__DEFINES/fonts.dm
@@ -21,4 +21,4 @@
GLOBAL_LIST_INIT(pda_styles, sort_list(list(MONO, VT, ORBITRON, SHARE)))
/// Emoji icon set
-#define EMOJI_SET 'icons/emoji.dmi'
+#define EMOJI_SET 'icons/ui_icons/emoji/emoji.dmi'
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index cc76eaea242..395dfb0aa15 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -667,7 +667,7 @@
return
/atom/movable/screen/splash
- icon = 'icons/blank_title.png'
+ icon = 'icons/blanks/blank_title.png'
icon_state = ""
screen_loc = "1,1"
plane = SPLASHSCREEN_PLANE
diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm
index 5363ba71bf5..a32a6b2f3d9 100644
--- a/code/game/objects/effects/wanted_poster.dm
+++ b/code/game/objects/effects/wanted_poster.dm
@@ -80,7 +80,7 @@
var/i
for(i=1; i <= textLen, i++)
var/letter = uppertext(text[i])
- var/icon/letter_icon = icon("icon" = 'icons/Font_Minimal.dmi', "icon_state" = letter)
+ var/icon/letter_icon = icon("icon" = 'icons/misc/Font_Minimal.dmi', "icon_state" = letter)
letter_icon.Shift(EAST, startX) //16 - (2*n)
letter_icon.Shift(SOUTH, 2)
letter_icon.SwapColor(rgb(255,255,255), color)
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index 333cf42b5f3..6105e7fd396 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -74,7 +74,7 @@
/turf/closed/indestructible/splashscreen
name = "Space Station 13"
desc = null
- icon = 'icons/blank_title.png'
+ icon = 'icons/blanks/blank_title.png'
icon_state = ""
pixel_x = -64
plane = SPLASHSCREEN_PLANE
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 5763aadbaab..d8eaa5c4c78 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -74,7 +74,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
var/keyname = key
if(prefs.unlock_content)
if(prefs.toggles & MEMBER_PUBLIC)
- keyname = "[icon2html('icons/member_content.dmi', world, "blag")][keyname]"
+ keyname = "[icon2html('icons/ui_icons/chat/member_content.dmi', world, "blag")][keyname]"
if(prefs.hearted)
var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
keyname = "[sheet.icon_tag("emoji-heart")][keyname]"
diff --git a/icons/blank_title.png b/icons/blanks/blank_title.png
similarity index 100%
rename from icons/blank_title.png
rename to icons/blanks/blank_title.png
diff --git a/icons/Font_Minimal.dmi b/icons/misc/Font_Minimal.dmi
similarity index 100%
rename from icons/Font_Minimal.dmi
rename to icons/misc/Font_Minimal.dmi
diff --git a/icons/member_content.dmi b/icons/ui_icons/chat/member_content.dmi
similarity index 100%
rename from icons/member_content.dmi
rename to icons/ui_icons/chat/member_content.dmi
diff --git a/icons/tg_32.png b/icons/ui_icons/common/tg_32.png
similarity index 100%
rename from icons/tg_32.png
rename to icons/ui_icons/common/tg_32.png
diff --git a/icons/emoji.dmi b/icons/ui_icons/emoji/emoji.dmi
similarity index 100%
rename from icons/emoji.dmi
rename to icons/ui_icons/emoji/emoji.dmi
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 80806ae1df3..9d85f429a84 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -65,7 +65,7 @@ window "mainwindow"
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
statusbar = false
- icon = 'icons\\tg_32.png'
+ icon = 'icons\\ui_icons\\common\\tg_32.png'
macro = "default"
menu = "menu"
elem "split"