[MIRROR] Re-organizes the files in the root of the icons/ folder into…

… it's substituents [MDB IGNORE] (#11100) * Re-organizes the files in the root of the icons/ folder into it's substituents * Update code/__DEFINES/fonts.dm Co-authored-by: san7890 <[email protected]> Co-authored-by: Tom <[email protected]>
Kocma-san · Jan 29, 2022 · d04e8ab · d04e8ab
1 parent 73fafee
commit d04e8ab
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 6 deletions.
diff --git 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 'modular_skyrat/master_files/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/emoji.dmi'
+#define EMOJI_SET 'modular_skyrat/master_files/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui_icons/emoji/emoji.dmi'
diff --git 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
@@ -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
@@ -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 = 0 // SKYRAT EDIT - Re-centering the title screen - ORIGINAL: pixel_x = -64
 	plane = SPLASHSCREEN_PLANE

diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
@@ -78,7 +78,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 
 	if(prefs.unlock_content)
 		if(prefs.toggles & MEMBER_PUBLIC)
-			keyname = "<font color='[prefs.read_preference(/datum/preference/color/ooc_color) || GLOB.normal_ooc_colour]'>[icon2html('icons/member_content.dmi', world, "blag")][keyname]</font>"
+			keyname = "<font color='[prefs.read_preference(/datum/preference/color/ooc_color) || GLOB.normal_ooc_colour]'>[icon2html('icons/ui_icons/chat/member_content.dmi', world, "blag")][keyname]</font>"
 	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 → icons/blanks/blank_title.png b/icons/blank_title.png → icons/blanks/blank_title.png
diff --git a/icons/Font_Minimal.dmi → icons/misc/Font_Minimal.dmi b/icons/Font_Minimal.dmi → icons/misc/Font_Minimal.dmi
diff --git a/icons/member_content.dmi → icons/ui_icons/chat/member_content.dmi b/icons/member_content.dmi → icons/ui_icons/chat/member_content.dmi
diff --git a/icons/tg_32.png → icons/ui_icons/common/tg_32.png b/icons/tg_32.png → icons/ui_icons/common/tg_32.png
diff --git a/icons/emoji.dmi → icons/ui_icons/emoji/emoji.dmi b/icons/emoji.dmi → icons/ui_icons/emoji/emoji.dmi
diff --git 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"