Skip to content

Commit

Permalink
Re-organizes the files in the root of the icons/ folder into it's sub…
Browse files Browse the repository at this point in the history
…stituents tgstation#6441

About The Pull Request

Same vein (although a lot larger than) tgstation#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
  • Loading branch information
san7890 authored Jan 29, 2022
1 parent 95918ce commit 510ce05
Show file tree
Hide file tree
Showing 11 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/fonts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion code/_onclick/hud/screen_objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/wanted_poster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/closed/_closed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/verbs/ooc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
var/keyname = key
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]"
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
2 changes: 1 addition & 1 deletion interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 510ce05

Please sign in to comment.